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 /libavformat/mov.c | |
| 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>
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) |