Merge commit '5f7aecde02a95451e514c809f2794c1deba80695'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Sep 2013 12:00:28 +0000 (14:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Sep 2013 12:12:53 +0000 (14:12 +0200)
commitefb21b0a8fbc61d01ba1f22677abfbca99e6167d
tree355052e76cbc7aa69e4fa98146e1c93ce38a22a5
parent164b67ca281fa5a47b965a858c7783aa547091b8
parent5f7aecde02a95451e514c809f2794c1deba80695
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@gmx.at>
libavcodec/pictordec.c