diff options
| author | Michael Niedermayer <[email protected]> | 2013-09-07 13:13:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-09-07 13:13:12 +0200 |
| commit | 6bfa823b70ec135b59e036106eb403a546145faa (patch) | |
| tree | 4cd3e330b770111dce9d0906856304b09da095a9 /libpostproc/postprocess.c | |
| parent | 701543a081e039a7ee1afd2286f4ccefabb195cc (diff) | |
| parent | 8dc4b2c92e492aa172327d10c926d5ca3a04371c (diff) | |
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 <[email protected]>
Diffstat (limited to 'libpostproc/postprocess.c')
0 files changed, 0 insertions, 0 deletions