Fixes CID703620
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

Fixes CID717910
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes division by 0
Fixes CID733736
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

these cases arent used but theres no point in failing on them
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes CID700580
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes CID733834
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

Fixes CID733704
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes CID733835
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes CID733726
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

This fixes the recently appearing PIX_FMT warnings
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Optional sdp speex payload parameter is outputed only when
data is encoded. It's not printed in case of stream copy.
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

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

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

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

* 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: NMichael Niedermayer <michaelni@gmx.at>

Based on commit by Justin Ruggles (the changed code is too different to apply as is)
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'f5962229':
  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: NMichael Niedermayer <michaelni@gmx.at>

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

* commit '0a7005be':
  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: NMichael Niedermayer <michaelni@gmx.at>

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

Conflicts:
	libavcodec/rangecoder.c
	libavcodec/rangecoder.h
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'ca411fc1':
  avcodec: Remove broken MMI optimizations

Conflicts:
	arch.mak
	configure
	libavcodec/avcodec.h
	libavcodec/mips/Makefile
	libavcodec/mips/dsputil_mmi.c
	libavcodec/mips/idct_mmi.c
	libavcodec/mips/mmi.h
	libavcodec/mips/mpegvideo_mmi.c
	libavcodec/options_table.h
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'bc4620e5':
  Remove libmpeg2 #define remnants
  De-doxygenize some top-level files

Conflicts:
	ffmpeg.c
	ffmpeg.h
	ffmpeg_filter.c
	ffplay.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'd5c62122':
  Move av_reverse table to libavcodec

Conflicts:
	libavcodec/asvenc.c
	libavcodec/vble.c
	libavutil/common.h
	libavutil/mathematics.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '930c9d43':
  avutil: Duplicate ff_log2_tab instead of sharing it across libs
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'f6c38c5f':
  avfilter: call x86 init functions under if (ARCH_X86), not if (HAVE_MMX)
  rtspdec: Set the default port for listen mode, if none is specified
  tscc2: Fix an out of array access
  rtmpproto: Fix an out of array write
  rtspdec: Fix use of uninitialized byte
  vp8: reset loopfilter delta values at keyframes.
  avutil: add yuva422p and yuva444p formats

Conflicts:
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

while testing a VP8 encoder I found a mismatch between FFMPEG and libvpx
VP8 decoders. The reason for this mismatch is that FFMPEG doesn't reset
loopfilter delta values at keyframes. Patch that fixes the issue is below.
I've verified that the output of ffmpeg after this patch matches libvpx.
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes ticket #1807.

It changed because encoder now writes 0/1 for
sample aspect ratio instead of 0/0.
Signed-off-by: NPaul B Mahol <onemda@gmail.com>

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

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

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

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

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: NKostya Shishkov <kostya.shishkov@gmail.com>

Resample to the rate that was configured in SDL.

The output AVFrame buffer only has data for the downmix channels.
Fixes a segfault when decoding dca with request_channels == 2.