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>
Support raw dvdsub palette as stored on normal dvd's

This is how the palette is stored on dvd's. Currently
only xbmc passes the palette information to libavcodec
this way.
Check return value of avio_seek and avoid modifying state if it fails

The code still modifies state if the timestamp is not found. Not
sure exactly how to avoid that.
asf hacks
if av_read_packet returns AVERROR_IO, we are done. ffmpeg's codecs might or might not handle returning any completed demuxed packets correctly
added: Ticket #7187, TV Teletext support for DVB EBU Teletext streams
Don't accept mpegts PMT that isn't current
Don't reparse PMT unless it's version has changed