rangecoder-test: Set error message log level to error, instead of debug
fate: add avstring test
Use proper return values in case of missing features
rangecoder: K&R formatting cosmetics
mpegvideo: remove write-only variable

Signed-off-by: Mans Rullgard <mans@mansr.com>
smjpeg: fix type of 'ret' variable in smjpeg_read_packet()

The 'ret' variable is used for negative error codes so it should
be a signed type.

Signed-off-by: Mans Rullgard <mans@mansr.com>
rtpdec_xiph: fix function return type

parse_packed_headers() returns either zero or a negative error code
so its return type must be signed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
avstring-test: fix memory leaks

Signed-off-by: Mans Rullgard <mans@mansr.com>
configure: use utilities from /usr/xpg4/bin if it exists

Solaris defaults to non-standard utilities (grep, sed, ...) with
proper ones being in /usr/xpg4/bin.  Prefixing PATH with this
directory when it exists ensures we get correct variants.

Signed-off-by: Mans Rullgard <mans@mansr.com>
dca: allocate a secondary buffer for extra channels when downmixing

The output AVFrame buffer only has data for the downmix channels.
Fixes a segfault when decoding dca with request_channels == 2.
avplay: use audio parameters from the decoded frame instead of AVCodecContext
avplay: support mid-stream sample rate changes

Resample to the rate that was configured in SDL.
vc1: Use codec ID from AVCodecContext while parsing frame header

This fixes a segfault with samples that I have (both of them MPEG-TS). Looks like
avctx->codec is not being set during parsing.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Merge commit '90558e848a29ef1e85ecb1832ad9a26eebe958e0'

* commit '90558e848a29ef1e85ecb1832ad9a26eebe958e0':
  rangecoder: K&R formatting cosmetics

Conflicts:
	libavcodec/rangecoder.c
	libavcodec/rangecoder.h

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

* commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723':
  rtpdec_xiph: fix function return type
  smjpeg: fix type of 'ret' variable in smjpeg_read_packet()
  mpegvideo: remove write-only variable
  Use proper return values in case of missing features
  fate: add avstring test
  rangecoder-test: Set error message log level to error, instead of debug

Conflicts:
	libavcodec/aacdec.c
	libavcodec/amrnbdec.c
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
smjpegdec: use url_feof()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Merge commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609'

* commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609':
  avplay: use audio parameters from the decoded frame instead of AVCodecContext
  dca: allocate a secondary buffer for extra channels when downmixing
  configure: use utilities from /usr/xpg4/bin if it exists
  avstring-test: fix memory leaks

Conflicts:
	ffplay.c
	libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffplay: use audio parameters from the decoded frame instead of AVCodecContext

Based on commit by Justin Ruggles (the changed code is too different to apply as is)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vc1: Use codec ID from AVCodecContext while parsing frame header
  avplay: support mid-stream sample rate changes

Conflicts:
	ffplay.c
	libavcodec/vc1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pngdec: read sample aspect ratio

Signed-off-by: Paul B Mahol <onemda@gmail.com>