Merge commit 'd27b8248a6ee7e64c68c46c23e00d703b9caa50c'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 16:13:52 +0000 (17:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 16:13:56 +0000 (17:13 +0100)
* commit 'd27b8248a6ee7e64c68c46c23e00d703b9caa50c':
  h264_direct: constify all uses of H264Context

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

@@@ -884,11 -823,11 +884,11 @@@ 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, 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,
+ void ff_h264_direct_dist_scale_factor(const H264Context *const h, H264SliceContext *sl);
+ void ff_h264_direct_ref_list_init(const H264Context *const h, H264SliceContext *sl);
+ void ff_h264_pred_direct_motion(const H264Context *const h, H264SliceContext *sl,
                                  int *mb_type);
  
  void ff_h264_filter_mb_fast(H264Context *h, H264SliceContext *sl, int mb_x, int mb_y,
Simple merge