aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/bgmc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-14 13:08:36 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-14 13:08:36 +0100
commit31c09b7663acdcc64031d6f251a667ce812f590f (patch)
treea938859264028d21a5a23b55b6c4b37ebed9ab55 /libavcodec/bgmc.c
parent5f231d909f158e40d20281b88e7aecc2333057fe (diff)
parent728c4658563dc82115ade0f1679679eddb7be5ff (diff)
downloadffmpeg-31c09b7663acdcc64031d6f251a667ce812f590f.tar.gz
Merge commit '728c4658563dc82115ade0f1679679eddb7be5ff'
* commit '728c4658563dc82115ade0f1679679eddb7be5ff': vdpau: add a constructor for AVVDPAUContext. Conflicts: libavcodec/vdpau.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bgmc.c')
0 files changed, 0 insertions, 0 deletions