Merge commit 'ee59f0540875ab42496af2aacddd942757707683'

* commit 'ee59f0540875ab42496af2aacddd942757707683': intrax8: Have function signature match across declaration and definition Merged-by: Clément Bœsch <cboesch@gopro.com>
8 years ago · b76dd6a678
parent a48c0c41c4 ee59f05408
commit b76dd6a678
1 changed files with 1 additions and 1 deletions
--- a/libavcodec/intrax8.c
+++ b/libavcodec/intrax8.c
@ -770,7 +770,7 @@ av_cold void ff_intrax8_common_end(IntraX8Context *w)
    av_freep(&w->prediction_table);
 }

-int ff_intrax8_decode_picture(IntraX8Context *const w, Picture *pict,
+int ff_intrax8_decode_picture(IntraX8Context *w, Picture *pict,
                              GetBitContext *gb, int *mb_x, int *mb_y,
                              int dquant, int quant_offset,
                              int loopfilter, int lowdelay)