Helps in decoupling this code from mpegvideo.
---
libavcodec/intrax8.c | 3 ++-
libavcodec/intrax8.h | 3 ++-
libavcodec/vc1_block.c | 2 +-
libavcodec/wmv2dec.c | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c
index fab25bb..996fd7f 100644
--- a/libavcodec/intrax8.c
+++ b/libavcodec/intrax8.c
@@ -771,7 +771,8 @@ av_cold void ff_intrax8_common_end(IntraX8Context *w)
int ff_intrax8_decode_picture(IntraX8Context *const w, Picture *pict,
GetBitContext *gb, int *mb_x, int *mb_y,
- int dquant, int quant_offset, int loopfilter)
+ int dquant, int quant_offset,
+ int loopfilter, int lowdelay)
{
MpegEncContext *const s = w->s;
int mb_xy;
diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h
index c440695..1239109 100644
--- a/libavcodec/intrax8.h
+++ b/libavcodec/intrax8.h
@@ -109,6 +109,7 @@ void ff_intrax8_common_end(IntraX8Context *w);
*/
int ff_intrax8_decode_picture(IntraX8Context *w, Picture *pict,
GetBitContext *gb, int *mb_x, int *mb_y,
- int quant, int halfpq, int loopfilter);
+ int quant, int halfpq,
+ int loopfilter, int lowdelay);
#endif /* AVCODEC_INTRAX8_H */
diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c
index 1fac828..1ce0612 100644
--- a/libavcodec/vc1_block.c
+++ b/libavcodec/vc1_block.c
@@ -3025,7 +3025,7 @@ void ff_vc1_decode_blocks(VC1Context *v)
ff_intrax8_decode_picture(&v->x8, &v->s.current_picture,
&v->s.gb, &v->s.mb_x, &v->s.mb_y,
2 * v->pq + v->halfpq, v->pq *
!v->pquantizer,
- v->s.loop_filter);
+ v->s.loop_filter, v->s.low_delay);
ff_er_add_slice(&v->s.er, 0, 0,
(v->s.mb_x >> 1) - 1, (v->s.mb_y >> 1) - 1,
diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c
index 845acf6..7bf8388 100644
--- a/libavcodec/wmv2dec.c
+++ b/libavcodec/wmv2dec.c
@@ -231,7 +231,7 @@ int ff_wmv2_decode_secondary_picture_header(MpegEncContext
*s)
ff_intrax8_decode_picture(&w->x8, &s->current_picture,
&s->gb, &s->mb_x, &s->mb_y,
2 * s->qscale, (s->qscale - 1) | 1,
- s->loop_filter);
+ s->loop_filter, s->low_delay);
ff_er_add_slice(&w->s.er, 0, 0,
(w->s.mb_x >> 1) - 1, (w->s.mb_y >> 1) - 1,
--
2.7.3
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
