diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 15:32:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 15:32:48 +0100 |
| commit | 9aeffb3c2a0d86a1271836f87915d3a2e069cdd2 (patch) | |
| tree | 13cb180b56c5378b9f9b9cd4bc6f8396023bb86c /libavcodec/libx264.c | |
| parent | cfc40a6aff8d35627469ef960531264c2f66a74e (diff) | |
| parent | bff3607547fdbb6e32b3830a351e6a33280c1e0d (diff) | |
| download | ffmpeg-9aeffb3c2a0d86a1271836f87915d3a2e069cdd2.tar.gz | |
Merge commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d'
* commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d':
lavc: set the default rc_initial_buffer_occupancy
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libx264.c')
0 files changed, 0 insertions, 0 deletions