Changeset 2a07de63333c8e262f23d25ce1e9dddf37d3355c

Timestamp:

12/07/08 00:36:32 (4 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1215815792 +0200

git-parent:

[941254c5f3464a42f559dc605381ddb4226e105f]

git-author:

Laurent Aimar <fenrir@videolan.org> 1215815792 +0200

Message:

Proper CODEC_TYPE_ATTACHMENT check.

Files:

• modules/demux/avformat/demux.c (modified) (2 diffs)

modules/demux/avformat/demux.c

@@ -52 +52 @@
-#if defined(HAVE_FFMPEG_AVFORMAT_H) || defined(HAVE_LIBAVFORMAT_AVFORMAT_H)
-
+#if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(50<<8)+0) )
+#   define HAVE_FFMPEG_CODEC_ATTACHMENT 1
+#endif
+
-/*****************************************************************************
- * demux_sys_t: demux descriptor
@@ -245 +249 @@
-            if( cc->codec_type == CODEC_TYPE_DATA )
-                psz_type = "data";
+#ifdef HAVE_FFMPEG_CODEC_ATTACHMENT
-            else if( cc->codec_type == CODEC_TYPE_ATTACHMENT )
-                psz_type = "attachment";
-
+
-            msg_Warn( p_demux, "unsupported track type in ffmpeg demux" );
-            break;