Michael Niedermayer 625b29037e Merge commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025' ...

* commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025':
  mpeg12dec: Extract CC user data into frame side data

Conflicts:
	doc/APIchanges
	libavutil/version.h

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

2013-11-26 13:00:46 +01:00

..

doxy

…

examples

build: Integrate multilibrary examples into the build system

2013-11-25 11:57:29 -08:00

APIchanges

Merge commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025'

2013-11-26 13:00:46 +01:00

authors.texi

…

bitstream_filters.texi

doc/bitstream_filters: document dump_extra

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

build_system.txt

…

codecs.texi

lavc: extend documentation for the "bf" option

2013-10-29 18:30:27 +01:00

decoders.texi

lavc: add teletext decoder using libzvbi

2013-09-02 01:19:52 +02:00

default.css

doc/default.css + doc/t2h.init: New styles

2013-10-09 04:01:46 +02:00

demuxers.texi

doc/demuxers: fix image2 examples

2013-09-29 16:36:25 +00:00

developer.texi

doc/developer: Add a policy item about updating the MAINTAINERs file

2013-10-19 15:20:03 +02:00

devices.texi

…

doxy-wrapper.sh

doc/doxy-wrapper: disable inserting headers and footers

2013-11-10 02:33:33 +01:00

Doxyfile

Fix wrong use of "an" in some comments.

2013-08-12 03:27:26 +02:00

encoders.texi

doc/encoders/libfdk_aac: state that VBR support is experimental

2013-11-22 14:55:01 +01:00

errno.txt

…

faq.texi

doc/faq: add @command{} in the tool debug entry.

2013-09-29 23:31:12 +02:00

fate_config.sh.template

…

fate.texi

Merge remote-tracking branch 'qatar/master'

2013-07-28 14:21:11 +02:00

ffmpeg-bitstream-filters.texi

…

ffmpeg-codecs.texi

…

ffmpeg-devices.texi

…

ffmpeg-filters.texi

…

ffmpeg-formats.texi

…

ffmpeg-protocols.texi

…

ffmpeg-resampler.texi

Fix wrong use of "an" in some comments.

2013-08-12 03:27:26 +02:00

ffmpeg-scaler.texi

Fix wrong use of "an" in some comments.

2013-08-12 03:27:26 +02:00

ffmpeg-utils.texi

…

ffmpeg.texi

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

2013-11-23 14:46:48 +01:00

ffmpeg.txt

…

ffplay.texi

ffplay: update and extend documentation for channel and stream switching

2013-10-26 12:23:54 +02:00

ffprobe.texi

ffprobe: add support for subtitle frames

2013-11-25 19:51:27 +01:00

ffprobe.xsd

ffprobe: add support for subtitle frames

2013-11-25 19:51:27 +01:00

ffserver.conf

…

ffserver.texi

doc: Rename avtools-common-opts to fftools-common opts

2013-09-10 18:04:03 +02:00

fftools-common-opts.texi

cmdutils: add -colors option

2013-10-27 09:18:45 +01:00

filter_design.txt

doc/filter_design.txt: Fix duplicate words

2013-08-12 19:40:29 +02:00

filters.texi

Merge commit 'dd249245d012c1eceb57c166e256fc95e74f4bb1'

2013-11-21 19:09:12 +01:00

formats.texi

lavf/options_table: improve option help text

2013-09-17 19:47:58 +02:00

general.texi

Merge commit '56d061ce9da954560892e3551513d5ecc0439846'

2013-11-26 12:28:31 +01:00

git-howto.texi

…

indevs.texi

lavd/pulse_audio_dec: apply cosmetic changes

2013-10-18 23:26:55 +02:00

issue_tracker.txt

doc/issue_tracker: add 2 missing issue types

2013-10-26 11:29:42 +02:00

libavcodec.texi

…

libavdevice.texi

…

libavfilter.texi

…

libavformat.texi

…

libavutil.texi

doc/libavutil: add things from avutil.txt

2013-11-14 09:51:10 +01:00

libswresample.texi

Fix wrong use of "an" in some comments.

2013-08-12 03:27:26 +02:00

libswscale.texi

…

Makefile

doc/Makefile fix PROGS

2013-11-26 02:06:59 +01:00

metadata.texi

…

mips.txt

libavcodec: Implementation of 32 bit fixed point FFT

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

multithreading.txt

…

muxers.texi

lavf/segment: add segment_list_entry_prefix option

2013-11-25 19:12:16 +01:00

nut.texi

…

optimization.txt

…

outdevs.texi

doc/outdevs/sdl: fix confusing text about window_fullscreen default value

2013-11-24 19:35:36 +01:00

platform.texi

Merge commit 'b0ce601c160c87349d093d7e542b5c752754f598'

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

print_options.c

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

protocols.texi

doc/protocols/rtp: apply misc fixes

2013-10-27 12:44:48 +01:00

rate_distortion.txt

…

RELEASE_NOTES

doc/RELEASE_NOTES: update for 2.1

2013-10-28 01:13:46 +01:00

resampler.texi

doc: add a few links to the Channel Layout syntax section

2013-10-25 15:44:12 +02:00

scaler.texi

doc: move sws_dither option description to scaler.texi

2013-09-30 16:54:46 +02:00

snow.txt

doc/snow: add gray/alpha/gbr

2013-08-29 22:52:04 +02:00

swresample.txt

…

swscale.txt

…

t2h.init

doc/default.css + doc/t2h.init: New styles

2013-10-09 04:01:46 +02:00

tablegen.txt

…

texi2pod.pl

…

utils.texi

doc/utils: document channel layout specification

2013-10-25 15:44:04 +02:00