virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

Make the nut decoder read the ff_nut_video_tags to detect codec id of

Browse Source 
the input file.

This is required as Nut codec tags are not contained in
ff_codec_bmp_tags.

Originally committed as revision 23260 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini
2010-05-23 18:34:18 +00:00
parent 2e01def0fe
commit 49837b8d24
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/nutdec.c
View File

@ -316,7 +316,9 @@ static int decode_stream_header(NUTContext *nut){
{ {
case 0: case 0:
st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tmp); st->codec->codec_id = av_codec_get_id(
(const AVCodecTag * const []) { ff_codec_bmp_tags, ff_nut_video_tags, 0 },
tmp);
break; break;
case 1: case 1:
st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_type = AVMEDIA_TYPE_AUDIO;