Commit 941254c5 authored by Laurent Aimar's avatar Laurent Aimar

Revert "Check for CODEC_TYPE_ATTACHMENT for outdated ffmpeg library"

This reverts commit 49776bde.
parent 4f793a16
......@@ -51,8 +51,6 @@
/* Version checking */
#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
*****************************************************************************/
......@@ -246,10 +244,9 @@ int OpenDemux( vlc_object_t *p_this )
es_format_Init( &fmt, UNKNOWN_ES, 0 );
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";
#endif
msg_Warn( p_demux, "unsupported track type in ffmpeg demux" );
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