diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-19 18:27:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-19 18:27:51 +0200 |
| commit | b07dc81a9e35ddd2b2ac0109ae2e97b86ff4a4a9 (patch) | |
| tree | eaf97664c46d8222fef05af2556746d4d297a26e | |
| parent | 2ba58bec20b0039ccc40cfba59af6d56de16e8b1 (diff) | |
| parent | 86dfcfd0e30d6645eea2c63c1c60a0550e7c97ea (diff) | |
Merge commit '86dfcfd0e30d6645eea2c63c1c60a0550e7c97ea'
* commit '86dfcfd0e30d6645eea2c63c1c60a0550e7c97ea':
mov: Drop unused parameter from ff_mov_read_esds()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/cafdec.c | 3 | ||||
| -rw-r--r-- | libavformat/isom.h | 2 | ||||
| -rw-r--r-- | libavformat/mov.c | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c index e53102b368..80c5bb5962 100644 --- a/libavformat/cafdec.c +++ b/libavformat/cafdec.c @@ -109,10 +109,9 @@ static int read_kuki_chunk(AVFormatContext *s, int64_t size) The lavc AAC decoder requires the data from the codec specific description as extradata input. */ int strt, skip; - MOVAtom atom; strt = avio_tell(pb); - ff_mov_read_esds(s, pb, atom); + ff_mov_read_esds(s, pb); skip = size - (avio_tell(pb) - strt); if (skip < 0 || !st->codec->extradata || st->codec->codec_id != AV_CODEC_ID_AAC) { diff --git a/libavformat/isom.h b/libavformat/isom.h index 414b87cc9d..979e967d14 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -231,7 +231,7 @@ void ff_mp4_parse_es_descr(AVIOContext *pb, int *es_id); (tag) == MKTAG('A', 'V', 'i', 'n')) -int ff_mov_read_esds(AVFormatContext *fc, AVIOContext *pb, MOVAtom atom); +int ff_mov_read_esds(AVFormatContext *fc, AVIOContext *pb); enum AVCodecID ff_mov_get_lpcm_codec_id(int bps, int flags); int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries); diff --git a/libavformat/mov.c b/libavformat/mov.c index d28553a5ed..1255824264 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -580,7 +580,7 @@ static int mov_read_hdlr(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } -int ff_mov_read_esds(AVFormatContext *fc, AVIOContext *pb, MOVAtom atom) +int ff_mov_read_esds(AVFormatContext *fc, AVIOContext *pb) { AVStream *st; int tag; @@ -604,7 +604,7 @@ int ff_mov_read_esds(AVFormatContext *fc, AVIOContext *pb, MOVAtom atom) static int mov_read_esds(MOVContext *c, AVIOContext *pb, MOVAtom atom) { - return ff_mov_read_esds(c->fc, pb, atom); + return ff_mov_read_esds(c->fc, pb); } static int mov_read_dac3(MOVContext *c, AVIOContext *pb, MOVAtom atom) |