[vlc-devel] commit: Revert "Check for CODEC_TYPE_ATTACHMENT for outdated ffmpeg library " (Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat Jul 12 00:35:58 2008 +0200| [941254c5f3464a42f559dc605381ddb4226e105f]

Revert "Check for CODEC_TYPE_ATTACHMENT for outdated ffmpeg library"

This reverts commit 49776bde2872747c8285c4aa6c5e07e35e630265.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=941254c5f3464a42f559dc605381ddb4226e105f
---

 modules/demux/avformat/demux.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index 203020d..da323ee 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -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;
         }