aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale/swscale_unscaled.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-24 11:41:39 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-24 11:45:54 +0200
commitda0f67b177adaa3f792038bff174d015da1179a4 (patch)
tree61ae8fb8084737f7a2925d7b78ff4330291e1e33 /libswscale/swscale_unscaled.c
parent82654172ced59236744bb7aceba822462f6b5750 (diff)
parentbd7b4da0f4627bb6c4a7c2575da83fe6b261a21c (diff)
downloadffmpeg-da0f67b177adaa3f792038bff174d015da1179a4.tar.gz
Merge commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c'
* commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c': 8bps: Bound-check the input buffer Conflicts: libavcodec/8bps.c See: 66ff90f4a3d81c25feaa672dc8cc9cc88017753d Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_unscaled.c')
0 files changed, 0 insertions, 0 deletions