aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/libvpxenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-01 04:50:21 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-01 05:00:30 +0200
commit772787723958591f0134b846a3cc337c48978332 (patch)
tree9ff886293d7a536bed3dda0138e370788464aae0 /libavcodec/libvpxenc.c
parentb50fa26885dc0c22dcb2f184d4d94da787b2d8a8 (diff)
parent0069d4597bda5723fbcae410784bbfa4750df706 (diff)
downloadffmpeg-772787723958591f0134b846a3cc337c48978332.tar.gz
Merge commit '0069d4597bda5723fbcae410784bbfa4750df706' into release/2.4
* commit '0069d4597bda5723fbcae410784bbfa4750df706': Update changelog for v11.4 Conflicts: Changelog RELEASE Not merged, our changelog differs from this Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libvpxenc.c')
0 files changed, 0 insertions, 0 deletions