[FFmpeg-cvslog] Merge commit 'c85e5f13f6ac9c4c90125e7671d89009e57f9df9' into release/1.1

Michael Niedermayer git at videolan.org
Tue Feb 4 06:11:08 CET 2014


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Tue Feb  4 06:05:36 2014 +0100| [9ac7d8f85d71f50d01d97f33cf0cc9f7707d62a3] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ac7d8f85d71f50d01d97f33cf0cc9f7707d62a3
---





More information about the ffmpeg-cvslog mailing list