Merge remote-tracking branch 'qatar/release/9' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Dec 2013 01:43:44 +0000 (02:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Dec 2013 01:43:44 +0000 (02:43 +0100)
commit50ff83e3afa75535bea839873f3e4c2356a979f6
tree31478978aec0d464a3938f528b62d6f79bf98bcc
parent2d7f139155dd734860d0731d095db1db9e9550fd
parentbdb975ab699a4374e928bc12f1653d079667d84a
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>
libavcodec/alsdec.c
libavcodec/arm/int_neon.S
libavcodec/h264.c
libavcodec/mpeg4video.h
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c