diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 15:38:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 16:21:52 +0200 |
| commit | f54e01c24e03a7dc340bd9449debfe7fb58987da (patch) | |
| tree | 2deebee8ec6d0cf34cbe02bce336229323df4b42 /libavformat/oggparseopus.c | |
| parent | ad99837b638f1271da37dbe75d409b1350ad556e (diff) | |
| parent | a786c8259dafeca9744252230b5d78f67810770c (diff) | |
| download | ffmpeg-f54e01c24e03a7dc340bd9449debfe7fb58987da.tar.gz | |
Merge commit 'a786c8259dafeca9744252230b5d78f67810770c'
* commit 'a786c8259dafeca9744252230b5d78f67810770c':
idct: Split off Xvid IDCT
Conflicts:
libavcodec/Makefile
libavcodec/mpeg4videodec.c
libavcodec/x86/Makefile
libavcodec/x86/idctdsp_init.c
This split is somewhat restructured leaving the xvid IDCT available
outside mpeg4 if manually selected.
The code also could not be merged unchanged as it conflicted with a
bugfix in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggparseopus.c')
0 files changed, 0 insertions, 0 deletions