* commit '106b62f4':
  matroskaenc: write the channel mask for FLAC

Conflicts:
	libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'efcde917':
  vorbiscomment: simplify API by using av_dict_count()

Conflicts:
	libavformat/flacenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '23f741f7':
  matroskadec: parse the channel layout mask for FLAC

Conflicts:
	libavformat/oggparsevorbis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4efdadc8':
  matroskadec: export just the STREAMINFO block as FLAC extradata

Conflicts:
	libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6df478bf':
  matroskadec: split parsing tracks into a separate function

Conflicts:
	libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5fdaf312':
  flac: make avpriv_flac_parse_block_header() inline
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '54ed488b':
  flac muxer: write WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag for multichannel files

Conflicts:
	libavformat/flacenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd6b9ce99':
  flac demuxer: parse the WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f13ffb66':
  flacdec: do not overwrite a channel layout set by the caller
Merged-by: Michael Niedermayer <michaelni@gmx.at>

It is commonly stored in a vorbiscomment block in codec private data.

It contains all information that is used by the decoder and the other
FLAC-capable demuxers (flacdec, ogg) export only STREAMINFO as well.

This avoids all the ABI troubles associated with avpriv_.
Since this function is very small and does not depend on any tables,
making it inline should have no adverse effects.

It is used to store the channel mask for non-standard layouts.

The channel layout mask for non-standard layouts is typically stored at
the container level (as a vorbiscomment tag) for FLAC.

FFmpeg mix devices and file formats when -formats option is used.
This commit adds a -devices param to list devices only.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

This corrects the bug that caused the checksums to change in
9767d7c0Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9767d7c0':
  oggenc: Flush after writing headers

Conflicts:
	tests/ref/lavf/ogg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1d3eb0b5':
  oggenc: Move ogg_write_pages up above ogg_write_header
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '512f3ffe':
  dsputil: Split off HuffYUV encoding bits into their own context

Conflicts:
	configure
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/huffyuv.h
	libavcodec/huffyuvenc.c
	libavcodec/pngenc.c
	libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0d439fbe':
  dsputil: Split off HuffYUV decoding bits into their own context

Conflicts:
	configure
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/huffyuv.h
	libavcodec/huffyuvdec.c
	libavcodec/lagarith.c
	libavcodec/vble.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil.asm
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '888dcd86':
  h264_picture: Remove pointless dsputil.h #include
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f1df0a4c':
  on2avc: Remove pointless dsputil.h #include
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

Signed-off-by: Lou Logan <lou@lrcd.com>

Before, header information for ogg format files was sent with the
first encoded packet.

This patch makes it so that it is possible for API users to
differentiate between headers and encoded audio. This is useful, for
example, when creating an audio stream where you want to send one set
of headers for every client that connects and then the encoded stream
of audio.
Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Martin Storsjö <martin@martin.st>

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

Also shorten HuffYUV context member names to avoid clutter.

Also shorten HuffYUV context member names to avoid clutter.

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

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

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