[FFmpeg-cvslog] avcodec/libvpx: remove disabled code
James Almer
git at videolan.org
Mon Dec 11 05:42:51 EET 2017
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Dec 11 00:42:26 2017 -0300| [c7a5e80f569d312c9d2f0dc534e07630eecd5a34] | committer: James Almer
avcodec/libvpx: remove disabled code
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c7a5e80f569d312c9d2f0dc534e07630eecd5a34
---
libavcodec/libvpx.c | 57 -----------------------------------------------------
1 file changed, 57 deletions(-)
diff --git a/libavcodec/libvpx.c b/libavcodec/libvpx.c
index 36f915a8e5..cc055a0032 100644
--- a/libavcodec/libvpx.c
+++ b/libavcodec/libvpx.c
@@ -78,60 +78,3 @@ av_cold void ff_vp9_init_static(AVCodec *codec)
}
#endif
}
-#if 0
-enum AVPixelFormat ff_vpx_imgfmt_to_pixfmt(vpx_img_fmt_t img)
-{
- switch (img) {
- case VPX_IMG_FMT_RGB24: return AV_PIX_FMT_RGB24;
- case VPX_IMG_FMT_RGB565: return AV_PIX_FMT_RGB565BE;
- case VPX_IMG_FMT_RGB555: return AV_PIX_FMT_RGB555BE;
- case VPX_IMG_FMT_UYVY: return AV_PIX_FMT_UYVY422;
- case VPX_IMG_FMT_YUY2: return AV_PIX_FMT_YUYV422;
- case VPX_IMG_FMT_YVYU: return AV_PIX_FMT_YVYU422;
- case VPX_IMG_FMT_BGR24: return AV_PIX_FMT_BGR24;
- case VPX_IMG_FMT_ARGB: return AV_PIX_FMT_ARGB;
- case VPX_IMG_FMT_ARGB_LE: return AV_PIX_FMT_BGRA;
- case VPX_IMG_FMT_RGB565_LE: return AV_PIX_FMT_RGB565LE;
- case VPX_IMG_FMT_RGB555_LE: return AV_PIX_FMT_RGB555LE;
- case VPX_IMG_FMT_I420: return AV_PIX_FMT_YUV420P;
- case VPX_IMG_FMT_I422: return AV_PIX_FMT_YUV422P;
- case VPX_IMG_FMT_I444: return AV_PIX_FMT_YUV444P;
- case VPX_IMG_FMT_444A: return AV_PIX_FMT_YUVA444P;
-#if VPX_IMAGE_ABI_VERSION >= 3
- case VPX_IMG_FMT_I440: return AV_PIX_FMT_YUV440P;
- case VPX_IMG_FMT_I42016: return AV_PIX_FMT_YUV420P16BE;
- case VPX_IMG_FMT_I42216: return AV_PIX_FMT_YUV422P16BE;
- case VPX_IMG_FMT_I44416: return AV_PIX_FMT_YUV444P16BE;
-#endif
- default: return AV_PIX_FMT_NONE;
- }
-}
-
-vpx_img_fmt_t ff_vpx_pixfmt_to_imgfmt(enum AVPixelFormat pix)
-{
- switch (pix) {
- case AV_PIX_FMT_RGB24: return VPX_IMG_FMT_RGB24;
- case AV_PIX_FMT_RGB565BE: return VPX_IMG_FMT_RGB565;
- case AV_PIX_FMT_RGB555BE: return VPX_IMG_FMT_RGB555;
- case AV_PIX_FMT_UYVY422: return VPX_IMG_FMT_UYVY;
- case AV_PIX_FMT_YUYV422: return VPX_IMG_FMT_YUY2;
- case AV_PIX_FMT_YVYU422: return VPX_IMG_FMT_YVYU;
- case AV_PIX_FMT_BGR24: return VPX_IMG_FMT_BGR24;
- case AV_PIX_FMT_ARGB: return VPX_IMG_FMT_ARGB;
- case AV_PIX_FMT_BGRA: return VPX_IMG_FMT_ARGB_LE;
- case AV_PIX_FMT_RGB565LE: return VPX_IMG_FMT_RGB565_LE;
- case AV_PIX_FMT_RGB555LE: return VPX_IMG_FMT_RGB555_LE;
- case AV_PIX_FMT_YUV420P: return VPX_IMG_FMT_I420;
- case AV_PIX_FMT_YUV422P: return VPX_IMG_FMT_I422;
- case AV_PIX_FMT_YUV444P: return VPX_IMG_FMT_I444;
- case AV_PIX_FMT_YUVA444P: return VPX_IMG_FMT_444A;
-#if VPX_IMAGE_ABI_VERSION >= 3
- case AV_PIX_FMT_YUV440P: return VPX_IMG_FMT_I440;
- case AV_PIX_FMT_YUV420P16BE: return VPX_IMG_FMT_I42016;
- case AV_PIX_FMT_YUV422P16BE: return VPX_IMG_FMT_I42216;
- case AV_PIX_FMT_YUV444P16BE: return VPX_IMG_FMT_I44416;
-#endif
- default: return VPX_IMG_FMT_NONE;
- }
-}
-#endif
More information about the ffmpeg-cvslog
mailing list