RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-07 13:08:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'e0ab5078a7d865f8f6fd6a6d3cbe0f380ead4a3d'

Browse Source 
* commit 'e0ab5078a7d865f8f6fd6a6d3cbe0f380ead4a3d':
  lavc: do not force the emu edge flag

Conflicts:
	libavcodec/utils.c

There should be no such bugs in ffmpeg, but merging it anyway
as its safer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-21 21:26:13 +01:00
commit 8a77baae6e
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/utils.c
View File

@ -1493,11 +1493,6 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
} }
} }
} }
#if FF_API_EMU_EDGE
/* force the emu edge flag on, since it's now always active */
avctx->flags |= CODEC_FLAG_EMU_EDGE;
#endif
} }
end: end:
ff_unlock_avcodec(); ff_unlock_avcodec();