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> |
||
|---|---|---|
| .. | ||
| doxy | ||
| examples | ||
| APIchanges | ||
| Makefile | ||
| RELEASE_NOTES | ||
| avconv.texi | ||
| avtools-common-opts.texi | ||
| avutil.txt | ||
| bitstream_filters.texi | ||
| build_system.txt | ||
| decoders.texi | ||
| demuxers.texi | ||
| developer.texi | ||
| encoders.texi | ||
| errno.txt | ||
| eval.texi | ||
| faq.texi | ||
| fate.texi | ||
| ffmpeg-mt-authorship.txt | ||
| ffmpeg.texi | ||
| ffmpeg.txt | ||
| ffplay.texi | ||
| ffprobe.texi | ||
| ffprobe.xsd | ||
| ffserver.conf | ||
| ffserver.texi | ||
| filters.texi | ||
| general.texi | ||
| git-howto.texi | ||
| git-howto.txt | ||
| indevs.texi | ||
| issue_tracker.txt | ||
| libavfilter.texi | ||
| metadata.texi | ||
| multithreading.txt | ||
| muxers.texi | ||
| optimization.txt | ||
| outdevs.texi | ||
| platform.texi | ||
| protocols.texi | ||
| rate_distortion.txt | ||
| snow.txt | ||
| soc.txt | ||
| swresample.txt | ||
| swscale.txt | ||
| t2h.init | ||
| tablegen.txt | ||
| texi2pod.pl | ||
| viterbi.txt | ||