diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-04 04:06:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-04 04:06:26 +0200 |
| commit | 707e8612e85ba83fcbbfc56be3f4ab24af7e98fb (patch) | |
| tree | 63a0dec27eaca16ab40ea8d6a888bbf97662151e /libavformat | |
| parent | b5f20892c960ab9058c74703b29d7bf9d248bd36 (diff) | |
| parent | 8ce67bcabe7f50622430c11c3384675f095c78b5 (diff) | |
| download | ffmpeg-707e8612e85ba83fcbbfc56be3f4ab24af7e98fb.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
Implement fate-rsync target
Make ffmpeg support generic data stream
Conflicts:
cmdutils.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/riff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 48a8df4e18..cea8c1349a 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -603,6 +603,7 @@ void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssiz *au_scale=stream->frame_size; *au_rate= stream->sample_rate; }else if(stream->codec_type == AVMEDIA_TYPE_VIDEO || + stream->codec_type == AVMEDIA_TYPE_DATA || stream->codec_type == AVMEDIA_TYPE_SUBTITLE){ *au_scale= stream->time_base.num; *au_rate = stream->time_base.den; |