Merge commit '56eded8bc7bccdf14245bae3a45b0fecf9d9d122' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Dec 2013 01:28:44 +0000 (02:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Dec 2013 01:31:41 +0000 (02:31 +0100)
* commit '56eded8bc7bccdf14245bae3a45b0fecf9d9d122':
  mpeg4videodec: split initializing static tables into a separate function
  x86: ac3dsp: Remove 3dnow version of ff_ac3_extract_exponents
  pthread: Avoid spurious wakeups

Conflicts:
libavcodec/mpeg4videodec.c
tests/fate/ac3.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mpeg4videodec.c
libavcodec/pthread.c
libavcodec/x86/ac3dsp.asm
libavcodec/x86/ac3dsp_init.c
tests/fate/ac3.mak

      return decode_vop_header(s, gb);
  }
  
- av_cold void ff_mpeg4videodec_static_init(void) {
++av_cold void ff_mpeg4videodec_static_init(void)
++{
 +    static int done = 0;
 +
 +    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;
 +    }
 +}
 +
  static av_cold int decode_init(AVCodecContext *avctx)
  {
      MpegEncContext *s = avctx->priv_data;
Simple merge
Simple merge
Simple merge
Simple merge