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

Michael Niedermayer git at videolan.org
Sat Aug 30 20:57:01 CEST 2014


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 30 20:47:07 2014 +0200| [081f4f5f56e0f6220039e39b9be2c2a2021dd40c] | committer: Michael Niedermayer

Merge commit 'e4fb53c73abece15a7c5df0019df9a0371db2297' into release/1.1

* commit 'e4fb53c73abece15a7c5df0019df9a0371db2297':
  ffv1dec: check that global parameters do not change in version 0/1

Conflicts:
	libavcodec/ffv1dec.c

See: f78a3868fd3d8f66da68338c0783aa15f98833bf
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list