mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
184fc600e1
* qatar/master: mpegvideo_enc: only allocate output packet when we know there will be output Add names for more channel layouts to the channel layout map. sunrast: Add a sample request for RMP_RAW colormap. avcodec: do not override pts or duration from the audio encoder Add prores regression test. Enable already existing rso regression test. Add regression test for "sox" format muxer/demuxer. Add dpx encoding regression test. swscale: K&R formatting cosmetics for PowerPC code (part I/II) img2: Use ff_guess_image2_codec(filename) shorthand where appropriate. Clarify licensing information about files borrowed from libjpeg. Mark mutable static data const where appropriate. avplay: fix -threads option dvbsubdec: avoid undefined signed left shift in RGBA macro mlpdec: use av_log_ask_for_sample() gif: K&R formatting cosmetics png: make .long_name more descriptive movdec: Adjust keyframe flagging in fragmented files rv34: change most "int stride" into "ptrdiff_t stride". Conflicts: avprobe.c ffplay.c libavcodec/mlpdec.c libavcodec/mpegvideo_enc.c libavcodec/pngenc.c libavcodec/x86/v210-init.c libavfilter/vf_boxblur.c libavfilter/vf_crop.c libavfilter/vf_drawtext.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_select.c libavfilter/vf_setpts.c libavfilter/vf_settb.c libavformat/img2.c libavutil/audioconvert.c tests/codec-regression.sh tests/lavf-regression.sh tests/ref/lavf/dpx tests/ref/vsynth1/prores tests/ref/vsynth2/prores 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_iwmmxt_rnd_template.c | ||
| dsputil_iwmmxt.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_iwmmxt.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 | ||