Merge commit '8dc4b2c92e492aa172327d10c926d5ca3a04371c' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 7 Sep 2013 11:13:12 +0000 (13:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 7 Sep 2013 11:13:12 +0000 (13:13 +0200)
commit6bfa823b70ec135b59e036106eb403a546145faa
tree4cd3e330b770111dce9d0906856304b09da095a9
parent701543a081e039a7ee1afd2286f4ccefabb195cc
parent8dc4b2c92e492aa172327d10c926d5ca3a04371c
Merge commit '8dc4b2c92e492aa172327d10c926d5ca3a04371c' into release/1.1

* commit '8dc4b2c92e492aa172327d10c926d5ca3a04371c':
  pictordec: break out of both decoding loops when y drops below 0
  vcr1: add sanity checks

Conflicts:
libavcodec/pictordec.c
libavcodec/vcr1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/pictordec.c
libavcodec/vcr1.c