diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-14 13:14:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-14 13:14:54 +0100 |
| commit | 7f8846405e8adb0d84c62226839a2995e4e89202 (patch) | |
| tree | b473085965d47c1c5d9d27b9fe15abf00e9025cf /libavdevice/version.h | |
| parent | 81bcf9454e19702d43e0d314047acbe97226ed89 (diff) | |
| parent | b7765d00f911fe0f8fcda21b93a540f27d2ba2f5 (diff) | |
| download | ffmpeg-7f8846405e8adb0d84c62226839a2995e4e89202.tar.gz | |
Merge commit 'b7765d00f911fe0f8fcda21b93a540f27d2ba2f5' into release/1.1
* commit 'b7765d00f911fe0f8fcda21b93a540f27d2ba2f5':
msrledec: check bounds before constructing a possibly invalid pointer,
qtrle: fix the topmost line for 1bit
aasc: fix output for msrle compression.
Conflicts:
tests/ref/fate/aasc
tests/ref/fate/qtrle-1bit
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/version.h')
0 files changed, 0 insertions, 0 deletions