Mercurial > mplayer.hg
comparison etc/codecs.conf @ 29317:75b178fa58aa
sync with ffmpeg
add m1v1 fourcc to mpeg1 codec
add another format to ima wav adpcm from facebook samples
author | compn |
---|---|
date | Sat, 13 Jun 2009 12:32:05 +0000 |
parents | ee85be05888b |
children | dd9ae81f8f8f |
comparison
equal
deleted
inserted
replaced
29316:02b664c416bc | 29317:75b178fa58aa |
---|---|
109 fourcc xd59 | 109 fourcc xd59 |
110 fourcc mx5n,mx4n,mx4p | 110 fourcc mx5n,mx4n,mx4p |
111 fourcc mx3n,mx3p | 111 fourcc mx3n,mx3p |
112 fourcc AVmp | 112 fourcc AVmp |
113 fourcc mp2v,mpgv | 113 fourcc mp2v,mpgv |
114 fourcc m2v1 | 114 fourcc m2v1,m1v1 |
115 fourcc PIM1 ; Pinnacle hardware-MPEG-1 | 115 fourcc PIM1 ; Pinnacle hardware-MPEG-1 |
116 fourcc PIM2 ; Pinnacle hardware-MPEG-2 | 116 fourcc PIM2 ; Pinnacle hardware-MPEG-2 |
117 fourcc VCR2 | 117 fourcc VCR2 |
118 fourcc LMP2 ; Lead mpeg2 in avi | 118 fourcc LMP2 ; Lead mpeg2 in avi |
119 driver mpegpes | 119 driver mpegpes |
125 format 0x10000001 ; MPEG-1 | 125 format 0x10000001 ; MPEG-1 |
126 fourcc mpg1 | 126 fourcc mpg1 |
127 fourcc PIM1 ; Pinnacle hardware-MPEG-1 | 127 fourcc PIM1 ; Pinnacle hardware-MPEG-1 |
128 fourcc VCR2 | 128 fourcc VCR2 |
129 fourcc MPEG | 129 fourcc MPEG |
130 fourcc m1v1 | |
130 driver ffmpeg | 131 driver ffmpeg |
131 dll "mpeg1video" | 132 dll "mpeg1video" |
132 out YV12,I420,IYUV | 133 out YV12,I420,IYUV |
133 | 134 |
134 videocodec ffmpeg2 | 135 videocodec ffmpeg2 |
195 fourcc xd59 | 196 fourcc xd59 |
196 fourcc mx5n,mx4n,mx4p | 197 fourcc mx5n,mx4n,mx4p |
197 fourcc mx3n,mx3p | 198 fourcc mx3n,mx3p |
198 fourcc AVmp | 199 fourcc AVmp |
199 fourcc mp2v,mpgv | 200 fourcc mp2v,mpgv |
200 fourcc m2v1 | 201 fourcc m2v1,m1v1 |
201 fourcc LMP2 ; Lead mpeg2 in avi | 202 fourcc LMP2 ; Lead mpeg2 in avi |
202 driver ffmpeg | 203 driver ffmpeg |
203 dll "mpegvideo" | 204 dll "mpegvideo" |
204 out YV12,I420,IYUV | 205 out YV12,I420,IYUV |
205 out 422P,444P | 206 out 422P,444P |
234 fourcc xd59 | 235 fourcc xd59 |
235 fourcc mx5n,mx4n,mx4p | 236 fourcc mx5n,mx4n,mx4p |
236 fourcc mx3n,mx3p | 237 fourcc mx3n,mx3p |
237 fourcc AVmp | 238 fourcc AVmp |
238 fourcc mp2v,mpgv | 239 fourcc mp2v,mpgv |
239 fourcc m2v1 | 240 fourcc m2v1,m1v1 |
240 fourcc LMP2 ; Lead mpeg2 in avi | 241 fourcc LMP2 ; Lead mpeg2 in avi |
241 driver libmpeg2 | 242 driver libmpeg2 |
242 ; dll "libmpeg2" | 243 ; dll "libmpeg2" |
243 out YV12,I420,IYUV | 244 out YV12,I420,IYUV |
244 out 422P | 245 out 422P |
271 fourcc xd59 | 272 fourcc xd59 |
272 fourcc mx5n,mx4n,mx4p | 273 fourcc mx5n,mx4n,mx4p |
273 fourcc mx3n,mx3p | 274 fourcc mx3n,mx3p |
274 fourcc AVmp | 275 fourcc AVmp |
275 fourcc mp2v,mpgv | 276 fourcc mp2v,mpgv |
276 fourcc m2v1 | 277 fourcc m2v1,m1v1 |
277 fourcc LMP2 ; Lead mpeg2 in avi | 278 fourcc LMP2 ; Lead mpeg2 in avi |
278 driver ffmpeg | 279 driver ffmpeg |
279 dll "mpegvideo_xvmc" | 280 dll "mpegvideo_xvmc" |
280 out IDCT_MPEG2 | 281 out IDCT_MPEG2 |
281 out MOCO_MPEG2 | 282 out MOCO_MPEG2 |
309 fourcc mx5n,mx4n,mx4p | 310 fourcc mx5n,mx4n,mx4p |
310 fourcc mx3n,mx3p | 311 fourcc mx3n,mx3p |
311 fourcc AVmp | 312 fourcc AVmp |
312 fourcc mp2v,mpgv | 313 fourcc mp2v,mpgv |
313 fourcc LMP2 ; Lead mpeg2 in avi | 314 fourcc LMP2 ; Lead mpeg2 in avi |
314 fourcc m2v1 | 315 fourcc m2v1,m1v1 |
315 driver ffmpeg | 316 driver ffmpeg |
316 dll "mpegvideo_vdpau" | 317 dll "mpegvideo_vdpau" |
317 out VDPAU_MPEG1 | 318 out VDPAU_MPEG1 |
318 out VDPAU_MPEG2 | 319 out VDPAU_MPEG2 |
319 | 320 |
3284 audiocodec ffadpcmimawav | 3285 audiocodec ffadpcmimawav |
3285 info "FFmpeg WAV IMA ADPCM audio" | 3286 info "FFmpeg WAV IMA ADPCM audio" |
3286 status working | 3287 status working |
3287 format 0x11 | 3288 format 0x11 |
3288 format 0x1100736d ; "ms\x00\x11" (MOV files) | 3289 format 0x1100736d ; "ms\x00\x11" (MOV files) |
3290 format 0x11005354 ; "TS\x00\x11" (MOV files) works with -demuxer mov | |
3289 driver ffmpeg | 3291 driver ffmpeg |
3290 dll adpcm_ima_wav | 3292 dll adpcm_ima_wav |
3291 | 3293 |
3292 audiocodec imaadpcm | 3294 audiocodec imaadpcm |
3293 info "IMA ADPCM" | 3295 info "IMA ADPCM" |