[FFmpeg-cvslog] Merge commit 'aa241229891173b0357eee04e6ca78f806cc9c0c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 14 14:03:20 2013 +0100| [9f32048dd1967d7aa5421c490349a1056849cd78] | committer: Michael Niedermayer

Merge commit 'aa241229891173b0357eee04e6ca78f806cc9c0c'

* commit 'aa241229891173b0357eee04e6ca78f806cc9c0c':
  lavc: deprecate FF_MAX_B_FRAMES

Conflicts:
	libavcodec/options_table.h

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

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