Michael Niedermayer 82fdfe8e51 Merge commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a' ...

* commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a':
  avcodec: Add output_picture_number to AVCodecParserContext

Conflicts:
	doc/APIchanges
	libavcodec/version.h

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

2013-08-03 10:48:11 +02:00

..

doxy

…

examples

examples: demuxing: print ffplay command even if sample format is planar

2013-07-19 12:14:54 +02:00

APIchanges

Merge commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a'

2013-08-03 10:48:11 +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

doc/bitstream_filters: document dump_extra

2013-07-17 09:31:02 +02:00

build_system.txt

…

codecs.texi

doc/codecs: fix dangling reference to codec-options chapter

2013-07-27 16:50:19 +02:00

decoders.texi

doc/decoders: document libopus decoder

2013-06-28 13:09:10 +02:00

default.css

…

demuxers.texi

lavf: add support for libgme

2013-07-02 18:52:45 +02:00

developer.texi

Merge remote-tracking branch 'qatar/master'

2013-07-28 14:21:11 +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

Update back for git master

2013-07-10 03:14:23 +02:00

encoders.texi

libxvid: Add SSIM displaying through a libxvidcore plugin

2013-07-31 12:41:27 +02:00

errno.txt

…

faq.texi

Merge remote-tracking branch 'qatar/master'

2013-07-26 11:12:11 +02:00

fate_config.sh.template

Merge remote-tracking branch 'qatar/master'

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

fate.texi

Merge remote-tracking branch 'qatar/master'

2013-07-28 14:21:11 +02: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

doc/ffmpeg: document -override_ffserver

2013-07-09 22:19:10 +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: add -show_programs option

2013-07-28 16:39:06 +02:00

ffprobe.xsd

ffprobe: add -show_programs option

2013-07-28 16:39:06 +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

doc/filters: fix typo

2013-07-29 20:05:21 +00:00

formats.texi

doc/formats: add section describing stream specifiers

2013-07-11 00:35:35 +02:00

general.texi

Merge commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8'

2013-07-30 11:26:39 +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

update all trac links to use the trac subdomain

2013-06-29 19:27:49 +02:00

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

Revert "doc: add script to compute texi files dependencies"

2013-07-03 12:59:59 +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

mips: Optimization of AAC psychoacoustic model functions

2013-03-23 16:19:38 +01:00

multithreading.txt

…

muxers.texi

lavf/segment: add initial_offset option

2013-07-11 00:36:24 +02:00

nut.texi

…

optimization.txt

…

outdevs.texi

lavd: add xv output device

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

platform.texi

Merge commit 'b0ce601c160c87349d093d7e542b5c752754f598'

2013-06-25 10:46:52 +02:00

print_options.c

Merge commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c'

2013-08-03 09:22:30 +02:00

protocols.texi

doc/protocols: Document file protocol options

2013-08-01 04:08:14 +02:00

rate_distortion.txt

…

RELEASE_NOTES

Update for 2.0

2013-07-10 02:15:43 +02:00

resampler.texi

doc: add "rematrix_maxval"

2013-07-22 03:37:55 +02: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

…