0
0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 20:03:10 +02:00

sync with ffmpeg

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29356 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
compn 2009-06-12 02:39:21 +00:00
parent 79cbf2cc39
commit 3c20965003

View File

@ -111,7 +111,11 @@ videocodec mpegpes
fourcc mx3n,mx3p
fourcc AVmp
fourcc mp2v,mpgv
fourcc m2v1
fourcc PIM1 ; Pinnacle hardware-MPEG-1
fourcc PIM2 ; Pinnacle hardware-MPEG-2
fourcc VCR2
fourcc LMP2 ; Lead mpeg2 in avi
driver mpegpes
out MPES
@ -154,6 +158,7 @@ videocodec ffmpeg2
fourcc AVmp
fourcc VCR2
fourcc mp2v,mpgv
fourcc m2v1
fourcc PIM2
fourcc LMP2 ; Lead mpeg2 in avi
driver ffmpeg
@ -192,6 +197,7 @@ videocodec ffmpeg12
fourcc mx3n,mx3p
fourcc AVmp
fourcc mp2v,mpgv
fourcc m2v1
fourcc LMP2 ; Lead mpeg2 in avi
driver ffmpeg
dll "mpegvideo"
@ -230,6 +236,7 @@ videocodec mpeg12
fourcc mx3n,mx3p
fourcc AVmp
fourcc mp2v,mpgv
fourcc m2v1
fourcc LMP2 ; Lead mpeg2 in avi
driver libmpeg2
; dll "libmpeg2"
@ -266,6 +273,7 @@ videocodec ffmpeg12mc
fourcc mx3n,mx3p
fourcc AVmp
fourcc mp2v,mpgv
fourcc m2v1
fourcc LMP2 ; Lead mpeg2 in avi
driver ffmpeg
dll "mpegvideo_xvmc"
@ -303,6 +311,7 @@ videocodec ffmpeg12vdpau
fourcc AVmp
fourcc mp2v,mpgv
fourcc LMP2 ; Lead mpeg2 in avi
fourcc m2v1
driver ffmpeg
dll "mpegvideo_vdpau"
out VDPAU_MPEG1
@ -3048,6 +3057,7 @@ audiocodec ffqclp
status buggy
format 0x706C6351 ; "Qclp"
format 0x70637173 ; "sqcp"
format 0x716C6351 ; "Qclq"
driver ffmpeg
dll "qcelp"