diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-12 15:21:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-12 15:22:37 +0200 |
| commit | ba77fb61f741d9ab3bd12935527556055b2ffb2e (patch) | |
| tree | 2dda7ae00512199a18ba46d717ef8cd8ce6d8559 /libavformat/mov.c | |
| parent | e72988d3f804fbcf628fa95cb7374ac05ae61d84 (diff) | |
| parent | d80811c94e068085aab797f9ba35790529126f85 (diff) | |
Merge commit 'd80811c94e068085aab797f9ba35790529126f85'
* commit 'd80811c94e068085aab797f9ba35790529126f85':
riff: Use the correct logging context
Conflicts:
libavformat/asfdec_o.c
libavformat/avidec.c
libavformat/dxa.c
libavformat/matroskadec.c
libavformat/mov.c
libavformat/riff.h
libavformat/riffdec.c
libavformat/wavdec.c
libavformat/wtvdec.c
libavformat/xwma.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 6d598630a0..453e85c934 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -769,7 +769,7 @@ static int mov_read_wfex(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; st = c->fc->streams[c->fc->nb_streams-1]; - if ((ret = ff_get_wav_header(pb, st->codec, atom.size, 0)) < 0) + if ((ret = ff_get_wav_header(c->fc, pb, st->codec, atom.size, 0)) < 0) av_log(c->fc, AV_LOG_WARNING, "get_wav_header failed\n"); return ret; |