diff options
| author | Michael Niedermayer <[email protected]> | 2013-10-16 14:02:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-10-16 14:02:43 +0200 |
| commit | ab16d5b7b56e66fefab75292d6a0e0f731a8966d (patch) | |
| tree | c1dd80a18fa3fd799793168e8b6449e4b5982d12 /libavformat/mpegts.c | |
| parent | 8610751d07bc4c82a8e0cf416c39e845884e6b4d (diff) | |
| parent | a90905db2e6ab1840890f3a88bfd3bf008b9d886 (diff) | |
Merge commit 'a90905db2e6ab1840890f3a88bfd3bf008b9d886'
* commit 'a90905db2e6ab1840890f3a88bfd3bf008b9d886':
ffv1: Assume bitdepth 0 means 8bit
Conflicts:
libavcodec/ffv1dec.c
Note, FFmpeg is not affected by this bug
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/mpegts.c')
0 files changed, 0 insertions, 0 deletions