Merge commit 'c85e5f13f6ac9c4c90125e7671d89009e57f9df9' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Feb 2014 05:05:36 +0000 (06:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Feb 2014 05:05:36 +0000 (06:05 +0100)
commit9ac7d8f85d71f50d01d97f33cf0cc9f7707d62a3
tree1fefb96b7fa42495aeb38a0b3d4c524a168880c8
parentfd856693defaa922dbee6a2fa90cc23f447cbaef
parentc85e5f13f6ac9c4c90125e7671d89009e57f9df9
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>
libavcodec/cavsdec.c
libavcodec/vmnc.c
libavformat/avidec.c