[FFmpeg-cvslog] Merge commit '145023f57262d21474e35b4a6069cf95136339d4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 13 13:07:01 2013 +0200| [f13f4d2b086519c2b0692ae1ff12d81e8ec494f1] | committer: Michael Niedermayer

Merge commit '145023f57262d21474e35b4a6069cf95136339d4'

* commit '145023f57262d21474e35b4a6069cf95136339d4':
  4xm: reject frames not compatible with the declared version

See: c433823750bf096187e70c22822431a7c0bb4202

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

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