Merge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Oct 2012 13:42:49 +0000 (15:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Oct 2012 13:42:49 +0000 (15:42 +0200)
commit18884f159b617208dd69fb35fa127f4fdedf5ba1
tree2eae5d696ef3b8f8f03cb9c58ee88632ff9cc856
parentc55bebe2cc7bd444f83a678babc1b287aa7a3da1
parent0a7005bebd23ade7bb852bce0401af1a8fdbb723
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>
18 files changed:
libavcodec/aac_adtstoasc_bsf.c
libavcodec/aacdec.c
libavcodec/ac3dec.c
libavcodec/alsdec.c
libavcodec/amrnbdec.c
libavcodec/amrwbdec.c
libavcodec/eac3dec.c
libavcodec/flacdec.c
libavcodec/mpc8.c
libavcodec/mpegvideo.c
libavcodec/rangecoder.c
libavcodec/tta.c
libavcodec/wmaprodec.c
libavcodec/wmavoice.c
libavformat/rtpdec_qt.c
libavformat/rtpdec_xiph.c
libavformat/smjpegdec.c
tests/fate/libavutil.mak