[FFmpeg-cvslog] Merge commit '24057c83207d6ea8bfd824155ac37be8a33dfd0c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan  4 01:05:52 2014 +0100| [405b1ef898bf9ee509d2642bdf5bad05d9faa1ce] | committer: Michael Niedermayer

Merge commit '24057c83207d6ea8bfd824155ac37be8a33dfd0c'

* commit '24057c83207d6ea8bfd824155ac37be8a33dfd0c':
  eacmv: check the framerate before setting it.

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

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