mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
e387c9d5dd
* qatar/master: (22 commits)
rv40dsp x86: use only one register, for both increment and loop counter
rv40dsp: implement prescaled versions for biweight.
avconv: use default channel layouts when they are unknown
avconv: parse channel layout string
nutdec: K&R formatting cosmetics
vda: Signal 4 byte NAL headers to the decoder regardless of what's in the extradata
mem: Consistently return NULL for av_malloc(0)
vf_overlay: implement poll_frame()
vf_scale: support named constants for sws flags.
lavc doxy: add all installed headers to doxy groups.
lavc doxy: add avfft to the main lavc group.
lavc doxy: add remaining avcodec.h functions to a misc doxygen group.
lavc doxy: add AVPicture functions to a doxy group.
lavc doxy: add resampling functions to a doxy group.
lavc doxy: replace \ with /
lavc doxy: add encoding functions to a doxy group.
lavc doxy: add decoding functions to a doxy group.
lavc doxy: fix formatting of AV_PKT_DATA_{PARAM_CHANGE,H263_MB_INFO}
lavc doxy: add AVPacket-related stuff to a separate doxy group.
lavc doxy: add core functions/definitions to a doxy group.
...
Conflicts:
ffmpeg.c
libavcodec/avcodec.h
libavcodec/vda.c
libavcodec/x86/rv40dsp.asm
libavfilter/vf_scale.c
libavformat/nutdec.c
libavutil/mem.c
tests/ref/acodec/pcm_s24daud
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
||
|---|---|---|
| .. | ||
| aac.h | ||
| ac3dsp_arm.S | ||
| ac3dsp_armv6.S | ||
| ac3dsp_init_arm.c | ||
| ac3dsp_neon.S | ||
| asm-offsets.h | ||
| asm.S | ||
| dca.h | ||
| dcadsp_init_arm.c | ||
| dcadsp_neon.S | ||
| dsputil_arm.h | ||
| dsputil_arm.S | ||
| dsputil_armv6.S | ||
| dsputil_init_arm.c | ||
| dsputil_init_armv5te.c | ||
| dsputil_init_armv6.c | ||
| dsputil_init_neon.c | ||
| dsputil_init_vfp.c | ||
| dsputil_neon.S | ||
| dsputil_vfp.S | ||
| fft_fixed_init_arm.c | ||
| fft_fixed_neon.S | ||
| fft_init_arm.c | ||
| fft_neon.S | ||
| fmtconvert_init_arm.c | ||
| fmtconvert_neon.S | ||
| fmtconvert_vfp.S | ||
| h264cmc_neon.S | ||
| h264dsp_init_arm.c | ||
| h264dsp_neon.S | ||
| h264idct_neon.S | ||
| h264pred_init_arm.c | ||
| h264pred_neon.S | ||
| int_neon.S | ||
| jrevdct_arm.S | ||
| Makefile | ||
| mathops.h | ||
| mdct_fixed_neon.S | ||
| mdct_neon.S | ||
| mpegaudiodsp_fixed_armv6.S | ||
| mpegaudiodsp_init_arm.c | ||
| mpegvideo_arm.c | ||
| mpegvideo_arm.h | ||
| mpegvideo_armv5te_s.S | ||
| mpegvideo_armv5te.c | ||
| mpegvideo_neon.S | ||
| neon.S | ||
| rdft_neon.S | ||
| rv34dsp_init_neon.c | ||
| rv34dsp_neon.S | ||
| rv40dsp_init_neon.c | ||
| rv40dsp_neon.S | ||
| sbrdsp_init_arm.c | ||
| sbrdsp_neon.S | ||
| simple_idct_arm.S | ||
| simple_idct_armv5te.S | ||
| simple_idct_armv6.S | ||
| simple_idct_neon.S | ||
| synth_filter_neon.S | ||
| vp3dsp_neon.S | ||
| vp8_armv6.S | ||
| vp8.h | ||
| vp8dsp_armv6.S | ||
| vp8dsp_init_arm.c | ||
| vp8dsp_neon.S | ||
| vp56_arith.h | ||
| vp56dsp_init_arm.c | ||
| vp56dsp_neon.S | ||