diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 17:23:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 17:23:10 +0100 |
| commit | a0b39747b7213b5b76c0ce5984c1dac63933737f (patch) | |
| tree | a7e0c573b4882bb07baa8c4160022f9e35e1f52b /libavcodec/h264_mb_template.c | |
| parent | 06e5b331f5bc32c7a09db4de90841225dfcd8930 (diff) | |
| parent | 6490a0c0fbe0e55f765ea2aa2e8495181ea1f719 (diff) | |
Merge commit '6490a0c0fbe0e55f765ea2aa2e8495181ea1f719'
* commit '6490a0c0fbe0e55f765ea2aa2e8495181ea1f719':
h264_mb: constify all uses of H264Context
Conflicts:
libavcodec/h264.h
libavcodec/h264_mb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mb_template.c')
| -rw-r--r-- | libavcodec/h264_mb_template.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_mb_template.c b/libavcodec/h264_mb_template.c index 67c332ed17..52d60be93b 100644 --- a/libavcodec/h264_mb_template.c +++ b/libavcodec/h264_mb_template.c @@ -40,7 +40,7 @@ #define CHROMA_IDC 2 #include "h264_mc_template.c" -static av_noinline void FUNC(hl_decode_mb)(H264Context *h, H264SliceContext *sl) +static av_noinline void FUNC(hl_decode_mb)(const H264Context *h, H264SliceContext *sl) { const int mb_x = sl->mb_x; const int mb_y = sl->mb_y; @@ -269,7 +269,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h, H264SliceContext *sl) #define CHROMA_IDC 3 #include "h264_mc_template.c" -static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h, H264SliceContext *sl) +static av_noinline void FUNC(hl_decode_mb_444)(const H264Context *h, H264SliceContext *sl) { const int mb_x = sl->mb_x; const int mb_y = sl->mb_y; |