diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 01:20:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 01:21:39 +0200 |
| commit | 49f1b869b60f27ac450f3db301b46d56e5d5aca6 (patch) | |
| tree | 9d55eb8807eb7f006348de0c59fe44afe678d413 /tools/enum_options.c | |
| parent | 32365667ccebab599eabf5f99ed0cdea20d29750 (diff) | |
| parent | 0ef256d51518f0e483c38b9ee3b993cf0709d00e (diff) | |
| download | ffmpeg-49f1b869b60f27ac450f3db301b46d56e5d5aca6.tar.gz | |
Merge commit '0ef256d51518f0e483c38b9ee3b993cf0709d00e'
* commit '0ef256d51518f0e483c38b9ee3b993cf0709d00e':
libx264: Correctly manage constant rate factor params
Conflicts:
libavcodec/libx264.c
See: 3a1c8951bc886e8af30e09dc0e20491f6f5c3937
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/enum_options.c')
0 files changed, 0 insertions, 0 deletions