vlc | branch: master | Sébastien Escudier <[email protected]> | Fri Feb 17 10:01:01 2012 +0100| [25ef7e7d6ff11b629788432a5314e72830c98248] | committer: Sébastien Escudier
fix [56e7865dce2] compilation > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=25ef7e7d6ff11b629788432a5314e72830c98248 --- modules/demux/avformat/avformat.c | 3 --- modules/demux/avformat/avformat.h | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/demux/avformat/avformat.c b/modules/demux/avformat/avformat.c index 18f8640..24905f3 100644 --- a/modules/demux/avformat/avformat.c +++ b/modules/demux/avformat/avformat.c @@ -32,9 +32,6 @@ #include "avformat.h" -#define FORMAT_TEXT N_( "Format name" ) -#define FORMAT_LONGTEXT N_( "Internal libavcodec format name" ) - vlc_module_begin () #endif /* MERGE_FFMPEG */ add_shortcut( "ffmpeg", "avformat" ) diff --git a/modules/demux/avformat/avformat.h b/modules/demux/avformat/avformat.h index 62c8e99..942d41d 100644 --- a/modules/demux/avformat/avformat.h +++ b/modules/demux/avformat/avformat.h @@ -34,3 +34,5 @@ void CloseMux( vlc_object_t * ); #define MUX_TEXT N_("Avformat mux") #define MUX_LONGTEXT N_("Force use of a specific avformat muxer.") +#define FORMAT_TEXT N_( "Format name" ) +#define FORMAT_LONGTEXT N_( "Internal libavcodec format name" ) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
