[FFmpeg-cvslog] Merge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 13 15:42:49 2012 +0200| [18884f159b617208dd69fb35fa127f4fdedf5ba1] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=18884f159b617208dd69fb35fa127f4fdedf5ba1
---