Revision b24bbbb4

View differences:

libavcodec/avcodec.h
30 30
#include "libavutil/avutil.h"
31 31

  
32 32
#define LIBAVCODEC_VERSION_MAJOR 52
33
#define LIBAVCODEC_VERSION_MINOR 25
33
#define LIBAVCODEC_VERSION_MINOR 26
34 34
#define LIBAVCODEC_VERSION_MICRO  0
35 35

  
36 36
#define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
......
313 313
    CODEC_ID_MP1,
314 314
    CODEC_ID_TWINVQ,
315 315
    CODEC_ID_TRUEHD,
316
    CODEC_ID_MP4ALS,
316 317

  
317 318
    /* subtitle codecs */
318 319
    CODEC_ID_DVD_SUBTITLE= 0x17000,
libavformat/mov.c
384 384
    { CODEC_ID_MP3ON4, AOT_L1   }, /* layer 1 */
385 385
    { CODEC_ID_MP3ON4, AOT_L2   }, /* layer 2 */
386 386
    { CODEC_ID_MP3ON4, AOT_L3   }, /* layer 3 */
387
    { CODEC_ID_MP4ALS, AOT_ALS  }, /* MPEG-4 ALS */
387 388
    { CODEC_ID_NONE,   AOT_NULL },
388 389
};
389 390

  

Also available in: Unified diff