aboutsummaryrefslogtreecommitdiffstats
path: root/ffplay.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-18 00:49:47 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-18 00:49:47 +0100
commitadfb4661d9ab102efe831ab9e95e9c3b32461b81 (patch)
tree4e7171b3864208aa0bfc488d9873f040b9ff3cb3 /ffplay.c
parentb4004124432e3c51fe8ec9c13b6c3db2baaf918e (diff)
parentc246b0b4c3a3b02a714e99423cf23d59f8f81409 (diff)
downloadffmpeg-adfb4661d9ab102efe831ab9e95e9c3b32461b81.tar.gz
Merge commit 'c246b0b4c3a3b02a714e99423cf23d59f8f81409' into release/2.4
* commit 'c246b0b4c3a3b02a714e99423cf23d59f8f81409': avresample: Make sure the even check does not overflow Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions