diff options
| author | compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-06-13 12:32:05 +0000 |
|---|---|---|
| committer | compn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-06-13 12:32:05 +0000 |
| commit | 3657b0185c69408e08c50fdb39422ce07c505298 (patch) | |
| tree | 8d541625a68538107c98cf67851deda1e4e6166b /etc | |
| parent | 550b3a3eb14676da25a8d7cb462994284d9bb4d1 (diff) | |
| download | mpv-3657b0185c69408e08c50fdb39422ce07c505298.tar.bz2 mpv-3657b0185c69408e08c50fdb39422ce07c505298.tar.xz | |
sync with ffmpeg
add m1v1 fourcc to mpeg1 codec
add another format to ima wav adpcm from facebook samples
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29359 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/codecs.conf | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 6ec7ae9be6..b5e1f4de61 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -111,7 +111,7 @@ videocodec mpegpes fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv - fourcc m2v1 + fourcc m2v1,m1v1 fourcc PIM1 ; Pinnacle hardware-MPEG-1 fourcc PIM2 ; Pinnacle hardware-MPEG-2 fourcc VCR2 @@ -127,6 +127,7 @@ videocodec ffmpeg1 fourcc PIM1 ; Pinnacle hardware-MPEG-1 fourcc VCR2 fourcc MPEG + fourcc m1v1 driver ffmpeg dll "mpeg1video" out YV12,I420,IYUV @@ -197,7 +198,7 @@ videocodec ffmpeg12 fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv - fourcc m2v1 + fourcc m2v1,m1v1 fourcc LMP2 ; Lead mpeg2 in avi driver ffmpeg dll "mpegvideo" @@ -236,7 +237,7 @@ videocodec mpeg12 fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv - fourcc m2v1 + fourcc m2v1,m1v1 fourcc LMP2 ; Lead mpeg2 in avi driver libmpeg2 ; dll "libmpeg2" @@ -273,7 +274,7 @@ videocodec ffmpeg12mc fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv - fourcc m2v1 + fourcc m2v1,m1v1 fourcc LMP2 ; Lead mpeg2 in avi driver ffmpeg dll "mpegvideo_xvmc" @@ -311,7 +312,7 @@ videocodec ffmpeg12vdpau fourcc AVmp fourcc mp2v,mpgv fourcc LMP2 ; Lead mpeg2 in avi - fourcc m2v1 + fourcc m2v1,m1v1 driver ffmpeg dll "mpegvideo_vdpau" out VDPAU_MPEG1 @@ -3286,6 +3287,7 @@ audiocodec ffadpcmimawav status working format 0x11 format 0x1100736d ; "ms\x00\x11" (MOV files) + format 0x11005354 ; "TS\x00\x11" (MOV files) works with -demuxer mov driver ffmpeg dll adpcm_ima_wav |