Commit 49776bde authored by Laurent Aimar's avatar Laurent Aimar

Check for CODEC_TYPE_ATTACHMENT for outdated ffmpeg library (more than 7

month old)
parent 4433dd43
...@@ -51,6 +51,8 @@ ...@@ -51,6 +51,8 @@
/* Version checking */ /* Version checking */
#if defined(HAVE_FFMPEG_AVFORMAT_H) || defined(HAVE_LIBAVFORMAT_AVFORMAT_H) #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 * demux_sys_t: demux descriptor
*****************************************************************************/ *****************************************************************************/
...@@ -244,9 +246,10 @@ int OpenDemux( vlc_object_t *p_this ) ...@@ -244,9 +246,10 @@ int OpenDemux( vlc_object_t *p_this )
es_format_Init( &fmt, UNKNOWN_ES, 0 ); es_format_Init( &fmt, UNKNOWN_ES, 0 );
if( cc->codec_type == CODEC_TYPE_DATA ) if( cc->codec_type == CODEC_TYPE_DATA )
psz_type = "data"; psz_type = "data";
#ifdef HAVE_FFMPEG_CODEC_ATTACHMENT
else if( cc->codec_type == CODEC_TYPE_ATTACHMENT ) else if( cc->codec_type == CODEC_TYPE_ATTACHMENT )
psz_type = "attachment"; psz_type = "attachment";
#endif
msg_Warn( p_demux, "unsupported track type in ffmpeg demux" ); msg_Warn( p_demux, "unsupported track type in ffmpeg demux" );
break; break;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment