mirror of https://git.ffmpeg.org/ffmpeg.git
7f83db3124
* qatar/master: (46 commits) mtv: Make sure audio_subsegments is not 0 v4l2: use V4L2_FMT_FLAG_EMULATED only if it is defined avconv: add symbolic names for -vsync parameters flvdec: Fix compiler warning for uninitialized variables rtsp: Fix compiler warning for uninitialized variable ulti: convert to new bytestream API. swscale: Use standard multiple inclusion guards in ppc/ header files. Place some START_TIMER invocations in separate blocks. v4l2: list available formats v4l2: set the proper codec_tag v4l2: refactor device_open v4l2: simplify away io_method v4l2: cosmetics v4l2: uniform and format options v4l2: do not force interlaced mode avio: exit early in fill_buffer without read_packet vc1dec: fix invalid memory access for small video dimensions rv34: fix invalid memory access for small video dimensions rv34: joint coefficient decoding and dequantization avplay: Don't call avio_set_interrupt_cb(NULL) ... Conflicts: Changelog avconv.c doc/APIchanges doc/indevs.texi libavcodec/adxenc.c libavcodec/dnxhdenc.c libavcodec/h264.c libavdevice/v4l2.c libavformat/flvdec.c libavformat/mtv.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
|---|---|---|
| .. | ||
| Makefile | ||
| 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.S | ||
| dsputil_arm.h | ||
| 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.c | ||
| dsputil_iwmmxt_rnd_template.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 | ||
| 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.c | ||
| mpegvideo_armv5te_s.S | ||
| 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 | ||
| simple_idct_arm.S | ||
| simple_idct_armv5te.S | ||
| simple_idct_armv6.S | ||
| simple_idct_neon.S | ||
| synth_filter_neon.S | ||
| vp3dsp_neon.S | ||
| vp8.h | ||
| vp8_armv6.S | ||
| vp8dsp_armv6.S | ||
| vp8dsp_init_arm.c | ||
| vp8dsp_neon.S | ||
| vp56_arith.h | ||
| vp56dsp_init_arm.c | ||
| vp56dsp_neon.S | ||