[FFmpeg-cvslog] Merge commit 'ee59f0540875ab42496af2aacddd942757707683'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <cboesch at gopro.com> | Thu Mar 30 10:03:59 2017 +0200| [b76dd6a6783285ef6549a75b77198388fff0c1e6] | committer: Clément Bœsch

Merge commit 'ee59f0540875ab42496af2aacddd942757707683'

* commit 'ee59f0540875ab42496af2aacddd942757707683':
  intrax8: Have function signature match across declaration and definition

Merged-by: Clément Bœsch <cboesch at gopro.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b76dd6a6783285ef6549a75b77198388fff0c1e6
---

 libavcodec/intrax8.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c
index bbb97f0..d46f97c 100644
--- 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)


======================================================================