RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '419e3404d07acaac019e8f363c281e17c3a3d622' 

* commit '419e3404d07acaac019e8f363c281e17c3a3d622':
  mpegvideo: Drop exchange_uv() function and use its code directly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-05-28 21:28:04 +02:00
parent f0b99112e3 419e3404d0
commit 9b736f74fc
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavcodec/mpegvideo.c
View File

@ -811,15 +811,6 @@ fail:
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)
{
int y_size = s->b8_stride * (2 * s->mb_height + 1);
@ -853,8 +844,13 @@ static int init_duplicate_context(MpegEncContext *s)
for (i = 0; i < 12; i++) {
s->pblocks[i] = &s->block[i];
}
if (s->avctx->codec_tag == AV_RL32("VCR2"))
exchange_uv(s);
if (s->avctx->codec_tag == AV_RL32("VCR2")) {
// 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) {
/* ac values */
@ -929,8 +925,13 @@ int ff_update_duplicate_context(MpegEncContext *dst, MpegEncContext *src)
for (i = 0; i < 12; i++) {
dst->pblocks[i] = &dst->block[i];
}
if (dst->avctx->codec_tag == AV_RL32("VCR2"))
exchange_uv(dst);
if (dst->avctx->codec_tag == AV_RL32("VCR2")) {
// 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 &&
(ret = frame_size_alloc(dst, dst->linesize)) < 0) {
av_log(dst->avctx, AV_LOG_ERROR, "failed to allocate context "