diff options
author | Clément Bœsch <cboesch@gopro.com> | 2017-03-30 10:03:59 +0200 |
---|---|---|
committer | Clément Bœsch <cboesch@gopro.com> | 2017-03-30 10:03:59 +0200 |
commit | b76dd6a6783285ef6549a75b77198388fff0c1e6 (patch) | |
tree | 2acf378d49eef529a5eab2ecfeb71bdf88fdf0e6 /libavcodec | |
parent | a48c0c41c4dee06d5d99afd02ebf683135b95f78 (diff) | |
parent | ee59f0540875ab42496af2aacddd942757707683 (diff) | |
download | ffmpeg-streaming-b76dd6a6783285ef6549a75b77198388fff0c1e6.zip ffmpeg-streaming-b76dd6a6783285ef6549a75b77198388fff0c1e6.tar.gz |
Merge commit 'ee59f0540875ab42496af2aacddd942757707683'
* commit 'ee59f0540875ab42496af2aacddd942757707683':
intrax8: Have function signature match across declaration and definition
Merged-by: Clément Bœsch <cboesch@gopro.com>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/intrax8.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |