Michael Niedermayer 5f231d909f Merge commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118' ...

* commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118':
  vdpau: add a convenience function for getting a decoder profile.

Conflicts:
	doc/APIchanges
	libavcodec/vdpau.c
	libavcodec/vdpau.h
	libavcodec/version.h

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

2013-11-14 13:00:10 +01:00

..

doxy

doc: support the new website layout

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

examples

doc/examples: rename demuxing to demuxing_decoding.

2013-11-04 12:53:06 +01:00

APIchanges

Merge commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118'

2013-11-14 13:00:10 +01:00

authors.texi

doc: use a common authors.texi file blurb

2012-12-19 09:33:43 +01:00

bitstream_filters.texi

doc/bitstream_filters: document dump_extra

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

build_system.txt

cosmetics: Delete empty lines at end of file.

2012-02-09 12:26:45 +01:00

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

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

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

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: fix libfdk-aac "Examples" subsection

2013-11-10 12:36:54 +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

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

doc: extend "See Also" chapters in component manuals

2012-12-19 09:33:44 +01:00

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

doc: extend "See Also" chapters in component manuals

2012-12-19 09:33:44 +01:00

ffmpeg-formats.texi

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

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

ffmpeg-protocols.texi

doc: extend "See Also" chapters in component manuals

2012-12-19 09:33:44 +01:00

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

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

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

ffmpeg.texi

doc: make x11grab examples consistent with option names

2013-10-14 23:08:52 +02:00

ffmpeg.txt

Fix "ouput" typo and add a check.

2012-01-28 11:04:19 +01:00

ffplay.texi

ffplay: update and extend documentation for channel and stream switching

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

ffprobe.texi

ffprobe: add -read_intervals option

2013-09-19 10:10:30 +02:00

ffprobe.xsd

ffprobe: print stream channel_layout when available

2013-10-03 09:19:38 +02:00

ffserver.conf

Merge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd'

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

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

lavfi: add elbg filter

2013-11-13 11:21:57 +01:00

formats.texi

lavf/options_table: improve option help text

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

general.texi

Merge remote-tracking branch 'qatar/master'

2013-11-14 03:26:35 +01:00

git-howto.texi

doc: git-howto: Leave reviewers time to react before pushing patches

2012-11-11 20:43:28 +01:00

git-howto.txt

…

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

doc: extend "See Also" chapters in library manuals

2012-12-19 09:33:44 +01:00

libavdevice.texi

doc: extend "See Also" chapters in library manuals

2012-12-19 09:33:44 +01:00

libavfilter.texi

doc: extend "See Also" chapters in library manuals

2012-12-19 09:33:44 +01:00

libavformat.texi

doc: extend "See Also" chapters in library manuals

2012-12-19 09:33:44 +01:00

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

doc: extend "See Also" chapters in library manuals

2012-12-19 09:33:44 +01:00

Makefile

doc/Makefile: fix man pages uninstall path

2013-10-24 21:19:52 +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

libavcodec: Implementation of 32 bit fixed point FFT

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

multithreading.txt

Merge commit '759001c534287a96dc96d1e274665feb7059145d'

2013-03-12 03:23:28 +01:00

muxers.texi

doc/muxers: document animated GIF muxer.

2013-11-07 20:30:43 +01:00

nut.texi

Drop Snow codec

2013-01-06 16:30:02 +01:00

optimization.txt

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

outdevs.texi

lavd: add fbdev output device

2013-10-24 08:16:17 +02: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

miscellaneous typo fixes

2012-12-21 00:18:34 +01:00

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

Fix a few "its" vs "it's" typo.

2013-02-14 23:45:48 +01:00

swscale.txt

x86: mmx2 ---> mmxext in comments and messages

2012-10-31 00:37:42 +01:00

t2h.init

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

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

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: document channel layout specification

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