OSDN Git Service

Merge commit '24057c83207d6ea8bfd824155ac37be8a33dfd0c'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Jan 2014 00:05:52 +0000 (01:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Jan 2014 00:07:05 +0000 (01:07 +0100)
commit405b1ef898bf9ee509d2642bdf5bad05d9faa1ce
tree9c268febb39b89c1ffa1ad55e835c97189446d5a
parentc13e73c25b6d548c6982cfe267b3925dad4f253e
parent24057c83207d6ea8bfd824155ac37be8a33dfd0c
Merge commit '24057c83207d6ea8bfd824155ac37be8a33dfd0c'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/eacmv.c