Michael Niedermayer 4cf4da9dc5 Merge commit '5b4797a21db900b7d509660b7a4d49829089b004' ...

* commit '5b4797a21db900b7d509660b7a4d49829089b004':
  avframe: add AV_FRAME_DATA_MATRIXENCODING side data type.

Conflicts:
	libavutil/version.h

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

2014-01-05 22:12:41 +01:00

..

examples

examples/muxing: fix memleaks in resampler

2013-12-21 12:22:49 +01:00

APIchanges

Merge commit '5b4797a21db900b7d509660b7a4d49829089b004'

2014-01-05 22:12:41 +01:00

authors.texi

…

bitstream_filters.texi

doc/bitstream_filters: remove mp3_header_decompress filter

2013-12-14 21:47:51 +01:00

build_system.txt

…

codecs.texi

avcodec/mpegvideo_enc: implement frame skip score normalization

2014-01-01 02:46:39 +01:00

decoders.texi

…

default.css

doc/default.css: sync with ffmpeg-web

2013-11-28 10:27:25 +01:00

demuxers.texi

…

developer.texi

Merge commit '57ead8449e44bd07b3d4a5bd42f1aab64566f92e'

2013-12-23 12:52:50 +01:00

devices.texi

…

doxy-wrapper.sh

doc/doxy-wrapper: disable inserting headers and footers

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

Doxyfile

…

encoders.texi

doc/encoders: add wavpackenc doc

2013-12-29 13:10:11 +01:00

errno.txt

…

faq.texi

doc/faq: remove "-profile option fails when encoding H.264 video with AAC audio" entry

2014-01-03 17:05:44 +01:00

fate_config.sh.template

…

fate.texi

…

ffmpeg-bitstream-filters.texi

…

ffmpeg-codecs.texi

…

ffmpeg-devices.texi

…

ffmpeg-filters.texi

…

ffmpeg-formats.texi

…

ffmpeg-protocols.texi

…

ffmpeg-resampler.texi

…

ffmpeg-scaler.texi

…

ffmpeg-utils.texi

…

ffmpeg.texi

doc/ffmpeg: use @command{} for programs mentioned in -override_ffserver

2013-11-27 15:48:19 +01:00

ffmpeg.txt

…

ffplay.texi

ffplay: add documentation for "s" key

2014-01-01 12:57:15 +01:00

ffprobe.texi

ffprobe: add support for subtitle frames

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

ffprobe.xsd

ffprobe: show best_effort_timestamp in the frame section

2013-12-15 10:46:46 +01:00

ffserver.conf

ffserver: add stream Metadata option

2013-12-16 19:18:45 +01:00

ffserver.texi

doc/ffserver: mention how to access streams through RTSP

2014-01-03 17:03:43 +01:00

fftools-common-opts.texi

Allow hiding the banner.

2013-12-29 22:57:20 +01:00

filter_design.txt

…

filters.texi

lavfi/volume: implement process_command() callback, with the volume command

2013-12-25 18:25:53 +01:00

formats.texi

…

general.texi

ATRAC+ decoder

2013-12-29 01:11:16 +01:00

git-howto.texi

…

indevs.texi

…

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

…

libswscale.texi

…

Makefile

doc/doxy: remove unused files

2014-01-02 02:17:59 +01:00

metadata.texi

…

mips.txt

…

multithreading.txt

…

muxers.texi

doc/muxers/hls: change "can used" to "can be used"

2014-01-02 09:37:43 +01:00

nut.texi

…

optimization.txt

…

outdevs.texi

docs/outdevs: add a few simple ALSA examples

2013-12-12 18:21:52 -09:00

platform.texi

doc/platform: Update to reflect current MSVC build situation

2013-11-27 13:39:42 +00:00

print_options.c

…

protocols.texi

doc/protocols/file: fix semantical reverse

2014-01-05 00:43:51 +01:00

rate_distortion.txt

…

RELEASE_NOTES

Prepare release notes for Libav 10 "Eks"

2013-12-18 09:18:42 -05:00

resampler.texi

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

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

scaler.texi

…

snow.txt

…

swresample.txt

…

swscale.txt

…

t2h.init

…

tablegen.txt

…

texi2pod.pl

Merge remote-tracking branch 'qatar/master'

2013-12-01 21:50:13 +01:00

texidep.pl

doc: add script to compute texi files dependencies

2013-12-06 10:40:38 +01:00

utils.texi

cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices

2013-12-09 21:21:36 +01:00