diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 17:47:12 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 17:47:12 +0200 |
commit | 2d70282254834b276ab5eea44dba694f98551c79 (patch) | |
tree | 57c8bc8f4c248c001eca910f13c26cee3fcf8437 /libavformat/riff.h | |
parent | 95398aa9499bfad3330b47001b7eb086c31b0cd6 (diff) | |
parent | d754ed41727b1fcbab335b510248a9758a73320c (diff) |
Merge commit 'd754ed41727b1fcbab335b510248a9758a73320c'
* commit 'd754ed41727b1fcbab335b510248a9758a73320c':
riffenc: take an AVStream instead of an AVCodecContext
Conflicts:
libavformat/nutenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riff.h')
-rw-r--r-- | libavformat/riff.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/riff.h b/libavformat/riff.h index 6f07179b2a..88a77b07c8 100644 --- a/libavformat/riff.h +++ b/libavformat/riff.h @@ -67,7 +67,7 @@ int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size); extern const AVCodecTag ff_codec_bmp_tags[]; // exposed through avformat_get_riff_video_tags() extern const AVCodecTag ff_codec_wav_tags[]; -void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale); +void ff_parse_specific_params(AVStream *st, int *au_rate, int *au_ssize, int *au_scale); int ff_read_riff_info(AVFormatContext *s, int64_t size); |