fourcc.c 14.9 KB
Newer Older
1
/*****************************************************************************
2
 * fourcc.c: libavcodec <-> libvlc conversion routines
3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
 *****************************************************************************
 * Copyright (C) 1999-2008 the VideoLAN team
 * $Id$
 *
 * Authors: Laurent Aimar <fenrir@via.ecp.fr>
 *          Gildas Bazin <gbazin@videolan.org>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
 *****************************************************************************/

25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif

#include <vlc_common.h>
#include <vlc_codec.h>

#ifdef HAVE_LIBAVCODEC_AVCODEC_H
#   include <libavcodec/avcodec.h>
#elif defined(HAVE_FFMPEG_AVCODEC_H)
#   include <ffmpeg/avcodec.h>
#else
#   include <avcodec.h>
#endif
#include "avcodec.h"

41 42 43
/*****************************************************************************
 * Codec fourcc -> ffmpeg_id mapping
 *****************************************************************************/
44
static const struct
45 46 47 48 49 50 51 52 53 54
{
    vlc_fourcc_t  i_fourcc;
    int  i_codec;
    int  i_cat;
} codecs_table[] =
{
    /*
     * Video Codecs
     */

55 56 57 58 59
    { VLC_CODEC_MP1V, CODEC_ID_MPEG1VIDEO, VIDEO_ES },

    { VLC_CODEC_MP2V, CODEC_ID_MPEG2VIDEO, VIDEO_ES },

    { VLC_CODEC_MP4V, CODEC_ID_MPEG4, VIDEO_ES },
60 61
    /* 3ivx delta 3.5 Unsupported
     * putting it here gives extreme distorted images
62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93
    { VLC_FOURCC('3','I','V','1'), CODEC_ID_MPEG4, VIDEO_ES },
    { VLC_FOURCC('3','i','v','1'), CODEC_ID_MPEG4, VIDEO_ES }, */

    { VLC_CODEC_DIV1, CODEC_ID_MSMPEG4V1, VIDEO_ES },
    { VLC_CODEC_DIV2, CODEC_ID_MSMPEG4V2, VIDEO_ES },
    { VLC_CODEC_DIV3, CODEC_ID_MSMPEG4V3, VIDEO_ES },

    { VLC_CODEC_SVQ1, CODEC_ID_SVQ1, VIDEO_ES },
    { VLC_CODEC_SVQ3, CODEC_ID_SVQ3, VIDEO_ES },

    { VLC_CODEC_H264, CODEC_ID_H264, VIDEO_ES },
    { VLC_CODEC_H263, CODEC_ID_H263, VIDEO_ES },
    { VLC_CODEC_H263I,CODEC_ID_H263I,VIDEO_ES },
    { VLC_CODEC_H263P,CODEC_ID_H263P,VIDEO_ES },

    { VLC_CODEC_FLV1, CODEC_ID_FLV1, VIDEO_ES },

    { VLC_CODEC_H261, CODEC_ID_H261, VIDEO_ES },
    { VLC_CODEC_FLIC, CODEC_ID_FLIC, VIDEO_ES },

    { VLC_CODEC_MJPG, CODEC_ID_MJPEG, VIDEO_ES },
    { VLC_CODEC_MJPGB,CODEC_ID_MJPEGB,VIDEO_ES },
    { VLC_CODEC_LJPG, CODEC_ID_LJPEG, VIDEO_ES },

    { VLC_CODEC_SP5X, CODEC_ID_SP5X, VIDEO_ES },

    { VLC_CODEC_DV,   CODEC_ID_DVVIDEO, VIDEO_ES },

    { VLC_CODEC_WMV1, CODEC_ID_WMV1, VIDEO_ES },
    { VLC_CODEC_WMV2, CODEC_ID_WMV2, VIDEO_ES },
    { VLC_CODEC_WMV3, CODEC_ID_WMV3, VIDEO_ES },

94
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 10, 1 )
95
    { VLC_CODEC_VC1,  CODEC_ID_VC1, VIDEO_ES },
96 97
#endif

98 99
    { VLC_CODEC_MSVIDEO1, CODEC_ID_MSVIDEO1, VIDEO_ES },
    { VLC_CODEC_MSRLE, CODEC_ID_MSRLE, VIDEO_ES },
100

101
    { VLC_CODEC_INDEO2, CODEC_ID_INDEO2, VIDEO_ES },
102
    /* Indeo Video Codecs (Quality of this decoder on ppc is not good) */
103 104 105 106 107 108 109
    { VLC_CODEC_INDEO3, CODEC_ID_INDEO3, VIDEO_ES },

    { VLC_CODEC_HUFFYUV, CODEC_ID_HUFFYUV, VIDEO_ES },
    { VLC_CODEC_FFVHUFF, CODEC_ID_FFVHUFF, VIDEO_ES },
    { VLC_CODEC_CYUV, CODEC_ID_CYUV, VIDEO_ES },

    { VLC_CODEC_VP3, CODEC_ID_VP3, VIDEO_ES },
110
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 14, 0 )
111
    { VLC_CODEC_VP5, CODEC_ID_VP5, VIDEO_ES },
112
#endif
113
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 27, 0 )
114 115
    { VLC_CODEC_VP6, CODEC_ID_VP6, VIDEO_ES },
    { VLC_CODEC_VP6F, CODEC_ID_VP6F, VIDEO_ES },
116
#endif
117
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 47, 0 )
118
    { VLC_CODEC_VP6A, CODEC_ID_VP6A, VIDEO_ES },
119 120
#endif

121
    { VLC_CODEC_THEORA, CODEC_ID_THEORA, VIDEO_ES },
122 123 124

#if ( !defined( WORDS_BIGENDIAN ) )
    /* Asus Video (Another thing that doesn't work on PPC) */
125 126
    { VLC_CODEC_ASV1, CODEC_ID_ASV1, VIDEO_ES },
    { VLC_CODEC_ASV2, CODEC_ID_ASV2, VIDEO_ES },
127 128
#endif

129
    { VLC_CODEC_FFV1, CODEC_ID_FFV1, VIDEO_ES },
130

131
    { VLC_CODEC_VCR1, CODEC_ID_VCR1, VIDEO_ES },
132

133
    { VLC_CODEC_CLJR, CODEC_ID_CLJR, VIDEO_ES },
134 135

    /* Real Video */
136
    { VLC_CODEC_RV10, CODEC_ID_RV10, VIDEO_ES },
137
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 15, 1 )
138
    { VLC_CODEC_RV20, CODEC_ID_RV20, VIDEO_ES },
139
#endif
140
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 8, 0 )
141
    { VLC_CODEC_RV30, CODEC_ID_RV30, VIDEO_ES },
142
#endif
143
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 5, 0 )
144
    { VLC_CODEC_RV40, CODEC_ID_RV40, VIDEO_ES },
145 146
#endif

147
    { VLC_CODEC_RPZA, CODEC_ID_RPZA, VIDEO_ES },
148

149
    { VLC_CODEC_SMC, CODEC_ID_SMC, VIDEO_ES },
150

151
    { VLC_CODEC_CINEPAK, CODEC_ID_CINEPAK, VIDEO_ES },
152

153
    { VLC_CODEC_TSCC, CODEC_ID_TSCC, VIDEO_ES },
154

155
    { VLC_CODEC_CSCD, CODEC_ID_CSCD, VIDEO_ES },
156

157
    { VLC_CODEC_ZMBV, CODEC_ID_ZMBV, VIDEO_ES },
158

159
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 13, 0 )
160
    { VLC_CODEC_VMNC, CODEC_ID_VMNC, VIDEO_ES },
161
#endif
162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184
    { VLC_CODEC_FRAPS, CODEC_ID_FRAPS, VIDEO_ES },

    { VLC_CODEC_TRUEMOTION1, CODEC_ID_TRUEMOTION1, VIDEO_ES },
    { VLC_CODEC_TRUEMOTION2, CODEC_ID_TRUEMOTION2, VIDEO_ES },

    { VLC_CODEC_SNOW, CODEC_ID_SNOW, VIDEO_ES },

    { VLC_CODEC_QTRLE, CODEC_ID_QTRLE, VIDEO_ES },

    { VLC_CODEC_QDRAW, CODEC_ID_QDRAW, VIDEO_ES },

    { VLC_CODEC_QPEG, CODEC_ID_QPEG, VIDEO_ES },

    { VLC_CODEC_ULTI, CODEC_ID_ULTI, VIDEO_ES },

    { VLC_CODEC_VIXL, CODEC_ID_VIXL, VIDEO_ES },

    { VLC_CODEC_LOCO, CODEC_ID_LOCO, VIDEO_ES },

    { VLC_CODEC_WNV1, CODEC_ID_WNV1, VIDEO_ES },

    { VLC_CODEC_AASC, CODEC_ID_AASC, VIDEO_ES },

185
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 11, 0 )
186
    { VLC_CODEC_FLASHSV, CODEC_ID_FLASHSV, VIDEO_ES },
187
#endif
188
    { VLC_CODEC_KMVC, CODEC_ID_KMVC, VIDEO_ES },
189

190
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 13, 0 )
191
    { VLC_CODEC_NUV, CODEC_ID_NUV, VIDEO_ES },
192 193
#endif

194
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 8, 0 )
195
    { VLC_CODEC_SMACKVIDEO, CODEC_ID_SMACKVIDEO, VIDEO_ES },
196 197 198
#endif

    /* Chinese AVS - Untested */
199
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 8, 0 )
200
    { VLC_CODEC_CAVS, CODEC_ID_CAVS, VIDEO_ES },
201 202
#endif

203
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 40, 0 )
204
    /* Untested yet */
205
    { VLC_CODEC_DNXHD, CODEC_ID_DNXHD, VIDEO_ES },
206
#endif
207
    { VLC_CODEC_8BPS, CODEC_ID_8BPS, VIDEO_ES },
208

209
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 52, 0 )
210
    { VLC_CODEC_MIMIC, CODEC_ID_MIMIC, VIDEO_ES },
211 212 213 214
#endif

    /* Videogames Codecs */

215
    { VLC_CODEC_INTERPLAY, CODEC_ID_INTERPLAY_VIDEO, VIDEO_ES },
216

217
    { VLC_CODEC_IDCIN, CODEC_ID_IDCIN, VIDEO_ES },
218

219
    { VLC_CODEC_4XM, CODEC_ID_4XM, VIDEO_ES },
220

221
    { VLC_CODEC_ROQ, CODEC_ID_ROQ, VIDEO_ES },
222

223
    { VLC_CODEC_MDEC, CODEC_ID_MDEC, VIDEO_ES },
224

225
    { VLC_CODEC_VMDVIDEO, CODEC_ID_VMDVIDEO, VIDEO_ES },
226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253

#if 0
/*    UNTESTED VideoGames*/
    { VLC_FOURCC('W','C','3','V'), CODEC_ID_XAN_WC3,
      VIDEO_ES, "XAN wc3 Video" },
    { VLC_FOURCC('W','C','4','V'), CODEC_ID_XAN_WC4,
      VIDEO_ES, "XAN wc4 Video" },
    { VLC_FOURCC('S','T','3','C'), CODEC_ID_TXD,
      VIDEO_ES, "Renderware TeXture Dictionary" },
    { VLC_FOURCC('V','Q','A','V'), CODEC_ID_WS_VQA,
      VIDEO_ES, "WestWood Vector Quantized Animation" },
    { VLC_FOURCC('T','S','E','Q'), CODEC_ID_TIERTEXSEQVIDEO,
      VIDEO_ES, "Tiertex SEQ Video" },
    { VLC_FOURCC('D','X','A','1'), CODEC_ID_DXA,
      VIDEO_ES, "Feeble DXA Video" },
    { VLC_FOURCC('D','C','I','V'), CODEC_ID_DSICINVIDEO,
      VIDEO_ES, "Delphine CIN Video" },
    { VLC_FOURCC('T','H','P','V'), CODEC_ID_THP,
      VIDEO_ES, "THP Video" },
    { VLC_FOURCC('B','E','T','H'), CODEC_ID_BETHSOFTVID,
      VIDEO_ES, "THP Video" },
    { VLC_FOURCC('C','9','3','V'), CODEC_ID_C93,
      VIDEO_ES, "THP Video" },
#endif

    /*
     *  Image codecs
     */
254 255 256 257 258 259
    { VLC_CODEC_PNG, CODEC_ID_PNG, VIDEO_ES },
    { VLC_CODEC_PPM, CODEC_ID_PPM, VIDEO_ES },
    { VLC_CODEC_PGM, CODEC_ID_PGM, VIDEO_ES },
    { VLC_CODEC_PGMYUV, CODEC_ID_PGMYUV, VIDEO_ES },
    { VLC_CODEC_PAM, CODEC_ID_PAM, VIDEO_ES },
    { VLC_CODEC_JPEGLS, CODEC_ID_JPEGLS, VIDEO_ES },
260

261
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 0, 0 )
262
    { VLC_CODEC_BMP, CODEC_ID_BMP, VIDEO_ES },
263 264
#endif

265
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 40, 1 )
266 267 268
    { VLC_CODEC_TIFF, CODEC_ID_TIFF, VIDEO_ES },
    { VLC_CODEC_GIF, CODEC_ID_GIF, VIDEO_ES },
    { VLC_CODEC_TARGA, CODEC_ID_TARGA, VIDEO_ES },
269
#endif
270
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 40, 3 )
271
    { VLC_CODEC_SGI, CODEC_ID_SGI, VIDEO_ES },
272 273
#endif

274
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 55, 0 )
275
    { VLC_CODEC_DIRAC, CODEC_ID_DIRAC, VIDEO_ES },
276 277
#endif

278 279 280 281
    /*
     *  Audio Codecs
     */

282 283 284 285 286 287 288
    { VLC_CODEC_WMA1, CODEC_ID_WMAV1, AUDIO_ES },
    { VLC_CODEC_WMA2, CODEC_ID_WMAV2, AUDIO_ES },

    { VLC_CODEC_DVAUDIO, CODEC_ID_DVAUDIO, AUDIO_ES },

    { VLC_CODEC_MACE3, CODEC_ID_MACE3, AUDIO_ES },
    { VLC_CODEC_MACE6, CODEC_ID_MACE6, AUDIO_ES },
289

290
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 41, 1 )
291
    { VLC_CODEC_MUSEPACK7, CODEC_ID_MUSEPACK7, AUDIO_ES },
292
#endif
293
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 48, 0 )
294
    { VLC_CODEC_MUSEPACK8, CODEC_ID_MUSEPACK8, AUDIO_ES },
295 296
#endif

297 298 299 300 301 302
    { VLC_CODEC_RA_144, CODEC_ID_RA_144, AUDIO_ES },
    { VLC_CODEC_RA_288, CODEC_ID_RA_288, AUDIO_ES },

    { VLC_CODEC_MPGA, CODEC_ID_MP3, AUDIO_ES },

    { VLC_CODEC_A52, CODEC_ID_AC3, AUDIO_ES },
303

304
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 0, 0 )
305
    { VLC_CODEC_EAC3, CODEC_ID_EAC3, AUDIO_ES },
306 307
#endif

308
    { VLC_CODEC_DTS, CODEC_ID_DTS, AUDIO_ES },
309

310
    { VLC_CODEC_MP4A, CODEC_ID_AAC, AUDIO_ES },
311

312
    { VLC_CODEC_ADPCM_4XM, CODEC_ID_ADPCM_4XM, AUDIO_ES },
313

314
    { VLC_CODEC_ADPCM_EA, CODEC_ID_ADPCM_EA, AUDIO_ES },
315

316
    { VLC_CODEC_INTERPLAY_DPCM, CODEC_ID_INTERPLAY_DPCM, AUDIO_ES },
317

318
    { VLC_CODEC_ROQ_DPCM, CODEC_ID_ROQ_DPCM, AUDIO_ES },
319

320
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 27, 0 )
321
    { VLC_CODEC_DSICINAUDIO, CODEC_ID_DSICINAUDIO, AUDIO_ES },
322 323
#endif

324 325 326
    { VLC_CODEC_ADPCM_XA, CODEC_ID_ADPCM_XA, AUDIO_ES },
    { VLC_CODEC_ADPCM_ADX, CODEC_ID_ADPCM_ADX, AUDIO_ES },
    { VLC_CODEC_ADPCM_IMA_WS, CODEC_ID_ADPCM_IMA_WS, AUDIO_ES },
327

328
    { VLC_CODEC_VMDAUDIO, CODEC_ID_VMDAUDIO, AUDIO_ES },
329

330
    { VLC_CODEC_ADPCM_G726, CODEC_ID_ADPCM_G726, AUDIO_ES },
331

332 333
    { VLC_CODEC_AMR_NB, CODEC_ID_AMR_NB, AUDIO_ES },
    { VLC_CODEC_AMR_WB, CODEC_ID_AMR_WB, AUDIO_ES },
334

335
    { VLC_CODEC_FLAC, CODEC_ID_FLAC, AUDIO_ES },
336

337
    { VLC_CODEC_ALAC, CODEC_ID_ALAC, AUDIO_ES },
338

339
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 50, 0, 1 )
340
    { VLC_CODEC_QDM2, CODEC_ID_QDM2, AUDIO_ES },
341 342
#endif

343
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 0, 0 )
344
    { VLC_CODEC_COOK, CODEC_ID_COOK, AUDIO_ES },
345 346
#endif

347
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 4, 0 )
348
    { VLC_CODEC_TTA, CODEC_ID_TTA, AUDIO_ES },
349 350
#endif

351
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 8, 0 )
352
    { VLC_CODEC_SHORTEN, CODEC_ID_SHORTEN, AUDIO_ES },
353 354
#endif

355
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 16, 0 )
356
    { VLC_CODEC_WAVPACK, CODEC_ID_WAVPACK, AUDIO_ES },
357 358
#endif

359
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 34, 0 )
360 361
    { VLC_CODEC_GSM, CODEC_ID_GSM, AUDIO_ES },
    { VLC_CODEC_GSM_MS, CODEC_ID_GSM_MS, AUDIO_ES },
362 363
#endif

364
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 40, 4 )
365
    { VLC_CODEC_ATRAC3, CODEC_ID_ATRAC3, AUDIO_ES },
366 367
#endif

368
    { VLC_CODEC_SONIC, CODEC_ID_SONIC, AUDIO_ES },
369

370
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 34, 0 )
371
    { VLC_CODEC_IMC, CODEC_ID_IMC, AUDIO_ES },
372
#endif
373
    { VLC_CODEC_TRUESPEECH, CODEC_ID_TRUESPEECH, AUDIO_ES },
374
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 46, 0 )
375
    { VLC_CODEC_NELLYMOSER, CODEC_ID_NELLYMOSER, AUDIO_ES },
376
#endif
377
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 44, 0 )
378
    { VLC_CODEC_APE, CODEC_ID_APE, AUDIO_ES },
379
#endif
380
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 58, 0 )
381
    { VLC_CODEC_MLP, CODEC_ID_MLP, AUDIO_ES },
382
#endif
383
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 22, 0 )
384
    { VLC_CODEC_TRUEHD, CODEC_ID_TRUEHD, AUDIO_ES },
385
#endif
Jean-Baptiste Kempf's avatar
Jean-Baptiste Kempf committed
386
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 6, 0 )
387
    { VLC_CODEC_QCELP, CODEC_ID_QCELP, AUDIO_ES },
Jean-Baptiste Kempf's avatar
Jean-Baptiste Kempf committed
388 389
#endif

390
    /* PCM */
391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407
    { VLC_CODEC_S8, CODEC_ID_PCM_S8, AUDIO_ES },
    { VLC_CODEC_U8, CODEC_ID_PCM_U8, AUDIO_ES },
    { VLC_CODEC_S16L, CODEC_ID_PCM_S16LE, AUDIO_ES },
    { VLC_CODEC_S16B, CODEC_ID_PCM_S16BE, AUDIO_ES },
    { VLC_CODEC_U16L, CODEC_ID_PCM_U16LE, AUDIO_ES },
    { VLC_CODEC_U16B, CODEC_ID_PCM_U16BE, AUDIO_ES },
    { VLC_CODEC_S24L, CODEC_ID_PCM_S24LE, AUDIO_ES },
    { VLC_CODEC_S24B, CODEC_ID_PCM_S24BE, AUDIO_ES },
    { VLC_CODEC_U24L, CODEC_ID_PCM_U24LE, AUDIO_ES },
    { VLC_CODEC_U24B, CODEC_ID_PCM_U24BE, AUDIO_ES },
    { VLC_CODEC_S32L, CODEC_ID_PCM_S32LE, AUDIO_ES },
    { VLC_CODEC_S32B, CODEC_ID_PCM_S32BE, AUDIO_ES },
    { VLC_CODEC_U32L, CODEC_ID_PCM_U32LE, AUDIO_ES },
    { VLC_CODEC_U32B, CODEC_ID_PCM_U32BE, AUDIO_ES },
    { VLC_CODEC_ALAW, CODEC_ID_PCM_ALAW, AUDIO_ES },
    { VLC_CODEC_MULAW, CODEC_ID_PCM_MULAW, AUDIO_ES },
    { VLC_CODEC_S24DAUD, CODEC_ID_PCM_S24DAUD, AUDIO_ES },
408

409
    /* Subtitle streams */
410
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 41, 0 )
411
    /* Before this version, subs were too experimental */
412 413 414 415
    { VLC_CODEC_SPU, CODEC_ID_DVD_SUBTITLE, SPU_ES },
    { VLC_CODEC_DVBS, CODEC_ID_DVB_SUBTITLE, SPU_ES },
    { VLC_CODEC_SUBT, CODEC_ID_TEXT, SPU_ES },
    { VLC_CODEC_XSUB, CODEC_ID_XSUB, SPU_ES },
416
#endif
417
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 50, 0 )
418
    { VLC_CODEC_SSA, CODEC_ID_SSA, SPU_ES },
419 420
#endif

421
    { 0, 0, UNKNOWN_ES }
422 423
};

424 425
int GetFfmpegCodec( vlc_fourcc_t i_fourcc, int *pi_cat,
                    int *pi_ffmpeg_codec, const char **ppsz_name )
426
{
427
    i_fourcc = vlc_fourcc_GetCodec( UNKNOWN_ES, i_fourcc );
428
    for( unsigned i = 0; codecs_table[i].i_fourcc != 0; i++ )
429 430 431 432 433
    {
        if( codecs_table[i].i_fourcc == i_fourcc )
        {
            if( pi_cat ) *pi_cat = codecs_table[i].i_cat;
            if( pi_ffmpeg_codec ) *pi_ffmpeg_codec = codecs_table[i].i_codec;
434
            if( ppsz_name ) *ppsz_name = vlc_fourcc_GetDescription( UNKNOWN_ES, i_fourcc );//char *)codecs_table[i].psz_name;
435 436 437 438 439 440 441

            return true;
        }
    }
    return false;
}

442 443
int GetVlcFourcc( int i_ffmpeg_codec, int *pi_cat,
                  vlc_fourcc_t *pi_fourcc, const char **ppsz_name )
444
{
445
    for( unsigned i = 0; codecs_table[i].i_codec != 0; i++ )
446 447 448 449 450
    {
        if( codecs_table[i].i_codec == i_ffmpeg_codec )
        {
            if( pi_cat ) *pi_cat = codecs_table[i].i_cat;
            if( pi_fourcc ) *pi_fourcc = codecs_table[i].i_fourcc;
451
            if( ppsz_name ) *ppsz_name = vlc_fourcc_GetDescription( codecs_table[i].i_cat, codecs_table[i].i_fourcc );
452 453 454 455 456 457

            return true;
        }
    }
    return false;
}