diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-24 20:40:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-24 20:53:10 +0100 |
| commit | a88cbdfb90e4046aae427b5e196d3822b192b046 (patch) | |
| tree | fca78add9cd36e94dcae0ed011f2b60e081da92d /tests/ref/seek/vsynth2-mpeg4-adv | |
| parent | a908de7f49449beb66a9d70a0a06f8b59e564d69 (diff) | |
| parent | d00a504b244e136a0c82a55e21ed94659e0674ad (diff) | |
| download | ffmpeg-a88cbdfb90e4046aae427b5e196d3822b192b046.tar.gz | |
Merge commit 'd00a504b244e136a0c82a55e21ed94659e0674ad'
* commit 'd00a504b244e136a0c82a55e21ed94659e0674ad':
libx265: Update API usage
Conflicts:
libavcodec/libx265.c
See: d3736471948cd06851f6b3aef352ef285b7c6480
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/seek/vsynth2-mpeg4-adv')
0 files changed, 0 insertions, 0 deletions