mirror of https://git.ffmpeg.org/ffmpeg.git
d7e5aebae7
* qatar/master: (23 commits) ac3enc: correct the flipped sign in the ac3_fixed encoder Eliminate pointless '#if 1' statements without matching '#else'. Add AVX FFT implementation. Increase alignment of av_malloc() as needed by AVX ASM. Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX. mjpeg: Detect overreads in mjpeg_decode_scan() and error out. documentation: extend documentation for ffmpeg -aspect option APIChanges: update commit hashes for recent additions. lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums aac: add headers needed for log2f() lavc: remove FF_API_MB_Q cruft lavc: remove FF_API_RATE_EMU cruft lavc: remove FF_API_HURRY_UP cruft pad: make the filter parametric vsrc_movie: add key_frame and pict_type. vsrc_movie: fix leak in request_frame() lavfi: add key_frame and pict_type to AVFilterBufferRefVideo. vsrc_buffer: add sample_aspect_ratio fields to arguments. lavfi: add fieldorder filter scale: make the filter parametric ... Conflicts: Changelog doc/filters.texi ffmpeg.c libavcodec/ac3dec.h libavcodec/dsputil.c libavfilter/avfilter.h libavfilter/vf_scale.c libavfilter/vf_yadif.c libavfilter/vsrc_buffer.c Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
|---|---|---|
| .. | ||
| ac3_rm | ||
| adpcm_ima_wav | ||
| adpcm_ms_wav | ||
| adpcm_qt_aiff | ||
| adpcm_swf_flv | ||
| adpcm_yam_wav | ||
| alac_m4a | ||
| asv1_avi | ||
| asv2_avi | ||
| dnxhd_720p_dnxhd | ||
| dnxhd_720p_rd_dnxhd | ||
| dnxhd_1080i_mov | ||
| dv50_dv | ||
| dv411_dv | ||
| dv_dv | ||
| error_mpeg4_adv_avi | ||
| ffv1_avi | ||
| flac_flac | ||
| flashsv_flv | ||
| flv_flv | ||
| g726_wav | ||
| h261_avi | ||
| h263_avi | ||
| h263p_avi | ||
| huffyuv_avi | ||
| image_bmp | ||
| image_jpg | ||
| image_pcx | ||
| image_pgm | ||
| image_ppm | ||
| image_sgi | ||
| image_tga | ||
| image_tiff | ||
| jpegls_avi | ||
| lavf_aif | ||
| lavf_al | ||
| lavf_asf | ||
| lavf_au | ||
| lavf_avi | ||
| lavf_dv | ||
| lavf_ffm | ||
| lavf_flv | ||
| lavf_gif | ||
| lavf_gxf | ||
| lavf_mkv | ||
| lavf_mmf | ||
| lavf_mov | ||
| lavf_mpg | ||
| lavf_mxf | ||
| lavf_mxf_d10 | ||
| lavf_nut | ||
| lavf_ogg | ||
| lavf_rm | ||
| lavf_swf | ||
| lavf_ts | ||
| lavf_ul | ||
| lavf_voc | ||
| lavf_wav | ||
| lavf_y4m | ||
| ljpeg_avi | ||
| mjpeg_avi | ||
| mp2_mp2 | ||
| mpeg1_mpg | ||
| mpeg1b_mpg | ||
| mpeg2_422_mpg | ||
| mpeg2_mpg | ||
| mpeg2i_mpg | ||
| mpeg2ivlc_qprd_mpg | ||
| mpeg2reuse_mpg | ||
| mpeg2thread_mpg | ||
| mpeg2threadivlc_mpg | ||
| mpeg4_Q_avi | ||
| mpeg4_adap_avi | ||
| mpeg4_adv_avi | ||
| mpeg4_nr_avi | ||
| mpeg4_qprd_avi | ||
| mpeg4_rc_avi | ||
| mpeg4_thread_avi | ||
| msmpeg4_avi | ||
| msmpeg4v2_avi | ||
| odivx_mp4 | ||
| pbmpipe_pbm | ||
| pcm_alaw_wav | ||
| pcm_f32be_au | ||
| pcm_f32le_wav | ||
| pcm_f64be_au | ||
| pcm_f64le_wav | ||
| pcm_mulaw_wav | ||
| pcm_s8_mov | ||
| pcm_s16be_mkv | ||
| pcm_s16be_mov | ||
| pcm_s16le_mkv | ||
| pcm_s16le_wav | ||
| pcm_s24be_mov | ||
| pcm_s24daud_302 | ||
| pcm_s24le_wav | ||
| pcm_s32be_mov | ||
| pcm_s32le_wav | ||
| pcm_u8_wav | ||
| pcm_zork_wav | ||
| pgmpipe_pgm | ||
| ppmpipe_ppm | ||
| rgb_avi | ||
| roqav_roq | ||
| rv10_rm | ||
| rv20_rm | ||
| snow53_avi | ||
| snow_avi | ||
| svq1_mov | ||
| wmav1_asf | ||
| wmav2_asf | ||
| wmv1_avi | ||
| wmv2_avi | ||
| yuv_avi | ||