[FFmpeg-cvslog] Merge commit '85a5bc054c1290699ccbf5799ba6c4e2fbcc3530'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 13 12:50:50 2013 +0100| [b2e0c9dd34f5f4b75624770e6080170508c1f1f4] | committer: Michael Niedermayer

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 at gmx.at>

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