diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-03 14:00:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-03 14:12:53 +0200 |
| commit | efb21b0a8fbc61d01ba1f22677abfbca99e6167d (patch) | |
| tree | 355052e76cbc7aa69e4fa98146e1c93ce38a22a5 /libavcodec/flacdata.h | |
| parent | 164b67ca281fa5a47b965a858c7783aa547091b8 (diff) | |
| parent | 5f7aecde02a95451e514c809f2794c1deba80695 (diff) | |
| download | ffmpeg-efb21b0a8fbc61d01ba1f22677abfbca99e6167d.tar.gz | |
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>
Diffstat (limited to 'libavcodec/flacdata.h')
0 files changed, 0 insertions, 0 deletions