summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-11-05 19:27:38 +0100
committerwm4 <wm4@nowhere>2013-01-13 17:39:31 +0100
commit06ccd9f6716ffb5220941bea12f345154545862e (patch)
tree26c2ebdd4e202d0888e76737d79fa9888f4f096d /etc
parent42e0afe641de6eb15d89164e82671b6207402190 (diff)
downloadmpv-06ccd9f6716ffb5220941bea12f345154545862e.tar.bz2
mpv-06ccd9f6716ffb5220941bea12f345154545862e.tar.xz
video: simplify decoder pixel format handling
Simplify the decoder pixel format handling by making it handle only the case vd_lavc needs: a video stream always decodes to a single pixel format. Remove the handling for multiple pixel formats, and remove the codecs.conf pixel format declarations that are left. Remove the handling of "ambiguous" pixel formats like YV12 vs. I420 (via VDCTRL_QUERY_FORMAT etc.). This is only a problem if the video chain supports I420, but not YV12, which doesn't seem to be the case anywhere, and in fact would not have any advantage. Make the "flip" flag a global per-codec flag, rather than a pixel format specific flag. (Some ffmpeg decoders still return a flipped image, so this has to be done manually.) Also fix handling of the flip operation: do not overwrite the global flip option, and make the --flip option invert the codec flip option rather than overriding it.
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf12
1 files changed, 2 insertions, 10 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 2d3d3cefdc..7fb7b0fca6 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -209,8 +209,6 @@ videocodec ffmpeg12vdpau
fourcc m2v1,m1v1
driver ffmpeg
dll "mpegvideo_vdpau"
- out VDPAU_MPEG1
- out VDPAU_MPEG2
videocodec ffmpeg2crystalhd
info "FFmpeg MPEG-2 (CrystalHD)"
@@ -307,7 +305,6 @@ videocodec mpng
fourcc "png " ; for PNG-encoded QuickTime files
dll "libpng"
driver mpng
- out BGR32,BGR24,BGR8,Y800
videocodec ffptx
info "FFmpeg V.Flash PTX"
@@ -647,7 +644,6 @@ videocodec ffwmv3vdpau
fourcc WMV3,wmv3
driver ffmpeg
dll wmv3_vdpau
- out VDPAU_WMV3
videocodec ffwmv3crystalhd
info "FFmpeg WMV3/WMV9 (CrystalHD)"
@@ -671,7 +667,6 @@ videocodec ffvc1vdpau
fourcc vc-1,VC-1
driver ffmpeg
dll vc1_vdpau
- out VDPAU_VC1
videocodec ffvc1crystalhd
info "FFmpeg WVC1 (CrystalHD)"
@@ -708,7 +703,6 @@ videocodec ffh264vdpau
format 0x10000005
driver ffmpeg
dll h264_vdpau
- out VDPAU_H264
videocodec ffh264crystalhd
info "FFmpeg H.264 (CrystalHD)"
@@ -738,7 +732,6 @@ videocodec ffh264vda
format 0x10000005
driver ffmpeg
dll h264_vda
- out YUY2,UYVY,YV12,NV12
videocodec ffsvq3
info "FFmpeg Sorenson Video v3 (SVQ3)"
@@ -810,7 +803,6 @@ videocodec ffodivxvdpau
fourcc SIPP ; Samsung SHR-6040
driver ffmpeg
dll mpeg4_vdpau
- out VDPAU_MPEG4
videocodec ffodivxcrystalhd
info "FFmpeg MPEG-4,DIVX-4/5 (CrystalHD)"
@@ -850,7 +842,7 @@ videocodec ffwv1f
fourcc WV1F
driver ffmpeg
dll mpeg4
- out YV12,I420,IYUV flip
+ flags flip
videocodec fflibschroedinger
info "Dirac (through FFmpeg libschroedinger)"
@@ -946,7 +938,7 @@ videocodec ffzygo
fourcc ZyGo
driver ffmpeg
dll h263
- out YV12,I420,IYUV flip
+ flags flip
videocodec ffh261
info "CCITT H.261"