aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-04-03 02:28:01 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-04-03 02:28:01 +0200
commitf35439699f5546774b840ae9fba7df82729ef0ff (patch)
tree92c22313b8eda656421372955598d647aa64242e /tests
parent85c9365d65c4d03c468cead13f722ddce89d8495 (diff)
parentbc154882e11f4a218cc8cfb10ae0b4cbc83b5f9f (diff)
downloadffmpeg-f35439699f5546774b840ae9fba7df82729ef0ff.tar.gz
Merge remote branch 'qatar/master'
* qatar/master: Fixed-point MDCT with 32-bit unscaled output lavc: deprecate rate_emu lavc: mark hurry_up for removal on next major bump parser: mark av_parser_parse() for removal on next major bump lavc: add missing audioconvert includes jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions