diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-05 15:49:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-05 15:54:39 +0100 |
| commit | 2b20397e1fbe52db800ef5deb810f7bc2602f248 (patch) | |
| tree | 8cf6fe3905369d5e34a05b8d63ac6632e09f2c9c | |
| parent | 81e357db625939afec36c7c92a3a0fcf5e21f2e0 (diff) | |
| download | ffmpeg-2b20397e1fbe52db800ef5deb810f7bc2602f248.tar.gz | |
libmpcodecs/vd_ffmpeg.h: remove, its unused and removed upstream
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/libmpcodecs/vd_ffmpeg.h | 24 | ||||
| -rw-r--r-- | libavfilter/vf_mp.c | 2 |
2 files changed, 1 insertions, 25 deletions
diff --git a/libavfilter/libmpcodecs/vd_ffmpeg.h b/libavfilter/libmpcodecs/vd_ffmpeg.h deleted file mode 100644 index 081d6ee545..0000000000 --- a/libavfilter/libmpcodecs/vd_ffmpeg.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef MPLAYER_VD_FFMPEG_H -#define MPLAYER_VD_FFMPEG_H - -void ff_init_avcodec(void); - -#endif /* MPLAYER_VD_FFMPEG_H */ diff --git a/libavfilter/vf_mp.c b/libavfilter/vf_mp.c index 6c87b3a8f0..e057d628ad 100644 --- a/libavfilter/vf_mp.c +++ b/libavfilter/vf_mp.c @@ -36,7 +36,7 @@ #include "libmpcodecs/vf.h" #include "libmpcodecs/img_format.h" #include "libmpcodecs/cpudetect.h" -#include "libmpcodecs/vd_ffmpeg.h" +#include "libmpcodecs/av_helpers.h" #include "libmpcodecs/vf_scale.h" #include "libmpcodecs/libvo/fastmemcpy.h" |