Merge commit 'b164d66e35d349de414e2f0d7365a147aba8a620'

Browse Source

* 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>

pull/11/merge

Michael Niedermayer 12 years ago

parent 9df00574fc b164d66e35

commit 231795270b

5 changed files with 129 additions and 59 deletions

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Unified View

Diff Options

Show Stats Download Patch File Download Diff File

Write Preview

Loading…

Cancel

Save