diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 15:34:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 16:07:21 +0100 |
| commit | db23d5de27187dd8f2ec5c6dfd98a8a363b0fda5 (patch) | |
| tree | 01b9286e8a7d1e83c4b8d734d7767a3115838561 /libavcodec/dsputil.h | |
| parent | 2cf9ab655549cf2f25ba57ee84baa6d38530ec3b (diff) | |
| parent | e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0 (diff) | |
| download | ffmpeg-streaming-db23d5de27187dd8f2ec5c6dfd98a8a363b0fda5.zip ffmpeg-streaming-db23d5de27187dd8f2ec5c6dfd98a8a363b0fda5.tar.gz | |
Merge commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0'
* commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0':
wmv2: move IDCT to its own DSP context.
Conflicts:
libavcodec/dsputil.h
tests/ref/seek/vsynth2-wmv2
tests/ref/vsynth/vsynth1-wmv2
tests/ref/vsynth/vsynth2-wmv2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 9b0aab3..5bac9df 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -49,7 +49,6 @@ void ff_j_rev_dct (DCTELEM *data); void ff_j_rev_dct4 (DCTELEM *data); void ff_j_rev_dct2 (DCTELEM *data); void ff_j_rev_dct1 (DCTELEM *data); -void ff_wmv2_idct_c(DCTELEM *data); void ff_fdct_mmx(DCTELEM *block); void ff_fdct_mmxext(DCTELEM *block); |
