[FFmpeg-cvslog] Merge commit '5f7aecde02a95451e514c809f2794c1deba80695'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep  3 14:00:28 2013 +0200| [efb21b0a8fbc61d01ba1f22677abfbca99e6167d] | committer: Michael Niedermayer

Merge commit '5f7aecde02a95451e514c809f2794c1deba80695'

* commit '5f7aecde02a95451e514c809f2794c1deba80695':
  pictordec: break out of both decoding loops when y drops below 0

Conflicts:
	libavcodec/pictordec.c

The added check is redundant.
It shows the error path more clearly though

See: f3f488423a12af9bb4eed6e6868cfa86ece3571b
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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