mirror of https://git.ffmpeg.org/ffmpeg.git
* 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 | ||
alldevices.c | ||
alsa-audio-common.c | ||
alsa-audio-dec.c | ||
alsa-audio-enc.c | ||
alsa-audio.h | ||
avdevice.c | ||
avdevice.h | ||
bktr.c | ||
dshow.c | ||
dshow.h | ||
dshow_common.c | ||
dshow_enummediatypes.c | ||
dshow_enumpins.c | ||
dshow_filter.c | ||
dshow_pin.c | ||
dv1394.c | ||
dv1394.h | ||
fbdev.c | ||
jack_audio.c | ||
lavfi.c | ||
libavdevice.v | ||
libcdio.c | ||
libdc1394.c | ||
openal-dec.c | ||
oss_audio.c | ||
pulse.c | ||
sdl.c | ||
sndio_common.c | ||
sndio_common.h | ||
sndio_dec.c | ||
sndio_enc.c | ||
timefilter.c | ||
timefilter.h | ||
v4l.c | ||
v4l2.c | ||
vfwcap.c | ||
x11grab.c |