iff: K&R formatting cosmetics
iff: Do not read over the source buffer

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
wmavoice: return meaningful error codes
wmavoice: use init_static_data
wmavoice: conceal clearly corrupted blocks

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Merge commit '3865ba7b21aef5d60183719e238361ec8797ab5a'

* commit '3865ba7b21aef5d60183719e238361ec8797ab5a':
  iff: K&R formatting cosmetics

Conflicts:
	libavcodec/iff.c

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

* commit '7d65e960c72f36b73ae7fe84f8e427d758e61da9':
  iff: Do not read over the source buffer

Conflicts:
	libavcodec/iff.c

See: 2fbb37b51bbea891392ad357baf8f3dff00bac05

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

* commit '04e9853a210e07b1a150aa2b8e9af0aa3601ff21':
  wmavoice: return meaningful error codes

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

* commit 'f5c48f5adaead5259660d4eaab2e695d1bac3a08':
  wmavoice: use init_static_data

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wmavoice: conceal clearly corrupted blocks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
mjpegdec: parse app-colr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
mjpegdec: parse app-xfrm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/jpeglsdec: support xfrm 1-3

Fixes 75% of Ticket893

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
mjpegdec: print length too in APPx debug code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavd/fbdev.c: Support RGB565 input colour space.

Tested on a Raspberry Pi.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Supply a User-Agent header when opening rtsp streams.

Some rtsp servers like the IP Cam IcyBox IB-CAM2002 need it.
Fixes ticket #2761.
Reported, analyzed and tested by trac user imavra.
libavformat/mov.c: Skipped duplicated MOOV atom

 This should fix ticket 1378
 If we have parsed a moov atom, and found another one, just skip it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
rmdec: fix crash in case of oom

Fixes ticket #2724

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