Merge commit 'b164d66e35d349de414e2f0d7365a147aba8a620'

* commit 'b164d66e35d349de414e2f0d7365a147aba8a620':
  ape: make version-dependent decoding functions called via pointers
  mpegts: add support for stream_type 0x42, which is CAVS

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/apedec.c
Simple merge

diff --cc libavformat/mpeg.h
Simple merge

diff --cc libavformat/mpegts.c
index d413d54,1540a8d..85b5146
--- 1/libavformat/mpegts.c
--- 2/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@@ -560,12 -521,9 +560,13 @@@ static const StreamType ISO_types[] = 
      { 0x04, AVMEDIA_TYPE_AUDIO,        AV_CODEC_ID_MP3 },
      { 0x0f, AVMEDIA_TYPE_AUDIO,        AV_CODEC_ID_AAC },
      { 0x10, AVMEDIA_TYPE_VIDEO,      AV_CODEC_ID_MPEG4 },
 +    /* Makito encoder sets stream type 0x11 for AAC,
 +     * so auto-detect LOAS/LATM instead of hardcoding it. */
 +#if !CONFIG_LOAS_DEMUXER
      { 0x11, AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_AAC_LATM }, /* LATM syntax */
 +#endif
      { 0x1b, AVMEDIA_TYPE_VIDEO,       AV_CODEC_ID_H264 },
+     { 0x42, AVMEDIA_TYPE_VIDEO,       AV_CODEC_ID_CAVS },
      { 0xd1, AVMEDIA_TYPE_VIDEO,      AV_CODEC_ID_DIRAC },
      { 0xea, AVMEDIA_TYPE_VIDEO,        AV_CODEC_ID_VC1 },
      { 0 },

diff --cc libavformat/mpegts.h
Simple merge

diff --cc libavformat/mpegtsenc.c
Simple merge