Merge commit 'e0ab5078a7d865f8f6fd6a6d3cbe0f380ead4a3d'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 20:26:13 +0000 (21:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 20:26:13 +0000 (21:26 +0100)
commit8a77baae6e793e0e02077cee6b75dd0c35372a40
tree538cd37136623c1aa4b3255fddfcb609bf93f66a
parenta298f934ec9b59f727a97186b928d9d8362a47c7
parente0ab5078a7d865f8f6fd6a6d3cbe0f380ead4a3d
Merge commit 'e0ab5078a7d865f8f6fd6a6d3cbe0f380ead4a3d'

* 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>
libavcodec/utils.c