diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 18:10:31 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 18:30:50 +0400 |
| commit | c1362ca0479eedc6171306276f6ed4baa7e9882f (patch) | |
| tree | 9ecfaddc542e2842c7830e80607d3006c61e0a0d /libavcodec/mjpegdec.h | |
| parent | 2b318f8ca91674aea75a0ab8c7e8a7ceae1a2ff1 (diff) | |
| parent | e588615d938f8581f0d6f3771662d08cadfc00de (diff) | |
Merge commit 'e588615d938f8581f0d6f3771662d08cadfc00de'
* commit 'e588615d938f8581f0d6f3771662d08cadfc00de':
hevc: fix decoding of one PU wide files
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.h')
0 files changed, 0 insertions, 0 deletions