---
Rebased on top of mpeg12enc.c changes.
Vittorio
libavcodec/mpeg12enc.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c
index 5ce0492..4dc2461 100644
--- a/libavcodec/mpeg12enc.c
+++ b/libavcodec/mpeg12enc.c
@@ -574,15 +574,13 @@ static void mpeg1_encode_motion(MpegEncContext *s, int
val, int f_or_b_code)
}
}
-static av_always_inline void mpeg1_encode_mb_internal(MpegEncContext *s,
- int16_t block[6][64],
- int motion_x, int
motion_y,
- int mb_block_count)
+void ff_mpeg1_encode_mb(MpegEncContext *s, int16_t block[6][64], int motion_x,
int motion_y)
{
int i, cbp;
const int mb_x = s->mb_x;
const int mb_y = s->mb_y;
const int first_mb = mb_x == s->resync_mb_x && mb_y == s->resync_mb_y;
+ const int mb_block_count = s->chroma_format == CHROMA_420 ? 6 : 8;
/* compute cbp */
cbp = 0;
@@ -804,14 +802,6 @@ static av_always_inline void
mpeg1_encode_mb_internal(MpegEncContext *s,
}
}
-void ff_mpeg1_encode_mb(MpegEncContext *s, int16_t block[6][64], int motion_x,
int motion_y)
-{
- if (s->chroma_format == CHROMA_420)
- mpeg1_encode_mb_internal(s, block, motion_x, motion_y, 6);
- else
- mpeg1_encode_mb_internal(s, block, motion_x, motion_y, 8);
-}
-
av_cold void ff_mpeg1_encode_init(MpegEncContext *s)
{
static int done = 0;
--
1.7.9.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
