summaryrefslogtreecommitdiff
path: root/libavformat/riff.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-04-15 04:37:17 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-04-15 04:50:06 +0200
commit85b21147594101ba2d8e7ea2cfa504c0d1baee5a (patch)
tree62927788e459965cea1ff4cd23c219fcf0410b0e /libavformat/riff.h
parent256c5b08bf09cb6403790d731cc1c771d8fb0e94 (diff)
parenta3a0af4fb1237bed0af75868073f9a63db8b1864 (diff)
downloadffmpeg-85b21147594101ba2d8e7ea2cfa504c0d1baee5a.tar.gz
Merge commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864'
* commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864': avutil: make aes and sha api public handle malloc failures in ff_get_wav_header add xWMA demuxer mpegts: force the default timebase libavcodec: Bump micro after adding the dtx AVOptions Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riff.h')
-rw-r--r--libavformat/riff.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/riff.h b/libavformat/riff.h
index d5e1cdf7d8..85caacbb69 100644
--- a/libavformat/riff.h
+++ b/libavformat/riff.h
@@ -45,7 +45,7 @@ int ff_get_bmp_header(AVIOContext *pb, AVStream *st);
void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc, const AVCodecTag *tags, int for_asf);
int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc);
enum CodecID ff_wav_codec_get_id(unsigned int tag, int bps);
-void ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size);
+int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size);
extern const AVCodecTag ff_codec_bmp_tags[];
extern const AVCodecTag ff_codec_wav_tags[];