1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
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
..
amv
2012-09-01 15:23:39 +02:00
2012-09-02 18:15:08 +02:00
2012-10-12 20:56:54 +02:00
bfi
caf
2012-08-25 16:46:50 -04:00
crc
dpx
2012-08-09 19:35:47 +02:00
2012-08-09 19:35:47 +02:00
2012-08-10 12:18:38 +01:00
2012-08-09 19:35:47 +02:00
2012-08-09 19:35:47 +02:00
2012-08-09 19:35:47 +02:00
2012-07-29 08:06:30 +02:00
jv
2012-10-08 09:06:25 +00:00
md5
2012-08-03 15:18:12 +00:00
ptx
2012-07-17 17:06:24 +00:00
rl2
sha
smc
2012-07-29 08:06:30 +02:00
2012-07-26 22:22:54 +02:00
2012-09-23 15:24:08 +02:00
thp
tmv
vp5
w64
yop