Merge commit '0af5a774ebc96ae9018926dc8b276c7f39767e3e' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Jun 2013 22:16:52 +0000 (00:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Jun 2013 22:16:52 +0000 (00:16 +0200)
commitcff8d01e15174aeafa91158ccb7576f9a607d1bf
tree8dd39de9b3298b82a7e16744c0feb332e02efa45
parent8c118207ea0b2fa4a1e8e54f19965c7dfda3755c
parent0af5a774ebc96ae9018926dc8b276c7f39767e3e
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>
libavcodec/jpeglsdec.c