RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/doc
History
Michael Niedermayer 620c6292b1 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  build: Fix Ogg demuxer dependencies
  build: Fix FLAC demuxer dependencies
  flac: Move flac functions shared between libraries to flac common code
  build: Fix CAF demuxer dependencies
  build: Fix MP2 muxer dependencies
  build: Add missing build rules for the ISMV muxer
  configure: Drop redundant mxf_d10 test dependency declaration
  Support AAC encoding via the external library fdk-aac
  libavcodec: Add more AAC profiles
  dct/fft-test: use a replacement getopt() if the system has none present.

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2012-07-12 23:57:00 +02:00
..
doxy doxygen: cleanup style to support older doxy 2011-12-29 17:19:46 +01:00
examples examples/filtering: fix packet memleak 2012-06-26 19:04:17 +02:00
APIchanges lavc: add av_fast_padded_mallocz 2012-07-10 21:42:23 +00:00
Makefile doc: add syntax.texi file 2012-05-22 00:39:53 +02:00
RELEASE_NOTES release_notes: update 2012-05-25 17:27:40 +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
…
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/developer: refer to av_malloc() instead of malloc() 2012-07-02 21:24:47 +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 Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
faq.texi doc/faq: Update video joining examples 2012-06-22 01:36:14 +02:00
fate.texi doc/fate: Rework examples to a section of its own 2012-07-05 10:55:49 +02:00
ffmpeg.texi doc: update mono to stereo workaround example 2012-07-07 17:37:16 +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: implement asettb filter. 2012-07-08 19:54:08 +02:00
general.texi Merge remote-tracking branch 'qatar/master' 2012-07-12 23:57:00 +02:00
git-howto.texi cosmetics: various spelling fixes 2012-07-06 17:08:22 +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 doc/indevs/iec61883: document requirements for iec61883 device 2012-07-06 11:47:50 +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
metadata.texi
…
mips.txt doc: add documentation regarding MIPS optimizations 2012-07-03 22:06:10 +02:00
multithreading.txt
…
muxers.texi lavf/segment: add -segment_time_delta option 2012-07-10 00:53:01 +02:00
optimization.txt
…
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-07-11 23:57:11 +02:00
rate_distortion.txt
…
snow.txt
…
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
…
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