Michael Niedermayer b6e7041f90 Merge commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e' ...

* commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e':
  doc: improve documentation for the asyncts filter first_pts option
  asyncts: fix the asyncts behavior when using the first_pts option

Conflicts:
	libavfilter/af_asyncts.c

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

2012-12-14 13:58:12 +01:00

..

doxy

…

examples

examples: add resampling_audio.c file

2012-12-06 10:09:37 +01:00

APIchanges

lavu/opt: add av_opt_ accessors for pixel/format/image size options

2012-11-25 15:01:33 +01:00

avtools-common-opts.texi

Merge commit '28c8e288fa0342fdef532a7522a4707bebf831cc'

2012-11-26 00:43:45 +01:00

avutil.txt

…

bitstream_filters.texi

…

build_system.txt

…

decoders.texi

doc/decoders: fix typo in "@Options"

2012-12-06 10:16:10 +01:00

demuxers.texi

lavf: TED Talks JSON captions demuxer.

2012-12-09 18:50:38 +01:00

developer.texi

doc: describe micro versioning policy

2012-12-03 16:31:51 +01:00

doxy-wrapper.sh

…

Doxyfile

Merge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd'

2012-11-16 13:07:10 +01:00

encoders.texi

Improve x264opts description.

2012-12-09 18:24:56 +01:00

errno.txt

…

eval.texi

…

faq.texi

…

fate_config.sh.template

…

fate.texi

…

ffmpeg-bitstream-filters.texi

doc: add ffmpeg-bitstream-filters.texi file

2012-11-28 23:51:12 +01:00

ffmpeg-codecs.texi

avcodec: Fix a typo in an option description

2012-12-07 16:16:20 +01:00

ffmpeg-devices.texi

doc: add libavdevice.texi and ffmpeg-devices.texi files

2012-11-27 23:35:25 +01:00

ffmpeg-filters.texi

doc/ffmpeg-filters: add short description

2012-12-01 13:06:56 +01:00

ffmpeg-formats.texi

doc: sync avoid_negative_ts option with internal help.

2012-12-08 15:17:47 +01:00

ffmpeg-protocols.texi

doc: add ffmpeg-protocols.texi manual

2012-11-27 23:35:45 +01:00

ffmpeg-resampler.texi

lswr/swresample: use AV_OPT_TYPE_SAMPLE_FMT for sample format options

2012-12-03 13:49:56 +01:00

ffmpeg-scaler.texi

doc: add libswscale.texi and ffmpeg-scaler.texi files

2012-11-25 19:21:30 +01:00

ffmpeg-utils.texi

doc: move syntax and eval chapters from libavutil to ffmpeg-utils

2012-11-27 23:35:35 +01:00

ffmpeg.texi

docs: -asyncts has been replaced by aresample not asyncts in ffmpeg

2012-12-13 21:54:35 +01:00

ffmpeg.txt

…

ffplay.texi

…

ffprobe.texi

ffprobe: implement -sections option

2012-11-22 14:19:29 +01:00

ffprobe.xsd

…

ffserver.conf

Merge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd'

2012-11-16 13:07:10 +01:00

ffserver.texi

Merge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd'

2012-11-16 13:07:10 +01:00

filter_design.txt

lavfi: replace filter_samples by filter_frame

2012-11-28 16:43:34 +01:00

filters.texi

Merge commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e'

2012-12-14 13:58:12 +01:00

general.texi

lavf: TED Talks JSON captions demuxer.

2012-12-09 18:50:38 +01:00

git-howto.texi

…

git-howto.txt

…

indevs.texi

Update iec61883 to handle multiple devices, and allow

2012-11-13 19:44:21 +01:00

issue_tracker.txt

…

libavcodec.texi

doc: add ffmpeg-bitstream-filters.texi file

2012-11-28 23:51:12 +01:00

libavdevice.texi

doc: add libavdevice.texi and ffmpeg-devices.texi files

2012-11-27 23:35:25 +01:00

libavfilter.texi

doc: move filters documentation to dedicated manual page ffmpeg-filters

2012-11-25 00:28:27 +01:00

libavformat.texi

doc: add ffmpeg-protocols.texi manual

2012-11-27 23:35:45 +01:00

libavutil.texi

doc: move syntax and eval chapters from libavutil to ffmpeg-utils

2012-11-27 23:35:35 +01:00

libswresample.texi

doc: add libswresample.texi and ffmpeg-resampler.texi files

2012-11-25 00:28:36 +01:00

libswscale.texi

doc: add libswscale.texi and ffmpeg-scaler.texi files

2012-11-25 19:21:30 +01:00

Makefile

doc/Makefile: rework component configuration logic

2012-11-29 10:19:52 +01:00

metadata.texi

…

mips.txt

mips: Optimization of AC3 FP encoder and EAC3 FP decoder

2012-11-19 22:24:44 +01:00

multithreading.txt

Revert "replace FFmpeg with Libav in doc/"

2011-03-17 17:26:45 +01:00

muxers.texi

lavf/segment: add segment_start_number option

2012-12-13 21:38:43 +01:00

nut.texi

…

optimization.txt

Merge commit '652f5185945c8405fc57aed353286858df8d066f'

2012-10-31 14:02:35 +01:00

outdevs.texi

…

platform.texi

Fix the path to the C99-to-C89 Converter & Wrapper to the only existing repository.

2012-11-22 00:46:14 +01:00

print_options.c

…

protocols.texi

…

rate_distortion.txt

…

RELEASE_NOTES

…

snow.txt

…

soc.txt

…

swresample.txt

…

swscale.txt

…

syntax.texi

…

t2h.init

…

tablegen.txt

…

texi2pod.pl

doc/texi2pod: recognize @table @command.

2012-11-17 19:47:56 +01:00

viterbi.txt

…