Commit d6a7b808 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Be more precise in libavcodec/libavformat/libavutil separation

parent cc23f932
/*****************************************************************************
* 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
*
......
......@@ -265,7 +265,7 @@ ATTR_PACKED
#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 */
......@@ -275,7 +275,7 @@ ATTR_PACKED
#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
......@@ -395,7 +395,7 @@ wave_format_tag_to_fourcc[] =
{ 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" },
......
......@@ -38,7 +38,7 @@
*/
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 */
};
......
......@@ -249,7 +249,7 @@ static int Open( vlc_object_t * p_this )
{
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,
......
......@@ -533,7 +533,7 @@ static int ParseVOP( decoder_t *p_dec, block_t *p_vop )
return VLC_SUCCESS;
}
/* look at ffmpeg av_log2 ;) */
/* look at libavutil av_log2 ;) */
static int vlc_log2( unsigned int v )
{
int n = 0;
......
......@@ -189,8 +189,8 @@ static const staticentry_t p_list_video[] = {
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"),
......@@ -547,8 +547,8 @@ static const staticentry_t p_list_video[] = {
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 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment