mirror of https://github.com/mpv-player/mpv
codecs.conf: stop trying mpegpes first for MPEG-1/2
Setups which would benefit from mpegpes are rare today, and trying it first produces misleading error messages when trying to play any MPEG-1/2 file.
This commit is contained in:
parent
4a3de78aae
commit
8c225fbe0d
|
@ -102,37 +102,6 @@ videocodec blackmagic
|
||||||
out BGR32,RGB32
|
out BGR32,RGB32
|
||||||
|
|
||||||
; MPEG-1/2 decoding:
|
; MPEG-1/2 decoding:
|
||||||
; Note: mpegpes is preferred for hw decoders:
|
|
||||||
|
|
||||||
videocodec mpegpes
|
|
||||||
info "MPEG-PES output (.mpg or DXR3/IVTV/DVB/V4L2 card)"
|
|
||||||
comment "for hardware decoding"
|
|
||||||
status working
|
|
||||||
format 0x10000001 ; mpeg 1
|
|
||||||
format 0x10000002 ; mpeg 2
|
|
||||||
fourcc mpg1,MPG1,mpg2,MPG2
|
|
||||||
fourcc MPEG
|
|
||||||
fourcc hdv1,hdv2,hdv3
|
|
||||||
fourcc hdv5
|
|
||||||
fourcc hdv6,hdv7,hdv8
|
|
||||||
fourcc xdv1,xdv2,xdv3
|
|
||||||
fourcc xdv4,xdv5,xdv6
|
|
||||||
fourcc xdv7,xdv8,xdv9
|
|
||||||
fourcc xdva,xdvb,xdvc
|
|
||||||
fourcc xdvd,xdve,xdvf
|
|
||||||
fourcc xd5a,xd5b,xd5c
|
|
||||||
fourcc xd5d,xd5e,xd5f
|
|
||||||
fourcc xd59
|
|
||||||
fourcc mx5n,mx4n,mx4p
|
|
||||||
fourcc mx3n,mx3p
|
|
||||||
fourcc AVmp
|
|
||||||
fourcc mp2v,mpgv
|
|
||||||
fourcc m2v1,m1v1
|
|
||||||
fourcc PIM1 ; Pinnacle hardware-MPEG-1
|
|
||||||
fourcc PIM2 ; Pinnacle hardware-MPEG-2
|
|
||||||
fourcc LMP2 ; Lead mpeg2 in avi
|
|
||||||
driver mpegpes
|
|
||||||
out MPES
|
|
||||||
|
|
||||||
videocodec ffmpeg1
|
videocodec ffmpeg1
|
||||||
info "FFmpeg MPEG-1"
|
info "FFmpeg MPEG-1"
|
||||||
|
@ -333,6 +302,36 @@ videocodec ffmpeg12vdpau
|
||||||
out VDPAU_MPEG1
|
out VDPAU_MPEG1
|
||||||
out VDPAU_MPEG2
|
out VDPAU_MPEG2
|
||||||
|
|
||||||
|
videocodec mpegpes
|
||||||
|
info "MPEG-PES output (.mpg or DXR3/IVTV/DVB/V4L2 card)"
|
||||||
|
comment "for hardware decoding"
|
||||||
|
status working
|
||||||
|
format 0x10000001 ; mpeg 1
|
||||||
|
format 0x10000002 ; mpeg 2
|
||||||
|
fourcc mpg1,MPG1,mpg2,MPG2
|
||||||
|
fourcc MPEG
|
||||||
|
fourcc hdv1,hdv2,hdv3
|
||||||
|
fourcc hdv5
|
||||||
|
fourcc hdv6,hdv7,hdv8
|
||||||
|
fourcc xdv1,xdv2,xdv3
|
||||||
|
fourcc xdv4,xdv5,xdv6
|
||||||
|
fourcc xdv7,xdv8,xdv9
|
||||||
|
fourcc xdva,xdvb,xdvc
|
||||||
|
fourcc xdvd,xdve,xdvf
|
||||||
|
fourcc xd5a,xd5b,xd5c
|
||||||
|
fourcc xd5d,xd5e,xd5f
|
||||||
|
fourcc xd59
|
||||||
|
fourcc mx5n,mx4n,mx4p
|
||||||
|
fourcc mx3n,mx3p
|
||||||
|
fourcc AVmp
|
||||||
|
fourcc mp2v,mpgv
|
||||||
|
fourcc m2v1,m1v1
|
||||||
|
fourcc PIM1 ; Pinnacle hardware-MPEG-1
|
||||||
|
fourcc PIM2 ; Pinnacle hardware-MPEG-2
|
||||||
|
fourcc LMP2 ; Lead mpeg2 in avi
|
||||||
|
driver mpegpes
|
||||||
|
out MPES
|
||||||
|
|
||||||
; we have only native open source codecs for these:
|
; we have only native open source codecs for these:
|
||||||
|
|
||||||
videocodec ffnuv
|
videocodec ffnuv
|
||||||
|
|
Loading…
Reference in New Issue