diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-16 21:43:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-16 21:43:56 +0200 |
| commit | 93869d4e4447fa68d46c2c555295bdc8ed32cc51 (patch) | |
| tree | 34d7c1019331233835d6453c2bd3f5e010ec3d8b /libavformat/qtpalette.h | |
| parent | 5c5306df962bbbaf6a3339850aa43771fc4add19 (diff) | |
| parent | 3a78fb57de0b8ee800d91c69e395b685e285a63b (diff) | |
| download | ffmpeg-93869d4e4447fa68d46c2c555295bdc8ed32cc51.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libx264: introduce slice-max-size option
Fixed size given to init_get_bits().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/qtpalette.h')
0 files changed, 0 insertions, 0 deletions