aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/qsvenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-28 22:11:42 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-28 22:12:41 +0200
commitb666e81c132901d370b5645562826ecbcfce0b7a (patch)
treecedb2c9a829c94fe4e11d886987e5291d35b1aca /libavcodec/qsvenc.c
parent7026d8accdb2d3b013fec5c7c7620f1b769e6c7b (diff)
parente4610300de6869bd6b3b00e76cfeabb6d7653dcd (diff)
downloadffmpeg-b666e81c132901d370b5645562826ecbcfce0b7a.tar.gz
Merge commit 'e4610300de6869bd6b3b00e76cfeabb6d7653dcd'
* commit 'e4610300de6869bd6b3b00e76cfeabb6d7653dcd': x86: cavs: Remove an unneeded scratch buffer Conflicts: libavcodec/x86/cavsdsp.c See: d79f7bf0d63a81ee66026ee92a6946a7303d04bd Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/qsvenc.c')
0 files changed, 0 insertions, 0 deletions