diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-10 21:32:32 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-10 21:34:08 +0200 |
commit | a4662cd6b11e59f419d2161a8cbe295efd8e7391 (patch) | |
tree | f2bb36edd296f9cee53d2da07c2004e1417f25a5 /libavcodec/cga_data.c | |
parent | 4d4bc89409fbe4e2d8e3ee705e6c51e546b9f816 (diff) | |
parent | 25fbfeed98d2eaddda0885e0916a83085549bae6 (diff) | |
download | ffmpeg-a4662cd6b11e59f419d2161a8cbe295efd8e7391.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libx265: Only set the SAR if it is valid
libx265: Use 16-bit SAR
libx265: Use x265_param_parse to set the SAR
See: 8945dcbb52b6b87e1e6479912cce89c7da54ec43
See: fcc43e02d30279b2ca4c69811311aa05acab4184
See: cdd21f1f03c5d59aad8f0244b1be0f864d8416a7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cga_data.c')
0 files changed, 0 insertions, 0 deletions