Changeset 49776bde2872747c8285c4aa6c5e07e35e630265

Timestamp:

12/07/08 00:28:34 (4 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[4433dd43f7c4663cb0c8ceb441191c47f58483f3]

git-author:

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

Message:

Check for CODEC_TYPE_ATTACHMENT for outdated ffmpeg library (more than 7
month old)

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)
-
+#define HAVE_FFMPEG_CODEC_ATTACHMENT (LIBAVCODEC_VERSION_INT >= ((51<<16)+(50<<8)+0) )
+
-/*****************************************************************************
- * demux_sys_t: demux descriptor
@@ -245 +247 @@
-            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;