Michael Niedermayer 9aeffb3c2a Merge commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d' ...

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

Conflicts:
	libavcodec/utils.c

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

2013-01-15 15:32:48 +01:00

100 KiB

Raw Blame History

View Raw