Michael Niedermayer 3ead79eaa3 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  FATE: use updated reference for aac-latm_stereo_to_51
  avconv: use libavresample
  Add libavresample
  FATE: avoid channel mixing in lavf-dv_fmt

Conflicts:
	Changelog
	Makefile
	cmdutils.c
	configure
	doc/APIchanges
	ffmpeg.c
	tests/lavf-regression.sh
	tests/ref/lavf/dv_fmt
	tests/ref/seek/lavf_dv

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

2012-04-25 23:17:41 +02:00

..

doxy

…

examples

examples/decoding_encoding: remove unused variable "size"

2012-04-13 00:13:31 +02:00

APIchanges

Merge remote-tracking branch 'qatar/master'

2012-04-25 23:17:41 +02:00

avtools-common-opts.texi

Merge remote-tracking branch 'qatar/master'

2012-03-21 01:33:53 +01:00

avutil.txt

…

bitstream_filters.texi

Merge remote-tracking branch 'qatar/master'

2012-02-25 04:00:43 +01:00

build_system.txt

cosmetics: Delete empty lines at end of file.

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

decoders.texi

…

demuxers.texi

…

developer.texi

Merge remote-tracking branch 'qatar/master'

2012-04-17 12:13:22 +02:00

encoders.texi

…

errno.txt

…

eval.texi

eval: add root() to solve f(x)=0

2012-02-27 00:00:55 +01:00

faq.texi

…

fate.texi

Merge remote-tracking branch 'qatar/master'

2012-03-07 03:22:49 +01:00

ffmpeg-mt-authorship.txt

…

ffmpeg.texi

Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'

2012-04-17 04:03:50 +02:00

ffmpeg.txt

Fix "ouput" typo and add a check.

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

ffplay.texi

…

ffprobe.texi

ffprobe: add count_frames and count_packets options

2012-02-17 01:06:43 +01:00

ffprobe.xsd

ffprobe: report bit rate in stream description

2012-02-20 17:46:26 +01:00

ffserver.conf

Merge remote-tracking branch 'qatar/master'

2012-02-10 01:20:07 +01:00

ffserver.texi

…

filters.texi

lavfi/setfield: add "progressive" option

2012-04-21 10:09:49 +02:00

general.texi

Merge remote-tracking branch 'qatar/master'

2012-04-24 02:30:41 +02:00

git-howto.texi

Merge remote-tracking branch 'qatar/master'

2012-04-13 21:50:37 +02:00

git-howto.txt

…

indevs.texi

v4l2: allow to convert monotonic timestamps.

2012-04-04 15:22:44 +02:00

issue_tracker.txt

…

libavfilter.texi

…

Makefile

Merge remote-tracking branch 'qatar/master'

2012-03-29 04:11:10 +02:00

metadata.texi

…

multithreading.txt

…

muxers.texi

doc/muxers: add documentation for the md5 and framemd5 muxers

2012-04-07 13:57:40 +02:00

optimization.txt

…

outdevs.texi

…

platform.texi

Merge remote-tracking branch 'qatar/master'

2012-04-24 02:30:41 +02:00

print_options.c

print_options: warn that the files are generated.

2012-04-23 18:14:25 +02:00

protocols.texi

Merge remote-tracking branch 'qatar/master'

2012-03-21 01:33:53 +01:00

rate_distortion.txt

…

RELEASE_NOTES

…

snow.txt

…

soc.txt

…

swresample.txt

cosmetics: fix some typos

2012-03-13 01:14:04 +01:00

swscale.txt

cosmetics: Delete empty lines at end of file.

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

t2h.init

…

tablegen.txt

…

texi2pod.pl

doc: texi2pod: add -I flag

2012-03-20 11:10:25 +00:00

viterbi.txt

cosmetics: Delete empty lines at end of file.

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