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)
* 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>
1  2 
libavcodec/alsdec.c
libavcodec/arm/int_neon.S
libavcodec/h264.c
libavcodec/mpeg4video.h
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -48,6 -45,33 +48,33 @@@ static const int mb_type_b_map[4]= 
      MB_TYPE_L0 | MB_TYPE_16x16,
  };
  
 -void ff_mpeg4_init_tables(void)
++av_cold void ff_mpeg4videodec_static_init(void)
+ {
+     static int done = 0;
 -    if (!done) {
 -        done = 1;
++    if (!done) {
+         ff_init_rl(&ff_mpeg4_rl_intra, ff_mpeg4_static_rl_table_store[0]);
+         ff_init_rl(&ff_rvlc_rl_inter, ff_mpeg4_static_rl_table_store[1]);
+         ff_init_rl(&ff_rvlc_rl_intra, ff_mpeg4_static_rl_table_store[2]);
+         INIT_VLC_RL(ff_mpeg4_rl_intra, 554);
+         INIT_VLC_RL(ff_rvlc_rl_inter, 1072);
+         INIT_VLC_RL(ff_rvlc_rl_intra, 1072);
+         INIT_VLC_STATIC(&dc_lum, DC_VLC_BITS, 10 /* 13 */,
+                  &ff_mpeg4_DCtab_lum[0][1], 2, 1,
+                  &ff_mpeg4_DCtab_lum[0][0], 2, 1, 512);
+         INIT_VLC_STATIC(&dc_chrom, DC_VLC_BITS, 10 /* 13 */,
+                  &ff_mpeg4_DCtab_chrom[0][1], 2, 1,
+                  &ff_mpeg4_DCtab_chrom[0][0], 2, 1, 512);
+         INIT_VLC_STATIC(&sprite_trajectory, SPRITE_TRAJ_VLC_BITS, 15,
+                  &ff_sprite_trajectory_tab[0][1], 4, 2,
+                  &ff_sprite_trajectory_tab[0][0], 4, 2, 128);
+         INIT_VLC_STATIC(&mb_type_b_vlc, MB_TYPE_B_VLC_BITS, 4,
+                  &ff_mb_type_b_tab[0][1], 2, 1,
+                  &ff_mb_type_b_tab[0][0], 2, 1, 16);
++        done = 1;
+     }
+ }
  /**
   * Predict the ac.
   * @param n block index (0-3 are luma, 4-5 are chroma)
Simple merge