virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
9eae43ddcf
FFmpeg/doc
History
Michael Niedermayer e847f41285 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libspeexenc: add supported sample rates and channel layouts.
  Replace usleep() calls with av_usleep()
  lavu: add av_usleep() function
  utvideo: mark interlaced frames as such
  utvideo: Fix interlaced prediction for RGB utvideo.
  cosmetics: do not use full path for local headers
  lavu/file: include unistd.h only when available
  configure: check for unistd.h
  log: include unistd.h only when needed
  lavf: include libavutil/time.h instead of redeclaring av_gettime()

Conflicts:
	configure
	doc/APIchanges
	ffmpeg.c
	ffplay.c
	libavcodec/utvideo.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-22 22:34:02 +02:00
..
doxy doxygen: cleanup style to support older doxy 2011-12-29 17:19:46 +01:00
examples update filtering_audio example 2012-06-05 03:02:41 +02:00
APIchanges Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
avtools-common-opts.texi cmdutils: allow to specify a stream by its ID. 2012-05-20 12:47:27 +02:00
avutil.txt Remove unused softfloat implementation. 2011-05-11 13:43:30 +02:00
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 build: Add 'check' target to run all compile and test targets. 2012-05-15 19:10:46 +02:00
encoders.texi doc/encoders: update libvpxenc mappings 2012-06-13 11:33:00 +02: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 doc/faq: Update video joining examples 2012-06-22 01:36:14 +02:00
fate.texi Merge remote-tracking branch 'qatar/master' 2012-06-15 00:14:21 +02:00
ffmpeg.texi doc/ffmpeg.texi: use an exising preset file name 2012-06-20 15:29:46 +02:00
ffmpeg.txt Fix "ouput" typo and add a check. 2012-01-28 11:04:19 +01:00
ffplay.texi doc: add syntax.texi file 2012-05-22 00:39:53 +02:00
ffprobe.texi ffprobe: add -show_data option. 2012-06-18 09:38:36 +02:00
ffprobe.xsd ffprobe: dump AVPacket.convergence_duration. 2012-06-18 09:39:17 +02: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
filter_design.txt lavfi: drop planar/packed negotiation support 2012-05-16 13:16:05 +02:00
filters.texi lavfi: add showwaves filter 2012-06-20 12:37:57 +02:00
general.texi Replace Libav with FFmpeg 2012-06-21 12:33:28 +00:00
git-howto.texi Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
git-howto.txt githowto: git is generally available as package in most distros. 2011-11-23 23:03:37 +01:00
indevs.texi v4l2: allow to convert monotonic timestamps. 2012-04-04 15:22:44 +02:00
issue_tracker.txt doc: issue tracking: explain the term issue 2011-09-02 23:08:03 +02:00
libavfilter.texi doc: use @command{} for commands. 2012-01-04 13:21:08 +01:00
Makefile doc: add syntax.texi file 2012-05-22 00:39:53 +02:00
metadata.texi Revert "replace FFmpeg with Libav in doc/" 2011-03-17 17:26:45 +01:00
multithreading.txt Revert "replace FFmpeg with Libav in doc/" 2011-03-17 17:26:45 +01:00
muxers.texi doc/muxers: add documentation for the md5 and framemd5 muxers 2012-04-07 13:57:40 +02:00
optimization.txt fix another forgotten mplayerhq.hu link 2011-04-08 01:35:43 +02:00
outdevs.texi sdl: fix aspect ratio computations. 2012-06-10 09:57:50 +02:00
platform.texi Merge remote-tracking branch 'qatar/master' 2012-05-19 00:52:25 +02:00
print_options.c print_options: warn that the files are generated. 2012-04-23 18:14:25 +02:00
protocols.texi Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
rate_distortion.txt The definition of rate and distortion is not conditional of lambda being 2009-03-30 10:39:20 +00:00
RELEASE_NOTES release_notes: update 2012-05-25 17:27:40 +02:00
snow.txt Use a consistent capitalization for 'Snow' as discussed on the list 2008-02-08 19:17:46 +00:00
soc.txt Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
swresample.txt cosmetics: fix some typos 2012-03-13 01:14:04 +01:00
swscale.txt cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
syntax.texi doc/syntax: escape '@' to fix a warning. 2012-05-29 07:40:58 +02:00
t2h.init Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
tablegen.txt Update tablegen documentation for WRITE_ARRAY macro. 2010-06-27 14:31:50 +00:00
texi2pod.pl doc: texi2pod: add -I flag 2012-03-20 11:10:25 +00:00
viterbi.txt cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00