aboutsummaryrefslogtreecommitdiffstats
path: root/compat/tms470/math.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-20 22:47:29 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-20 22:48:58 +0100
commit1ec295a5c52bfe9a604bfb2a74041672db058324 (patch)
tree29e2e322c3f58fc57b72e63223d072e0e670d4fd /compat/tms470/math.h
parent4d216420bed9d02cf0989d1e986247c1cd2f36c4 (diff)
parent1b1094a19d9e41baf3253c83841f9e5343cecbd0 (diff)
downloadffmpeg-1ec295a5c52bfe9a604bfb2a74041672db058324.tar.gz
Merge commit '1b1094a19d9e41baf3253c83841f9e5343cecbd0'
* commit '1b1094a19d9e41baf3253c83841f9e5343cecbd0': vdpau: switch ff_vdpau_get_surface_id from Picture to AVFrame Conflicts: libavcodec/vdpau_internal.h libavcodec/vdpau_vc1.c See: 2a37e560dccb81328f610c51e74ce6cc53f1a5c7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'compat/tms470/math.h')
0 files changed, 0 insertions, 0 deletions