Michael Niedermayer 18884f159b 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>
2012-10-13 15:42:49 +02:00
..
2012-08-22 16:41:57 -04:00
2012-05-09 14:13:34 +01:00
2012-07-10 00:04:24 +00:00
2012-05-09 14:13:34 +01:00
2012-05-09 14:13:34 +01:00
2012-09-29 16:09:05 +02:00
2012-07-23 22:12:12 +02:00
2012-09-10 00:07:24 +01:00
2012-09-29 16:09:05 +02:00
2012-09-29 16:09:05 +02:00
2012-09-23 15:24:08 +02:00
2012-09-29 16:09:05 +02:00
2012-06-18 11:47:08 +01:00