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/dxa.c | |
| parent | e72988d3f804fbcf628fa95cb7374ac05ae61d84 (diff) | |
| parent | d80811c94e068085aab797f9ba35790529126f85 (diff) | |
| download | ffmpeg-ba77fb61f741d9ab3bd12935527556055b2ffb2e.tar.gz | |
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/dxa.c')
| -rw-r--r-- | libavformat/dxa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/dxa.c b/libavformat/dxa.c index 44033563f8..228e6fdca1 100644 --- a/libavformat/dxa.c +++ b/libavformat/dxa.c @@ -106,7 +106,7 @@ static int dxa_read_header(AVFormatContext *s) ast = avformat_new_stream(s, NULL); if (!ast) return AVERROR(ENOMEM); - ret = ff_get_wav_header(pb, ast->codec, fsize, 0); + ret = ff_get_wav_header(s, pb, ast->codec, fsize, 0); if (ret < 0) return ret; if (ast->codec->sample_rate > 0) |