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 )
/* 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 )
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.")
/*****************************************************************************
- * demux.c: demuxer using ffmpeg (libavformat).
+ * demux.c: demuxer using libavformat
*****************************************************************************
* Copyright (C) 2004-2009 the VideoLAN team
* $Id$
#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
/*****************************************************************************
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;
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
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;
}
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 )