diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 21:26:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 21:26:13 +0100 |
| commit | 8a77baae6e793e0e02077cee6b75dd0c35372a40 (patch) | |
| tree | 538cd37136623c1aa4b3255fddfcb609bf93f66a /libavcodec/takdec.c | |
| parent | a298f934ec9b59f727a97186b928d9d8362a47c7 (diff) | |
| parent | e0ab5078a7d865f8f6fd6a6d3cbe0f380ead4a3d (diff) | |
| download | ffmpeg-8a77baae6e793e0e02077cee6b75dd0c35372a40.tar.gz | |
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>
Diffstat (limited to 'libavcodec/takdec.c')
0 files changed, 0 insertions, 0 deletions