summaryrefslogtreecommitdiff
path: root/libavformat/act.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-12 15:21:15 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-12 15:22:37 +0200
commitba77fb61f741d9ab3bd12935527556055b2ffb2e (patch)
tree2dda7ae00512199a18ba46d717ef8cd8ce6d8559 /libavformat/act.c
parente72988d3f804fbcf628fa95cb7374ac05ae61d84 (diff)
parentd80811c94e068085aab797f9ba35790529126f85 (diff)
downloadffmpeg-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/act.c')
-rw-r--r--libavformat/act.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/act.c b/libavformat/act.c
index 7b6b8406fc..35aacbc459 100644
--- a/libavformat/act.c
+++ b/libavformat/act.c
@@ -75,7 +75,7 @@ static int read_header(AVFormatContext *s)
avio_skip(pb, 16);
size=avio_rl32(pb);
- ff_get_wav_header(pb, st->codec, size, 0);
+ ff_get_wav_header(s, pb, st->codec, size, 0);
/*
8000Hz (Fine-rec) file format has 10 bytes long