Merge commit 'ee0d774dfa94655e44707ff3e02f4a4d282c1963'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 13:39:45 +0000 (14:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 13:39:49 +0000 (14:39 +0100)
* commit 'ee0d774dfa94655e44707ff3e02f4a4d282c1963':
  h264: move dist_scale_factor[_field] into the per-slice context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h264.h
libavcodec/h264_direct.c
libavcodec/h264_slice.c

@@@ -880,9 -820,9 +881,9 @@@ int ff_h264_decode_mb_cabac(H264Contex
  
  void ff_h264_init_cabac_states(H264Context *h, H264SliceContext *sl);
  
 -void h264_init_dequant_tables(H264Context *h);
 +void ff_h264_init_dequant_tables(H264Context *h);
  
- void ff_h264_direct_dist_scale_factor(H264Context *const h);
+ void ff_h264_direct_dist_scale_factor(H264Context *const h, H264SliceContext *sl);
  void ff_h264_direct_ref_list_init(H264Context *const h, H264SliceContext *sl);
  void ff_h264_pred_direct_motion(H264Context *const h, H264SliceContext *sl,
                                  int *mb_type);
Simple merge
Simple merge