diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-04 06:05:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-04 06:05:36 +0100 |
| commit | 9ac7d8f85d71f50d01d97f33cf0cc9f7707d62a3 (patch) | |
| tree | 1fefb96b7fa42495aeb38a0b3d4c524a168880c8 /libavcodec/atrac.h | |
| parent | fd856693defaa922dbee6a2fa90cc23f447cbaef (diff) | |
| parent | c85e5f13f6ac9c4c90125e7671d89009e57f9df9 (diff) | |
| download | ffmpeg-9ac7d8f85d71f50d01d97f33cf0cc9f7707d62a3.tar.gz | |
Merge commit 'c85e5f13f6ac9c4c90125e7671d89009e57f9df9' into release/1.1
* commit 'c85e5f13f6ac9c4c90125e7671d89009e57f9df9':
cavs: Check for negative cbp
avi: DV in AVI must be considered single stream
vmnc: Check the cursor dimensions
vmnc: Port to bytestream2
Conflicts:
libavcodec/cavsdec.c
libavcodec/vmnc.c
libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/atrac.h')
0 files changed, 0 insertions, 0 deletions