Michael Niedermayer 719fde47ca Merge commit 'c68317ebbe4915035df0b08c23eea7a0b80ab881' ...

* commit 'c68317ebbe4915035df0b08c23eea7a0b80ab881':
  lavc: fix documentation for AVCodecContext.delay
  atrac3: return an error if extradata_size is not a specific known size
  lavc: use the correct API version guard macro for avcodec_encode_audio()
  Move Doxyfile into the doc/ subdirectory
  doxygen: Build Doxygen documentation in the doc/ subdirectory
  dfa: use av_memcpy_backptr() where previously impossible
  av_memcpy_backptr: Drop no longer necessary malloc padding

Conflicts:
	.gitignore
	libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2012-10-24 14:18:17 +02:00

..

doxy

doc: support the new website layout

2012-10-08 11:22:42 +02:00

examples

examples/decoding_encoding: add and use the decode_write_frame function

2012-10-24 00:29:37 +02:00

APIchanges

Merge commit 'add3a6902ea4d459f36655656a1f8daa409118a7'

2012-10-23 13:17:47 +02:00

avtools-common-opts.texi

…

avutil.txt

…

bitstream_filters.texi

…

build_system.txt

…

decoders.texi

…

demuxers.texi

…

developer.texi

…

Doxyfile

Merge commit 'c68317ebbe4915035df0b08c23eea7a0b80ab881'

2012-10-24 14:18:17 +02:00

encoders.texi

…

errno.txt

…

eval.texi

…

faq.texi

Merge commit '0a75d1da23b8659ec49391469bb592da12760077'

2012-10-12 14:15:33 +02:00

fate_config.sh.template

doc/fate: Move fate config example into doc subdirectory

2012-09-29 19:27:01 +02:00

fate.texi

doc/fate: Move fate config example into doc subdirectory

2012-09-29 19:27:01 +02:00

ffmpeg.texi

docu: fix flite example

2012-10-15 11:24:08 -06:00

ffmpeg.txt

…

ffplay.texi

…

ffprobe.texi

ffprobe: add -select_streams option

2012-10-05 23:58:18 +02:00

ffprobe.xsd

ffprobe: extend disposition printing support

2012-09-30 12:22:19 +02:00

ffserver.conf

…

ffserver.texi

…

filter_design.txt

…

filters.texi

lavfi/aspect: add max option

2012-10-22 10:46:43 +02:00

general.texi

LVF demuxer

2012-10-22 23:22:39 +00:00

git-howto.texi

…

git-howto.txt

…

indevs.texi

lavd/lavfi: add graph_file option

2012-10-23 22:08:55 +02:00

issue_tracker.txt

…

Makefile

Merge remote-tracking branch 'qatar/master'

2012-10-08 21:46:34 +02:00

metadata.texi

…

mips.txt

…

multithreading.txt

…

muxers.texi

doc/muxers: document mov faststart option.

2012-10-21 20:23:09 +02:00

nut.texi

Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520'

2012-10-14 14:46:13 +02:00

optimization.txt

…

outdevs.texi

…

platform.texi

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

2012-10-24 13:42:58 +02:00

print_options.c

…

protocols.texi

…

rate_distortion.txt

…

RELEASE_NOTES

doc/RELEASE_NOTES: update for the 9 release.

2012-10-06 13:55:18 +02:00

snow.txt

…

soc.txt

…

swresample.txt

doc/swresample.txt: fix typos

2012-10-02 09:43:27 +02:00

swscale.txt

…

syntax.texi

…

t2h.init

Merge remote-tracking branch 'qatar/master'

2012-10-09 13:06:04 +02:00

tablegen.txt

…

texi2pod.pl

…

viterbi.txt

…