Merge commit 'b164d66e35d349de414e2f0d7365a147aba8a620'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Mar 2013 12:28:34 +0000 (13:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Mar 2013 12:28:38 +0000 (13:28 +0100)
commit231795270b67496e01ad87731e0e95853146f038
treefaa735beb3fe1e0c3c05de3881222c86d72e4839
parent9df00574fca16b3c8aa9892f9a3ed5bd6482833a
parentb164d66e35d349de414e2f0d7365a147aba8a620
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>
libavcodec/apedec.c
libavformat/mpeg.h
libavformat/mpegts.c
libavformat/mpegts.h
libavformat/mpegtsenc.c