diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-15 21:56:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-15 21:56:26 +0200 |
| commit | 4ed3a01d717f120ba6881815ad6c40ad3f625825 (patch) | |
| tree | 22db0ca8a7b66a399221bbf955145d78e9ad8e11 /libavformat | |
| parent | efcf8cfa48c84676417d40689e63a37d5190a8ed (diff) | |
| parent | 03ca6d70df192125a772dadd01acfe3905aa653f (diff) | |
| download | ffmpeg-4ed3a01d717f120ba6881815ad6c40ad3f625825.tar.gz | |
Merge commit '03ca6d70df192125a772dadd01acfe3905aa653f'
* commit '03ca6d70df192125a772dadd01acfe3905aa653f':
x264: Factor out the reconfiguration code
Conflicts:
libavcodec/libx264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions