diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-13 00:12:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-13 00:15:28 +0100 |
| commit | 86316039ab06bcf5c8b9c14f535f1dd072990e3b (patch) | |
| tree | 932ffc4715b5fcbefd99e60dceaef84f9bad00d4 /libavformat/data_uri.c | |
| parent | c3204856331b9c34bf7c4fd83527c5065e4cdd7e (diff) | |
| parent | 50ea93158d4c480f64069e8bd1da388486dcf4ba (diff) | |
| download | ffmpeg-86316039ab06bcf5c8b9c14f535f1dd072990e3b.tar.gz | |
Merge commit '50ea93158d4c480f64069e8bd1da388486dcf4ba'
* commit '50ea93158d4c480f64069e8bd1da388486dcf4ba':
Add libx265 encoder
Conflicts:
Changelog
LICENSE
configure
libavcodec/allcodecs.c
libavcodec/libx265.c
libavcodec/version.h
See: bb6b1731eba2fac424ff8ad3003fe58b308debd1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/data_uri.c')
0 files changed, 0 insertions, 0 deletions