[FFmpeg-cvslog] Merge commit '8dc4b2c92e492aa172327d10c926d5ca3a04371c' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sat Sep  7 13:13:12 2013 +0200| [6bfa823b70ec135b59e036106eb403a546145faa] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6bfa823b70ec135b59e036106eb403a546145faa
---