ppc: dsputil: Coalesce all init files
x86: dsputil: Avoid pointless CONFIG_ENCODERS indirection

The remaining dsputil bits are encoding-specific anyway.
AVFormat: LRC demuxer and muxer

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
MAINTAINERS: Add ubitux for text subtitles

ubitux maintains them. It seems it was forgotten to update MAINTAINERs though

See: Re: [FFmpeg-devel] [PATCH] MAINTAINERS: add Subtitle maintainer
     Message-ID: <20140713120546.GC26262@leki>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavf: add samba protocol via libsmbclient

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'a8552ee3eb335d2fd2d6c99363367a6090298f78'

* commit 'a8552ee3eb335d2fd2d6c99363367a6090298f78':
  ppc: dsputil: Coalesce all init files

Conflicts:
	libavcodec/ppc/dsputil_altivec.h
	libavcodec/ppc/dsputil_ppc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'acf91215c74a91eb3b86af01dcb1d3c78d0e2310'

* commit 'acf91215c74a91eb3b86af01dcb1d3c78d0e2310':
  x86: dsputil: Avoid pointless CONFIG_ENCODERS indirection

Conflicts:
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avformat/asfdec: Try to improve skip case

Fixes Ticket3761

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
doc/filters: fixing typo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Add a release note for 2.3

Based on a patch by Clément Bœsch <u@pkh.me>.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/wavdec: add basic sanity check for the sample count

Fixes Ticket3708

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
RELEASE_NOTES: fill in lib versions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/movenc: dont mark multichannel as mono tracks as containing the center channel

Fixes Ticket3727

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
fate: Use the correct, local path to samples for opus reference files

This fixes running fate in configs where the samples are located
in a different path on the target.

Signed-off-by: Martin Storsjö <martin@martin.st>
avformat: add av_stream_get_parser() to access avformat AVParser

The AVStream.parser field is considered private and its location cannot be
preserved while preserving also ABI compatibility to libav, as libav added fields
before it.
Some tools like ffmpeg.c access this field though

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg: Use av_stream_get_parser() to avoid ABI issues

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'f9900822fc5f0b0c7242ca318290c090bd5d0af0'

* commit 'f9900822fc5f0b0c7242ca318290c090bd5d0af0':
  fate: Use the correct, local path to samples for opus reference files

Conflicts:
	tests/fate/opus.mak

See: ad7de82218e9ee2232e53ab49cda85767cf800e5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
hevc: cleaning up, remove unused constants(cherry picked from commit 7eed32d076c57aa03011d65a64903e8bdb633978)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
hevc/cabac: add new context for new syntax elements related to Rext(cherry picked from commit 6d71e2394f52679cfc8b86fb5880f89e6bd311d4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Adding Maintainer for dvbsubdec

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