diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 22:04:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 22:04:29 +0100 |
| commit | 2c9fc694f50a01c10448b4ed08b4d6adcfaaa3a7 (patch) | |
| tree | e633717d50d3a0ff9809543c0c4618bd323c0a7f /COPYING.LGPLv2.1 | |
| parent | be6e81463c72dda837d62ef0a7c26f35a666d1d3 (diff) | |
| parent | 09cb75cdeba420d680bcb165a1ef668d8f381fed (diff) | |
| download | ffmpeg-2c9fc694f50a01c10448b4ed08b4d6adcfaaa3a7.tar.gz | |
Merge commit '09cb75cdeba420d680bcb165a1ef668d8f381fed'
* commit '09cb75cdeba420d680bcb165a1ef668d8f381fed':
libx264: set frame packing information when relevant information is found
Conflicts:
libavcodec/libx264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.LGPLv2.1')
0 files changed, 0 insertions, 0 deletions