diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-24 02:06:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-24 02:23:29 +0100 |
| commit | 2850131f2c7abaede32b39ed6eaeecfbf77e6042 (patch) | |
| tree | ae4954eb725a72599a3027fe25a7e7c0e62f5b0c /libavformat/ffmetaenc.c | |
| parent | 3e3995619807b01166df5f3edd1edf64af211b1c (diff) | |
| parent | b21af32aed7e343f962753943e9f16baedfb1750 (diff) | |
| download | ffmpeg-2850131f2c7abaede32b39ed6eaeecfbf77e6042.tar.gz | |
Merge commit 'b21af32aed7e343f962753943e9f16baedfb1750'
* commit 'b21af32aed7e343f962753943e9f16baedfb1750':
lavc: Prefer x264 over openh264 if both libraries are available
See: ddae03f69bc1c6ec97c028c91837710944427b83
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ffmetaenc.c')
0 files changed, 0 insertions, 0 deletions