[FFmpeg-cvslog] Merge commit 'da7d839a0d3ec40423a665dc85e0cfaed3f92eb8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 12 17:08:45 2014 +0200| [113229922ae2faa065e5758534b83e73bda65978] | committer: Michael Niedermayer

Merge commit 'da7d839a0d3ec40423a665dc85e0cfaed3f92eb8'

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

Conflicts:
	libavcodec/ffv1dec.c

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

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