Michael Niedermayer a75bf4e5c1 Merge commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7' ...

* commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7':
  vf_aspect: support variables in evaluating the aspect ratios

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/vf_aspect.c

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

2013-11-03 11:54:19 +01:00

..

doxy

…

examples

doc/examples/demuxing: reset got_frame.

2013-10-30 14:37:58 +01:00

APIchanges

Merge commit '28096e0a806e57376541e6222d315619906e3c55'

2013-11-01 12:59:08 +01:00

authors.texi

…

avutil.txt

…

bitstream_filters.texi

…

build_system.txt

…

codecs.texi

lavc: extend documentation for the "bf" option

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

decoders.texi

…

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

…

Doxyfile

…

encoders.texi

avcodec/libmp3lame: add ABR support

2013-11-02 18:44:20 +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

…

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: make x11grab examples consistent with option names

2013-10-14 23:08:52 +02: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.xsd

ffprobe: print stream channel_layout when available

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

ffserver.conf

…

ffserver.texi

…

fftools-common-opts.texi

cmdutils: add -colors option

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

filter_design.txt

…

filters.texi

Merge commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7'

2013-11-03 11:54:19 +01:00

formats.texi

…

general.texi

Merge commit '5846646296e377e093441dfe9eadde38ff1f7c99'

2013-11-01 17:33:05 +01:00

git-howto.texi

…

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

…

libavdevice.texi

…

libavfilter.texi

…

libavformat.texi

…

libavutil.texi

…

libswresample.texi

…

libswscale.texi

…

Makefile

doc/Makefile: fix man pages uninstall path

2013-10-24 21:19:52 +02:00

metadata.texi

…

mips.txt

…

multithreading.txt

…

muxers.texi

doc/muxers: add definitory line for the MOV/MP4/ISMV muxer

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

nut.texi

…

optimization.txt

…

outdevs.texi

lavd: add fbdev output device

2013-10-24 08:16:17 +02:00

platform.texi

…

print_options.c

…

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

…

soc.txt

…

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

viterbi.txt

…