aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-01-27 19:51:54 +0000
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-01-27 19:52:28 +0000
commit97d57424344fafd14a5893b33b205b974272a7a6 (patch)
treea66412fa9d8a82b2e12a1e051ecd1c66dd71f9ad /libavcodec
parentb3702b6b660edd2a60a351c3d51dd03b20710f99 (diff)
parent65d29dd274a302131e2e4bc6d2b1eca4a093900c (diff)
downloadffmpeg-97d57424344fafd14a5893b33b205b974272a7a6.tar.gz
Merge commit '65d29dd274a302131e2e4bc6d2b1eca4a093900c'
This is a NOOP. Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions