Michael Niedermayer 3630a07513 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  libmp3lame: add missing layout terminator
  avconv: multithreaded demuxing.
  Bump lavu minor and add an APIChanges entry for audioconvert functions.
  audioconvert: add a function for extracting the channel with the given index
  audioconvert: add a function for getting the name of a single channel.
  audioconvert: add a function for getting channel's index in layout
  audioconvert: use av_popcount64 in av_get_channel_layout_nb_channels
  vf_libopencv: add missing headers.
  iac: add missing dependency

Conflicts:
	configure
	doc/APIchanges
	ffmpeg.c
	libavcodec/libmp3lame.c
	libavutil/avutil.h

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

2012-06-10 21:34:15 +02:00

..

doxy

…

examples

update filtering_audio example

2012-06-05 03:02:41 +02:00

APIchanges

Merge remote-tracking branch 'qatar/master'

2012-06-10 21:34:15 +02:00

avtools-common-opts.texi

cmdutils: allow to specify a stream by its ID.

2012-05-20 12:47:27 +02:00

avutil.txt

…

bitstream_filters.texi

…

build_system.txt

…

decoders.texi

…

demuxers.texi

…

developer.texi

build: Add 'check' target to run all compile and test targets.

2012-05-15 19:10:46 +02:00

encoders.texi

…

errno.txt

…

eval.texi

…

faq.texi

…

fate.texi

Merge remote-tracking branch 'qatar/master'

2012-05-26 22:37:37 +02:00

ffmpeg.texi

Merge remote-tracking branch 'qatar/master'

2012-06-04 22:59:32 +02:00

ffmpeg.txt

…

ffplay.texi

doc: add syntax.texi file

2012-05-22 00:39:53 +02:00

ffprobe.texi

ffprobe: add flat output format.

2012-06-01 21:06:06 +02:00

ffprobe.xsd

ffprobe: show packet duration in frame

2012-06-06 23:26:04 +02:00

ffserver.conf

…

ffserver.texi

…

filter_design.txt

lavfi: drop planar/packed negotiation support

2012-05-16 13:16:05 +02:00

filters.texi

buffersrc: accept the frame rate as argument.

2012-06-09 08:42:50 +02:00

general.texi

Merge remote-tracking branch 'qatar/master'

2012-06-06 01:08:33 +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

doc: add syntax.texi file

2012-05-22 00:39:53 +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

sdl: fix aspect ratio computations.

2012-06-10 09:57:50 +02:00

platform.texi

Merge remote-tracking branch 'qatar/master'

2012-05-19 00:52:25 +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-05-26 22:37:37 +02:00

rate_distortion.txt

…

RELEASE_NOTES

release_notes: update

2012-05-25 17:27:40 +02:00

snow.txt

…

soc.txt

…

swresample.txt

…

swscale.txt

…

syntax.texi

doc/syntax: escape '@' to fix a warning.

2012-05-29 07:40:58 +02:00

t2h.init

…

tablegen.txt

…

texi2pod.pl

…

viterbi.txt

…