diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-30 17:58:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-30 18:05:39 +0200 |
| commit | ae9a73de2a2fa47e54107765da0cd9b71b4ad8e3 (patch) | |
| tree | d35aabeb605a384095f72b3f21c8f2becd276541 /libavformat/mpjpeg.c | |
| parent | 0c911c8fbc871d9368b4c172300197adc4b06991 (diff) | |
| parent | 253d0be6a1ecc343d29ff8e1df0ddf961ab9c772 (diff) | |
| download | ffmpeg-ae9a73de2a2fa47e54107765da0cd9b71b4ad8e3.tar.gz | |
Merge commit '253d0be6a1ecc343d29ff8e1df0ddf961ab9c772'
* commit '253d0be6a1ecc343d29ff8e1df0ddf961ab9c772':
pgssubdec: handle more complex PGS scenarios
Conflicts:
libavcodec/pgssubdec.c
Some of this has been split out and commited in cleanly split patches immedeately
before this merge
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpjpeg.c')
0 files changed, 0 insertions, 0 deletions