Michael Niedermayer 6bfb3042b3 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  avconv: use default alignment for audio buffer
  avcodec: use align == 0 for default alignment in avcodec_fill_audio_frame()
  avutil: use align == 0 for default alignment in audio sample buffer functions
  avutil: allow NULL linesize in av_samples_fill_arrays() and av_samples_alloc()
  avconv: remove OutputStream.picref.
  avconv: only set SAR once on the decoded frame.
  avcodec: validate the channel layout vs. channel count for decoders
  audioconvert: make av_get_channel_layout accept composite names.
  avutil: add av_get_packed_sample_fmt() and av_get_planar_sample_fmt()

Conflicts:
	doc/APIchanges
	ffmpeg.c
	libavcodec/utils.c
	libavcodec/version.h
	libavutil/audioconvert.c
	libavutil/audioconvert.h
	libavutil/avutil.h
	libavutil/samplefmt.c
	libavutil/samplefmt.h

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

2012-04-09 23:02:33 +02:00

..

doxy

doxygen: cleanup style to support older doxy

2011-12-29 17:19:46 +01:00

examples

Merge remote-tracking branch 'qatar/master'

2012-03-30 22:10:17 +02:00

APIchanges

Merge remote-tracking branch 'qatar/master'

2012-04-09 23:02:33 +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

…

encoders.texi

doc: use @command{} for commands.

2012-01-04 13:21:08 +01:00

errno.txt

…

eval.texi

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

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

faq.texi

faq: fix typo.

2012-01-24 16:03:09 +01:00

fate.texi

Merge remote-tracking branch 'qatar/master'

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

ffmpeg-mt-authorship.txt

…

ffmpeg.texi

doc: image2: update docs for glob input patterns

2012-04-06 15:18:31 +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

doc/filters: remove reference to removed delogo wrapper

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

general.texi

lavc: add a OpenEXR decoder

2012-04-06 08:32:09 +02:00

git-howto.texi

…

git-howto.txt

…

indevs.texi

v4l2: allow to convert monotonic timestamps.

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

issue_tracker.txt

…

libavfilter.texi

doc: use @command{} for commands.

2012-01-04 13:21:08 +01:00

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

doc: use @command{} for commands.

2012-01-04 13:21:08 +01:00

platform.texi

Fix a bunch of platform name and other typos.

2012-01-11 13:48:30 +01:00

print_options.c

Generate manpages for AV{Format,Codec}Context AVOptions.

2012-03-20 07:10:06 +01:00

protocols.texi

Merge remote-tracking branch 'qatar/master'

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

rate_distortion.txt

…

RELEASE_NOTES

RELEASE_NOTES: update for 0.10

2012-01-26 21:59:09 +01:00

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