diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 00:16:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 00:16:52 +0200 |
| commit | cff8d01e15174aeafa91158ccb7576f9a607d1bf (patch) | |
| tree | 8dd39de9b3298b82a7e16744c0feb332e02efa45 /libpostproc | |
| parent | 8c118207ea0b2fa4a1e8e54f19965c7dfda3755c (diff) | |
| parent | 0af5a774ebc96ae9018926dc8b276c7f39767e3e (diff) | |
| download | ffmpeg-cff8d01e15174aeafa91158ccb7576f9a607d1bf.tar.gz | |
Merge commit '0af5a774ebc96ae9018926dc8b276c7f39767e3e' into release/1.1
* commit '0af5a774ebc96ae9018926dc8b276c7f39767e3e':
jpegls: check the scan offset
jpegls: factorize return paths
jpegls: return meaningful errors
mpegvideo: allocate sufficiently large scratch buffer for interlaced vid
Conflicts:
libavcodec/jpeglsdec.c
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libpostproc')
0 files changed, 0 insertions, 0 deletions