aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/cavsdata.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-16 12:38:41 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-16 12:38:41 +0100
commit5c7e9e16c961f1f7258734426afac3cee4349580 (patch)
tree20ea7bec723ef262bffb8f2447adcc1dc3d98069 /libavcodec/cavsdata.c
parent0e79fe37e5c5500db2e65ce6b7ea0bbdb3f24665 (diff)
parente034cc6c60c77dce390b1ac31141b1862bdf8999 (diff)
downloadffmpeg-5c7e9e16c961f1f7258734426afac3cee4349580.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: lavc: Move vector_fmul_window to AVFloatDSPContext rtpdec_mpeg4: Check the remaining amount of data before reading Conflicts: libavcodec/dsputil.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cavsdata.c')
0 files changed, 0 insertions, 0 deletions