virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

mpegvideo: Drop exchange_uv() function and use its code directly

Browse Source 
Code is small enough that there is no advantage in a separate function.
This commit is contained in:
Vittorio Giovara
2015-05-22 19:50:10 +01:00
parent d4d90504a6
commit 419e3404d0
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libavcodec/mpegvideo.c
View File

@@ -765,15 +765,6 @@ fail:
return ret; return ret;
} }
static void exchange_uv(MpegEncContext *s)
{
int16_t (*tmp)[64];
tmp = s->pblocks[4];
s->pblocks[4] = s->pblocks[5];
s->pblocks[5] = tmp;
}
static int init_duplicate_context(MpegEncContext *s) static int init_duplicate_context(MpegEncContext *s)
{ {
int y_size = s->b8_stride * (2 * s->mb_height + 1); int y_size = s->b8_stride * (2 * s->mb_height + 1);
@@ -804,8 +795,13 @@ static int init_duplicate_context(MpegEncContext *s)
for (i = 0; i < 12; i++) { for (i = 0; i < 12; i++) {
s->pblocks[i] = &s->block[i]; s->pblocks[i] = &s->block[i];
} }
if (s->avctx->codec_tag == AV_RL32("VCR2")) if (s->avctx->codec_tag == AV_RL32("VCR2")) {
exchange_uv(s); // exchange uv
int16_t (*tmp)[64];
tmp = s->pblocks[4];
s->pblocks[4] = s->pblocks[5];
s->pblocks[5] = tmp;
}
if (s->out_format == FMT_H263) { if (s->out_format == FMT_H263) {
/* ac values */ /* ac values */
@@ -880,8 +876,13 @@ int ff_update_duplicate_context(MpegEncContext *dst, MpegEncContext *src)
for (i = 0; i < 12; i++) { for (i = 0; i < 12; i++) {
dst->pblocks[i] = &dst->block[i]; dst->pblocks[i] = &dst->block[i];
} }
if (dst->avctx->codec_tag == AV_RL32("VCR2")) if (dst->avctx->codec_tag == AV_RL32("VCR2")) {
exchange_uv(dst); // exchange uv
int16_t (*tmp)[64];
tmp = dst->pblocks[4];
dst->pblocks[4] = dst->pblocks[5];
dst->pblocks[5] = tmp;
}
if (!dst->edge_emu_buffer && if (!dst->edge_emu_buffer &&
(ret = frame_size_alloc(dst, dst->linesize)) < 0) { (ret = frame_size_alloc(dst, dst->linesize)) < 0) {
av_log(dst->avctx, AV_LOG_ERROR, "failed to allocate context " av_log(dst->avctx, AV_LOG_ERROR, "failed to allocate context "