virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
fa7d1c39fd
FFmpeg/doc
History
Michael Niedermayer 7f83db3124 Merge remote-tracking branch 'qatar/master' 
* 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>
2012-01-05 02:03:12 +01:00
..
doxy doxygen: cleanup style to support older doxy 2011-12-29 17:19:46 +01:00
examples decoding example: reset pts/dts after subpacket. 2011-12-13 19:47:57 +01:00
APIchanges Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
avconv.texi Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
avtools-common-opts.texi Merge remote-tracking branch 'qatar/master' 2011-12-17 02:18:16 +01:00
avutil.txt
bitstream_filters.texi Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
build_system.txt
decoders.texi lavc: add ffwavesynth pseudo-codec. 2011-12-15 18:38:04 +01:00
demuxers.texi lavf: add SBG demuxer. 2011-12-15 18:38:06 +01:00
developer.texi doc: make developer.texi point to correct fate doc 2011-12-20 18:12:36 +01:00
encoders.texi doc: use @command{} for commands. 2012-01-04 13:21:08 +01:00
errno.txt doc: add a list of errno codes on some systems. 2011-12-21 19:59:45 +01:00
eval.texi Fix a bunch of common typos. 2011-12-11 00:32:25 +01:00
faq.texi Merge remote-tracking branch 'qatar/master' 2011-12-26 04:10:47 +01:00
fate.texi doc: fate: Move documentation from .txt to .texi 2011-12-20 16:05:01 +01:00
ffmpeg-mt-authorship.txt
ffmpeg.texi Clearer explanation of audio channel mapping restrictions 2011-12-22 00:05:47 +01:00
ffmpeg.txt
ffplay.texi ffplay: add 10 minute seek support to ffplay 2011-12-14 21:09:08 +01:00
ffprobe.texi doc: use @command{} for commands. 2012-01-04 13:21:08 +01:00
ffprobe.xsd ffprobe: add support to option -show_error 2012-01-04 01:06:28 +01:00
ffserver.conf
ffserver.texi Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
filters.texi doc: use @command{} for commands. 2012-01-04 13:21:08 +01:00
general.texi Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
git-howto.texi Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
git-howto.txt
indevs.texi Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
issue_tracker.txt
libavfilter.texi doc: use @command{} for commands. 2012-01-04 13:21:08 +01:00
Makefile doc: build: TEXIDEP: Recognize verbatim includes 2011-12-24 02:56:52 +01:00
metadata.texi
multithreading.txt
muxers.texi Merge remote-tracking branch 'qatar/master' 2011-12-20 04:12:09 +01:00
optimization.txt
outdevs.texi doc: use @command{} for commands. 2012-01-04 13:21:08 +01:00
platform.texi platform.texi: close @enumerate section in the "Using shared libraries" subsection 2011-12-22 11:08:16 +01:00
protocols.texi doc: use @command{} for commands. 2012-01-04 13:21:08 +01:00
rate_distortion.txt
RELEASE_NOTES Release notes: mention cleaned up header includes 2012-01-02 17:21:55 +01:00
snow.txt
soc.txt Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
swresample.txt
swscale.txt
t2h.init Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
tablegen.txt
texi2pod.pl
viterbi.txt