[FFmpeg-cvslog] Merge commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 15 15:32:48 2013 +0100| [9aeffb3c2a0d86a1271836f87915d3a2e069cdd2] | committer: Michael Niedermayer

Merge commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d'

* commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d':
  lavc: set the default rc_initial_buffer_occupancy

Conflicts:
	libavcodec/utils.c

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

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