[FFmpeg-cvslog] Merge commit 'b164d66e35d349de414e2f0d7365a147aba8a620'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 15 13:28:34 2013 +0100| [231795270b67496e01ad87731e0e95853146f038] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=231795270b67496e01ad87731e0e95853146f038
---