summaryrefslogtreecommitdiff
path: root/libavcodec/libx265.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-06 21:21:00 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-06 21:21:00 +0200
commit20ce69e5f85dd29cc850a98060972821d69bfd3a (patch)
tree6a41d68baa1a741305276444c22bae070a3841f9 /libavcodec/libx265.c
parentffed987a4d4afb8851d80b772eb9ee02cda20ef9 (diff)
parentd81fb63d87692765c004c19934b49427df434a07 (diff)
Merge commit 'd81fb63d87692765c004c19934b49427df434a07'
* commit 'd81fb63d87692765c004c19934b49427df434a07': fate: Add a PICT test Conflicts: tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libx265.c')
0 files changed, 0 insertions, 0 deletions