Michael Niedermayer 50ff83e3af Merge remote-tracking branch 'qatar/release/9' into release/1.1
* qatar/release/9:
  arm: Don't clobber callee saved registers in scalarproduct
  alsdec: check block length
  h264/mpegvideo: do not provide pixel formats for hwaccels that are not compiled in
  mpeg4video_parser: init mpeg4 static tables.

Conflicts:
	libavcodec/mpeg4video_parser.c
	libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-21 02:43:44 +01:00
..
2012-05-05 22:04:21 +01:00
2012-04-22 22:26:55 +02:00
2012-12-20 13:40:45 +01:00
2011-12-02 19:59:18 +00:00
2012-12-22 00:58:08 +01:00
2012-12-22 00:58:08 +01:00
2012-04-25 21:41:39 +01:00