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
..
fate	Merge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723'	2012-10-13 15:42:49 +02:00
lavf	fate: update pcx reference	2012-10-13 09:07:12 +00:00
lavf-fate	mp3enc: add lame tag with start padding info	2012-07-14 17:20:22 +02:00
lavfi	avutil: add yuva422p and yuva444p formats	2012-10-12 15:09:51 +02:00
seek	movenc: force video timebase to be 0.1ms precisse at least.	2012-10-04 01:33:49 +02:00
vsynth1	Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'	2012-05-30 01:40:54 +02:00
vsynth2	Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'	2012-05-30 01:40:54 +02:00