Merge commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 15 Jan 2013 14:32:48 +0000 (15:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 15 Jan 2013 14:32:48 +0000 (15:32 +0100)
commit9aeffb3c2a0d86a1271836f87915d3a2e069cdd2
tree13cb180b56c5378b9f9b9cd4bc6f8396023bb86c
parentcfc40a6aff8d35627469ef960531264c2f66a74e
parentbff3607547fdbb6e32b3830a351e6a33280c1e0d
Merge commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d'

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

Conflicts:
libavcodec/utils.c

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