aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/x86/fdct.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-06 12:04:25 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-06 12:09:17 +0200
commitb64b719ad5c212e197009fa3f1e7aa96255cbd28 (patch)
tree38b2b3d650a29e10136bf251277db559b3d2cb58 /libavcodec/x86/fdct.c
parent567c0dcee6745dc53d67e6de796270449b5753f7 (diff)
parentfcc1022611f79c2f3aa2f392a5ce14c74be9c1d7 (diff)
downloadffmpeg-b64b719ad5c212e197009fa3f1e7aa96255cbd28.tar.gz
Merge commit 'fcc1022611f79c2f3aa2f392a5ce14c74be9c1d7'
* commit 'fcc1022611f79c2f3aa2f392a5ce14c74be9c1d7': vdpau: factor out common end-of-frame handling Conflicts: libavcodec/vdpau.c libavcodec/vdpau_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/fdct.c')
0 files changed, 0 insertions, 0 deletions