Merge commit '85a5bc054c1290699ccbf5799ba6c4e2fbcc3530'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 11:50:50 +0000 (12:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 11:55:00 +0000 (12:55 +0100)
commitb2e0c9dd34f5f4b75624770e6080170508c1f1f4
tree293e3b7741e04254a571f27eb473537c361cf4fd
parentacbd14bc7e240e827fc3673f7ec9d610bb70103a
parent85a5bc054c1290699ccbf5799ba6c4e2fbcc3530
Merge commit '85a5bc054c1290699ccbf5799ba6c4e2fbcc3530'

* commit '85a5bc054c1290699ccbf5799ba6c4e2fbcc3530':
  lavf: remove disabled FF_API_R_FRAME_RATE cruft

Conflicts:
libavformat/avformat.h
libavformat/electronicarts.c
libavformat/rawdec.c
libavformat/utils.c
libavformat/version.h

The field is in use and no semantically equivalent field is available,
thus not removed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/version.h