Merge commit '3bea6409a1868354a1d29b34de424c3636c222b7'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 16:21:40 +0000 (17:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 16:21:44 +0000 (17:21 +0100)
* commit '3bea6409a1868354a1d29b34de424c3636c222b7':
  h264_mvpred: constify all uses of H264Context

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

  #include "avcodec.h"
  #include "h264.h"
  #include "mpegutils.h"
 +#include "libavutil/avassert.h"
  
 -#include <assert.h>
  
- static av_always_inline int fetch_diagonal_mv(H264Context *h, H264SliceContext *sl,
+ static av_always_inline int fetch_diagonal_mv(const H264Context *h, H264SliceContext *sl,
                                                const int16_t **C,
                                                int i, int list, int part_width)
  {