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
574dcb5baf
FFmpeg/doc
History
Michael Niedermayer 574dcb5baf Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavf: don't guess r_frame_rate from either stream or codec timebase.
  avconv: set discard on input streams automatically.
  Fix parser not to clobber has_b_frames when extradata is set.
  lavf: don't set codec timebase in avformat_find_stream_info().
  avconv: saner output video timebase.
  rawdec: set timebase to 1/fps.
  avconv: refactor vsync code.
  FATE: remove a bunch of useless -vsync 0
  cdxl: bit line plane arrangement support
  cdxl: remove early check for bpp
  cdxl: set pix_fmt PAL8 only if palette is available

Conflicts:
	ffmpeg.c
	libavcodec/h264_parser.c
	libavformat/rawdec.c
	tests/fate/demux.mak
	tests/fate/ea.mak
	tests/fate/h264.mak
	tests/fate/prores.mak
	tests/fate/video.mak
	tests/ref/fate/bethsoft-vid
	tests/ref/fate/creatureshock-avs
	tests/ref/fate/ea-cmv
	tests/ref/fate/interplay-mve-16bit
	tests/ref/fate/interplay-mve-8bit
	tests/ref/fate/nuv
	tests/ref/fate/prores-alpha
	tests/ref/fate/qtrle-16bit
	tests/ref/fate/qtrle-1bit
	tests/ref/fate/real-rv40
	tests/ref/fate/rpza
	tests/ref/fate/wmv8-drm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-27 04:35:35 +01:00
..
doxy doxygen: cleanup style to support older doxy 2011-12-29 17:19:46 +01:00
examples Merge remote-tracking branch 'qatar/master' 2012-02-25 04:00:43 +01:00
APIchanges Merge remote-tracking branch 'qatar/master' 2012-02-26 05:11:21 +01:00
avtools-common-opts.texi Merge remote-tracking branch 'qatar/master' 2012-01-12 01:10:32 +01:00
avutil.txt
bitstream_filters.texi Merge remote-tracking branch 'qatar/master' 2012-02-25 04:00:43 +01:00
build_system.txt cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
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 eval: add root() to solve f(x)=0 2012-02-27 00:00:55 +01:00
faq.texi faq: fix typo. 2012-01-24 16:03:09 +01:00
fate.texi Merge remote-tracking branch 'qatar/master' 2012-02-10 01:20:07 +01:00
ffmpeg-mt-authorship.txt
ffmpeg.texi Merge remote-tracking branch 'qatar/master' 2012-02-27 04:35:35 +01:00
ffmpeg.txt Fix "ouput" typo and add a check. 2012-01-28 11:04:19 +01:00
ffplay.texi ffplay: add 10 minute seek support to ffplay 2011-12-14 21:09:08 +01:00
ffprobe.texi ffprobe: add count_frames and count_packets options 2012-02-17 01:06:43 +01:00
ffprobe.xsd ffprobe: report bit rate in stream description 2012-02-20 17:46:26 +01:00
ffserver.conf Merge remote-tracking branch 'qatar/master' 2012-02-10 01:20:07 +01:00
ffserver.texi Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
filters.texi af_pan: use libswr for rematrixing. 2012-02-20 20:46:35 +01:00
general.texi Merge remote-tracking branch 'qatar/master' 2012-02-18 02:20:19 +01:00
git-howto.texi Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
git-howto.txt githowto: git is generally available as package in most distros. 2011-11-23 23:03:37 +01:00
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 doc: fix convertion tool references 2012-02-01 03:37:08 +01:00
optimization.txt
outdevs.texi doc: use @command{} for commands. 2012-01-04 13:21:08 +01:00
platform.texi Fix a bunch of platform name and other typos. 2012-01-11 13:48:30 +01:00
protocols.texi Merge remote-tracking branch 'qatar/master' 2012-02-15 01:52:14 +01:00
rate_distortion.txt
RELEASE_NOTES RELEASE_NOTES: update for 0.10 2012-01-26 21:59:09 +01:00
snow.txt
soc.txt Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
swresample.txt
swscale.txt cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
t2h.init Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
tablegen.txt
texi2pod.pl
viterbi.txt cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00