mirror of https://git.ffmpeg.org/ffmpeg.git
* qatar/master: (36 commits) adpcmenc: Use correct frame_size for Yamaha ADPCM. avcodec: add ff_samples_to_time_base() convenience function to internal.h adx parser: set duration mlp parser: set duration instead of frame_size gsm parser: set duration mpegaudio parser: set duration instead of frame_size (e)ac3 parser: set duration instead of frame_size flac parser: set duration instead of frame_size avcodec: add duration field to AVCodecParserContext avutil: add av_rescale_q_rnd() to allow different rounding pnmdec: remove useless .pix_fmts libmp3lame: support float and s32 sample formats libmp3lame: renaming, rearrangement, alignment, and comments libmp3lame: use the LAME default bit rate libmp3lame: use avpriv_mpegaudio_decode_header() for output frame parsing libmp3lame: cosmetics: remove some pointless comments libmp3lame: convert some debugging code to av_dlog() libmp3lame: remove outdated comment. libmp3lame: do not set coded_frame->key_frame. libmp3lame: improve error handling in MP3lame_encode_init() ... Conflicts: doc/APIchanges libavcodec/libmp3lame.c libavcodec/pcxenc.c libavcodec/pnmdec.c libavcodec/pnmenc.c libavcodec/sgienc.c libavcodec/utils.c libavformat/hls.c libavutil/avutil.h libswscale/x86/swscale_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
---|---|---|
.. | ||
Makefile | ||
ac3dsp.asm | ||
ac3dsp_mmx.c | ||
cabac.h | ||
cavsdsp_mmx.c | ||
dct32_sse.asm | ||
deinterlace.asm | ||
diracdsp_mmx.c | ||
diracdsp_mmx.h | ||
diracdsp_yasm.asm | ||
dnxhd_mmx.c | ||
dsputil_mmx.c | ||
dsputil_mmx.h | ||
dsputil_mmx_avg_template.c | ||
dsputil_mmx_qns_template.c | ||
dsputil_mmx_rnd_template.c | ||
dsputil_yasm.asm | ||
dsputilenc_mmx.c | ||
dsputilenc_yasm.asm | ||
dwt.c | ||
dwt.h | ||
dwt_yasm.asm | ||
fdct_mmx.c | ||
fft.c | ||
fft.h | ||
fft_3dn.c | ||
fft_3dn2.c | ||
fft_mmx.asm | ||
fft_sse.c | ||
fmtconvert.asm | ||
fmtconvert_mmx.c | ||
h264_chromamc.asm | ||
h264_chromamc_10bit.asm | ||
h264_deblock.asm | ||
h264_deblock_10bit.asm | ||
h264_i386.h | ||
h264_idct.asm | ||
h264_idct_10bit.asm | ||
h264_intrapred.asm | ||
h264_intrapred_10bit.asm | ||
h264_intrapred_init.c | ||
h264_qpel_10bit.asm | ||
h264_qpel_mmx.c | ||
h264_weight.asm | ||
h264_weight_10bit.asm | ||
h264dsp_mmx.c | ||
idct_mmx.c | ||
idct_mmx_xvid.c | ||
idct_sse2_xvid.c | ||
idct_xvid.h | ||
imdct36_sse.asm | ||
lpc_mmx.c | ||
mathops.h | ||
mlpdsp.c | ||
motion_est_mmx.c | ||
mpegaudiodec_mmx.c | ||
mpegvideo_mmx.c | ||
mpegvideo_mmx_template.c | ||
pngdsp-init.c | ||
pngdsp.asm | ||
proresdsp-init.c | ||
proresdsp.asm | ||
rv34dsp.asm | ||
rv34dsp_init.c | ||
rv40dsp.asm | ||
rv40dsp_init.c | ||
simple_idct_mmx.c | ||
snowdsp_mmx.c | ||
v210-init.c | ||
v210.asm | ||
vc1dsp_mmx.c | ||
vc1dsp_yasm.asm | ||
vp3dsp.asm | ||
vp8dsp-init.c | ||
vp8dsp.asm | ||
vp56_arith.h | ||
vp56dsp.asm | ||
vp56dsp_init.c | ||
w64xmmtest.c |