Revision f3543969
ID | f35439699f5546774b840ae9fba7df82729ef0ff |
Parent | 85c9365d, bc154882 |
Child | 78431098 |
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>
Files
- added
- modified
- copied
- renamed
- deleted