1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-20 07:48:15 +02:00
FFmpeg/libavcodec
Michael Niedermayer efb21b0a8f 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>
2013-09-03 14:12:53 +02:00
..
2013-08-13 15:45:08 +02:00
2013-08-13 15:45:08 +02:00
2013-08-13 15:45:08 +02:00
2013-08-12 19:40:29 +02:00
2013-08-12 19:40:29 +02:00
2013-08-13 15:45:08 +02:00
2013-08-13 15:45:08 +02:00
2013-08-17 01:43:30 +02:00
2013-08-20 03:30:36 +02:00
2013-09-01 04:02:03 +02:00
2013-08-21 20:29:05 +00:00
2013-08-12 19:40:29 +02:00
2013-08-21 18:35:58 +00:00
2013-08-26 19:26:01 +00:00
2013-09-01 19:20:39 +00:00
2013-08-13 06:05:44 +02:00
2013-09-02 12:32:32 +02:00
2013-08-12 19:40:29 +02:00
2013-08-26 19:26:00 +00:00
2013-08-29 23:23:22 +02:00
2013-08-29 22:52:04 +02:00
2013-08-29 22:52:04 +02:00
2013-08-13 15:45:08 +02:00
2013-08-13 15:45:08 +02:00
2013-08-13 19:29:10 +00:00
2013-08-14 14:04:05 +00:00
2013-09-02 08:32:24 +02:00