[vlc-commits] FFmpeg => AVformat

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Aug 29 15:22:37 2011 +0200| [d895ab4f60c22a8c6a348af09ab6cd9e9b87f07e] | committer: Jean-Baptiste Kempf

FFmpeg => AVformat

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

 modules/demux/avformat/avformat.c |    4 ++--
 modules/demux/avformat/avformat.h |    4 ++--
 modules/demux/avformat/demux.c    |   12 ++++++------
 modules/demux/avformat/mux.c      |    2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/demux/avformat/avformat.c b/modules/demux/avformat/avformat.c
index 8d41faa..70ce57f 100644
--- a/modules/demux/avformat/avformat.c
+++ b/modules/demux/avformat/avformat.c
@@ -37,7 +37,7 @@ vlc_module_begin ()
     add_shortcut( "ffmpeg", "avformat" )
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_DEMUX )
-    set_description( N_("FFmpeg demuxer" ) )
+    set_description( N_("Avformat demuxer" ) )
     set_shortname( N_("Avformat") )
     set_capability( "demux", 2 )
     set_callbacks( OpenDemux, CloseDemux )
@@ -46,7 +46,7 @@ vlc_module_begin ()
     /* mux submodule */
     add_submodule ()
     add_shortcut( "ffmpeg", "avformat" )
-    set_description( N_("FFmpeg muxer" ) )
+    set_description( N_("Avformat muxer" ) )
     set_capability( "sout mux", 2 )
     add_string( "ffmpeg-mux", NULL, MUX_TEXT,
                 MUX_LONGTEXT, true )
diff --git a/modules/demux/avformat/avformat.h b/modules/demux/avformat/avformat.h
index 46fce3a..62c8e99 100644
--- a/modules/demux/avformat/avformat.h
+++ b/modules/demux/avformat/avformat.h
@@ -32,5 +32,5 @@ void CloseDemux( vlc_object_t * );
 int  OpenMux ( vlc_object_t * );
 void CloseMux( vlc_object_t * );
 
-#define MUX_TEXT N_("Ffmpeg mux")
-#define MUX_LONGTEXT N_("Force use of ffmpeg muxer.")
+#define MUX_TEXT N_("Avformat mux")
+#define MUX_LONGTEXT N_("Force use of a specific avformat muxer.")
diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index 5fe1834..d3209ad 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * demux.c: demuxer using ffmpeg (libavformat).
+ * demux.c: demuxer using libavformat
  *****************************************************************************
  * Copyright (C) 2004-2009 the VideoLAN team
  * $Id$
@@ -52,7 +52,7 @@
 #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
+#   define HAVE_AVUTIL_CODEC_ATTACHMENT 1
 #endif
 
 /*****************************************************************************
@@ -353,7 +353,7 @@ int OpenDemux( vlc_object_t *p_this )
 
         default:
             es_format_Init( &fmt, UNKNOWN_ES, 0 );
-#ifdef HAVE_FFMPEG_CODEC_ATTACHMENT
+#ifdef HAVE_AVUTIL_CODEC_ATTACHMENT
             if( cc->codec_type == AVMEDIA_TYPE_ATTACHMENT )
             {
                 input_attachment_t *p_attachment;
@@ -371,7 +371,7 @@ int OpenDemux( vlc_object_t *p_this )
                                 p_attachment );
                     }
                 }
-                else msg_Warn( p_demux, "unsupported attachment type (%u) in ffmpeg demux", cc->codec_id );
+                else msg_Warn( p_demux, "unsupported attachment type (%u) in avformat demux", cc->codec_id );
             }
             else
 #endif
@@ -379,7 +379,7 @@ int OpenDemux( vlc_object_t *p_this )
                 if( cc->codec_type == AVMEDIA_TYPE_DATA )
                     psz_type = "data";
 
-                msg_Warn( p_demux, "unsupported track type in ffmpeg demux" );
+                msg_Warn( p_demux, "unsupported track type (%u) in avformat demux", cc->codec_type );
             }
             break;
         }
@@ -391,7 +391,7 @@ int OpenDemux( vlc_object_t *p_this )
         if( s->disposition & AV_DISPOSITION_DEFAULT )
             fmt.i_priority = 1000;
 
-#ifdef HAVE_FFMPEG_CODEC_ATTACHMENT
+#ifdef HAVE_AVUTIL_CODEC_ATTACHMENT
         if( cc->codec_type != AVMEDIA_TYPE_ATTACHMENT )
 #endif
         if( cc->codec_type != AVMEDIA_TYPE_DATA )
diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
index f11c491..9c87073 100644
--- a/modules/demux/avformat/mux.c
+++ b/modules/demux/avformat/mux.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * mux.c: muxer using ffmpeg (libavformat).
+ * mux.c: muxer using libavformat
  *****************************************************************************
  * Copyright (C) 2006 the VideoLAN team
  * $Id$