[FFmpeg-cvslog] r23260 - trunk/libavformat/nutdec.c

stefano subversion
Sun May 23 20:34:19 CEST 2010


Author: stefano
Date: Sun May 23 20:34:18 2010
New Revision: 23260

Log:
Make the nut decoder read the ff_nut_video_tags to detect codec id of
the input file.

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

Modified:
   trunk/libavformat/nutdec.c

Modified: trunk/libavformat/nutdec.c
==============================================================================
--- trunk/libavformat/nutdec.c	Sun May 23 20:34:15 2010	(r23259)
+++ trunk/libavformat/nutdec.c	Sun May 23 20:34:18 2010	(r23260)
@@ -316,7 +316,9 @@ static int decode_stream_header(NUTConte
     {
         case 0:
             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;
         case 1:
             st->codec->codec_type = AVMEDIA_TYPE_AUDIO;



More information about the ffmpeg-cvslog mailing list