aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/flv.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-09 14:12:19 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-09 14:19:24 +0100
commit2830f287e2f271bcf773f645e5d9cb9aa5204f7f (patch)
treeceda9d20e4c2e19e32e1c092e36dc8558fb0f0e2 /libavcodec/flv.h
parentbba73f5574afd3095e017f70bca1547dd43f702f (diff)
parentebfe622bb1ca57cecb932e42926745cba7161913 (diff)
downloadffmpeg-2830f287e2f271bcf773f645e5d9cb9aa5204f7f.tar.gz
Merge commit 'ebfe622bb1ca57cecb932e42926745cba7161913'
* commit 'ebfe622bb1ca57cecb932e42926745cba7161913': mpegvideo: drop support for real (non-emulated) edges Conflicts: libavcodec/mpegvideo.c libavcodec/mpegvideo_motion.c libavcodec/wmv2.c If this is slower on a major platform then it should be investigated and potentially reverted. See: 8fc52a5ef94712d900fc8fe7503cf9c9ba635143 See: 3969b4b861ce8152e3195e8f8c3437abd273b90a Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flv.h')
0 files changed, 0 insertions, 0 deletions