diff options
| author | Paul B Mahol <onemda@gmail.com> | 2016-04-14 18:21:08 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2016-04-14 18:21:08 +0200 |
| commit | 323b8c95e41094b90ed2a9bdd9a06d22d2f74856 (patch) | |
| tree | d0bb264c76b926aa306f9668adfa79361d8a56db /libavformat/mov.c | |
| parent | 8e26bdd59bf559d00c7e60c53fff292de10139ff (diff) | |
| download | ffmpeg-323b8c95e41094b90ed2a9bdd9a06d22d2f74856.tar.gz | |
avformat: add AVFormatContext to ff_get_extradata()
Needed for av_log() inside that function.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 42f8834771..47af98cead 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1568,7 +1568,7 @@ static int mov_read_wave(MOVContext *c, AVIOContext *pb, MOVAtom atom) st->codecpar->codec_id == AV_CODEC_ID_SPEEX) { // pass all frma atom to codec, needed at least for QDMC and QDM2 av_freep(&st->codecpar->extradata); - ret = ff_get_extradata(st->codecpar, pb, atom.size); + ret = ff_get_extradata(c->fc, st->codecpar, pb, atom.size); if (ret < 0) return ret; } else if (atom.size > 8) { /* to read frma, esds atoms */ @@ -1635,7 +1635,7 @@ static int mov_read_glbl(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } av_freep(&st->codecpar->extradata); - ret = ff_get_extradata(st->codecpar, pb, atom.size); + ret = ff_get_extradata(c->fc, st->codecpar, pb, atom.size); if (ret < 0) return ret; @@ -1661,7 +1661,7 @@ static int mov_read_dvc1(MOVContext *c, AVIOContext *pb, MOVAtom atom) avio_seek(pb, 6, SEEK_CUR); av_freep(&st->codecpar->extradata); - ret = ff_get_extradata(st->codecpar, pb, atom.size - 7); + ret = ff_get_extradata(c->fc, st->codecpar, pb, atom.size - 7); if (ret < 0) return ret; @@ -1689,7 +1689,7 @@ static int mov_read_strf(MOVContext *c, AVIOContext *pb, MOVAtom atom) avio_skip(pb, 40); av_freep(&st->codecpar->extradata); - ret = ff_get_extradata(st->codecpar, pb, atom.size - 40); + ret = ff_get_extradata(c->fc, st->codecpar, pb, atom.size - 40); if (ret < 0) return ret; @@ -2028,7 +2028,7 @@ static int mov_parse_stsd_data(MOVContext *c, AVIOContext *pb, if ((int)size != size) return AVERROR(ENOMEM); - ret = ff_get_extradata(st->codecpar, pb, size); + ret = ff_get_extradata(c->fc, st->codecpar, pb, size); if (ret < 0) return ret; if (size > 16) { |