/*****************************************************************************
- * vlc_avcodec.h: VLC thread support for FFMPEG/libavcodec
+ * vlc_avcodec.h: VLC thread support for libavcodec
*****************************************************************************
* Copyright (C) 2009-2010 RĂ©mi Denis-Courmont
*
#define WAVE_FORMAT_A52 0x2000 /* a52 */
#define WAVE_FORMAT_DTS 0x2001 /* DTS */
-#define WAVE_FORMAT_FFMPEG_AAC 0x706D
+#define WAVE_FORMAT_AVCODEC_AAC 0x706D
#define WAVE_FORMAT_DIVIO_AAC 0x4143 /* Divio's AAC */
#define WAVE_FORMAT_GSM_AMR_FIXED 0x7A21 /* Fixed bitrate, no SID */
#define WAVE_FORMAT_DK3 0x0061
#define WAVE_FORMAT_DK4 0x0062
-/* At least FFmpeg use that ID: from libavformat/riff.c ('Vo' == 0x566f)
+/* At least libavformat use that ID: from libavformat/riff.c ('Vo' == 0x566f)
* { CODEC_ID_VORBIS, ('V'<<8)+'o' }, //HACK/FIXME, does vorbis in WAV/AVI have an (in)official id?
*/
#define WAVE_FORMAT_VORBIS 0x566f
{ WAVE_FORMAT_AAC, VLC_CODEC_MP4A, "MPEG-4 Audio" },
{ WAVE_FORMAT_AAC_2, VLC_CODEC_MP4A, "MPEG-4 Audio" },
{ WAVE_FORMAT_AAC_LATM, VLC_CODEC_MP4A, "MPEG-4 Audio" },
- { WAVE_FORMAT_FFMPEG_AAC, VLC_CODEC_MP4A, "MPEG-4 Audio" },
+ { WAVE_FORMAT_AVCODEC_AAC, VLC_CODEC_MP4A, "MPEG-4 Audio" },
{ WAVE_FORMAT_AAC_MS, VLC_CODEC_MP4A, "MPEG-4 Audio" },
{ WAVE_FORMAT_VORBIS, VLC_CODEC_VORBIS, "Vorbis Audio" },
{ WAVE_FORMAT_VORB_1, VLC_FOURCC( 'v', 'o', 'r', '1' ), "Vorbis 1 Audio" },
*/
struct video_palette_t
{
- int i_entries; /**< to keep the compatibility with ffmpeg's palette */
+ int i_entries; /**< to keep the compatibility with libavcodec's palette */
uint8_t palette[256][4]; /**< 4-byte RGBA/YUVA palette */
};
{
if( fh.i_compression == 'F' || fh.i_compression == 'R' )
{
- /* ffmpeg extra data */
+ /* libavcodec extra data */
p_sys->i_extra_f = fh.i_length;
p_sys->p_extra_f = malloc( fh.i_length );
if( p_sys->p_extra_f == NULL || stream_Read( p_demux->s,
return VLC_SUCCESS;
}
-/* look at ffmpeg av_log2 ;) */
+/* look at libavutil av_log2 ;) */
static int vlc_log2( unsigned int v )
{
int n = 0;
E("hdx4", "Jomigo HDX4 (MPEG-4 Video)"),
E("SMP4", "Samsung SMP4 (MPEG-4 Video)"),
E("smp4", "Samsung SMP4 (MPEG-4 Video)"),
- E("fvfw", "FFmpeg MPEG-4"),
- E("FVFW", "FFmpeg MPEG-4"),
+ E("fvfw", "libavcodec MPEG-4"),
+ E("FVFW", "libavcodec MPEG-4"),
E("FFDS", "FFDShow MPEG-4"),
E("VIDM", "vidm 4.01 codec"),
E("DP02", "DynaPel MPEG-4 codec"),
B(VLC_CODEC_ASV2, "Asus V2 Video"),
A("ASV2"),
- /* FFMPEG Video 1 (lossless codec) */
- B(VLC_CODEC_FFV1, "FFMpeg Video 1"),
+ /* FF video codec 1 (lossless codec) */
+ B(VLC_CODEC_FFV1, "FF video codec 1"),
A("FFV1"),
/* ATI VCR1 */