Michael Niedermayer af5f9c0876 Merge commit '95d52464542f532061290192518d5fe1c1930e8d' ...

* commit '95d52464542f532061290192518d5fe1c1930e8d':
  lavc: Add option to encode MPEG-2 AAC with libfdk-aac

Conflicts:
	doc/APIchanges
	libavcodec/version.h

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

2013-06-24 10:57:04 +02:00

..

doxy

…

examples

examples/filtering_audio: fix frame leak.

2013-04-18 17:03:01 +02:00

APIchanges

Merge commit '95d52464542f532061290192518d5fe1c1930e8d'

2013-06-24 10:57:04 +02:00

authors.texi

…

avtools-common-opts.texi

doc: document -opencl_options option in ff* tools manuals

2013-04-14 20:30:34 +02:00

avutil.txt

…

bitstream_filters.texi

…

build_system.txt

…

codecs.texi

doc/codecs: Mention relation of the experimental setting and codecs

2013-06-08 14:14:27 +02:00

decoders.texi

doc/decoders,decoders: add various missing final dots

2013-06-21 18:25:49 +02:00

default.css

…

demuxers.texi

img2dec: Add ts_from_file option

2013-05-25 11:42:28 +02:00

developer.texi

Merge commit '8e673efc6f5b7a095557664660305148f2788d30'

2013-05-19 10:53:39 +02:00

devices.texi

doc: move ffmpeg-devices.texi content to separated file

2013-04-05 10:11:57 +02:00

doxy-wrapper.sh

…

Doxyfile

Merge commit 'e69222c50755030eef921e899e38b71a111093d9'

2013-05-24 12:25:21 +02:00

encoders.texi

doc/decoders,decoders: add various missing final dots

2013-06-21 18:25:49 +02:00

errno.txt

…

faq.texi

lavfi: deprecate aconvert.

2013-04-11 22:13:45 +02:00

fate_config.sh.template

Merge remote-tracking branch 'qatar/master'

2013-05-29 11:19:25 +02:00

fate.texi

doc: Mention the target_samples and ld variables for fate configs

2013-05-29 10:37:18 +03:00

ffmpeg-bitstream-filters.texi

…

ffmpeg-codecs.texi

doc: move ffmpeg-codecs.texi content to separated file

2013-04-05 10:11:57 +02:00

ffmpeg-devices.texi

doc: move ffmpeg-devices.texi content to separated file

2013-04-05 10:11:57 +02:00

ffmpeg-filters.texi

…

ffmpeg-formats.texi

doc: move ffmpeg-formats.texi content to separated file

2013-04-05 10:11:57 +02:00

ffmpeg-protocols.texi

…

ffmpeg-resampler.texi

doc: move ffmpeg-resampler.texi content to separated file

2013-04-05 10:11:57 +02:00

ffmpeg-scaler.texi

doc: move ffmpeg-scaler.texi content to separated file

2013-04-05 10:11:57 +02:00

ffmpeg-utils.texi

doc: merge syntax.texi, eval.texi and opencl.texi into utils.texi

2013-04-12 18:21:57 +02:00

ffmpeg.texi

Merge commit '481575d255195c6c2f32e04686b94de984ae78d4'

2013-05-08 12:07:56 +02:00

ffmpeg.txt

…

ffplay.texi

doc: remove all-components.texi, include its content verbatim

2013-04-25 11:19:53 +02:00

ffprobe.texi

ffprobe: show chapter and chapter metadata information

2013-06-06 16:49:53 +02:00

ffprobe.xsd

ffprobe: show chapter and chapter metadata information

2013-06-06 16:49:53 +02:00

ffserver.conf

…

ffserver.texi

doc: remove all-components.texi, include its content verbatim

2013-04-25 11:19:53 +02:00

filter_design.txt

doc: Consistently use 'frame rate' everywhere

2013-03-31 18:22:08 -04:00

filters.texi

added start_number parameter to drawtext to permit an offset to n/frame_num var

2013-06-14 17:05:19 -04:00

formats.texi

doc: move ffmpeg-formats.texi content to separated file

2013-04-05 10:11:57 +02:00

general.texi

lavf: add WebVTT muxer.

2013-06-17 22:28:19 +02:00

git-howto.texi

…

git-howto.txt

…

indevs.texi

v4l2: make possible to disable libv4l2 at runtime.

2013-05-22 19:49:29 +02:00

issue_tracker.txt

…

libavcodec.texi

…

libavdevice.texi

…

libavfilter.texi

…

libavformat.texi

…

libavutil.texi

doc/libavutil: remove include of opencl.texi

2013-04-12 18:21:57 +02:00

libswresample.texi

…

libswscale.texi

…

Makefile

doc/Makefile: install .3 man pages to man3 subdir

2013-05-19 19:26:25 +02:00

metadata.texi

doc/metadata: add notes and examples regarding metadata usage with ffmpeg

2013-06-11 01:07:16 +02:00

mips.txt

…

multithreading.txt

…

muxers.texi

Merge commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521'

2013-05-03 13:16:34 +02:00

nut.texi

…

optimization.txt

…

outdevs.texi

lavd: add xv output device

2013-05-30 10:44:54 +02:00

platform.texi

Merge remote-tracking branch 'qatar/master'

2013-03-31 11:31:19 +02:00

print_options.c

…

protocols.texi

doc/protocols: apply very minor consistency fixes

2013-06-21 17:47:34 +02:00

rate_distortion.txt

…

RELEASE_NOTES

…

resampler.texi

swresample: set flags & description and add documentation for output_sample_bits

2013-06-04 21:57:25 +00:00

scaler.texi

doc: move ffmpeg-scaler.texi content to separated file

2013-04-05 10:11:57 +02:00

snow.txt

…

soc.txt

…

swresample.txt

…

swscale.txt

…

t2h.init

…

tablegen.txt

…

texi2pod.pl

doc/texi2pod.pl: skip printing chapter names if they are disabled

2013-03-30 16:58:45 +01:00

utils.texi

doc/utils: use @code markup for opencl function names.

2013-04-12 23:10:59 +02:00

viterbi.txt

…