Mercurial > mplayer.hg

changeset 34920:1431b26d1427

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support FFmpeg Packed Animation File decoder.
author cehoyos
date Fri, 06 Jul 2012 12:34:58 +0000
parents 2ca0d6df88c3
children 5b41670efbe8
files etc/codecs.conf libmpdemux/mp_taglists.c
diffstat 2 files changed, 19 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Thu Jul 05 19:04:28 2012 +0000
+++ b/etc/codecs.conf	Fri Jul 06 12:34:58 2012 +0000
@@ -93,6 +93,14 @@
   dll sanm
   out BGR16,BGR8
 
+videocodec ffpafvideo
+  info "FFmpeg Packed Animation File"
+  status working
+  fourcc PAFV ; internal MPlayer FourCC
+  driver ffmpeg
+  dll paf_video
+  out BGR8
+
 videocodec ffsiff
   info "FFmpeg Beam Software SIFF"
   status working
@@ -4585,6 +4593,13 @@
   driver ffmpeg
   dll vima
 
+audiocodec ffpafaudio
+  info "FFmpeg Packed Animation File"
+  status working
+  fourcc PAFA ; internal MPlayer FourCC
+  driver ffmpeg
+  dll paf_audio
+
 audiocodec ffwssnd1
   info "FFmpeg Westwood SND1"
   status working
--- a/libmpdemux/mp_taglists.c	Thu Jul 05 19:04:28 2012 +0000
+++ b/libmpdemux/mp_taglists.c	Fri Jul 06 12:34:58 2012 +0000
@@ -100,6 +100,10 @@
     { CODEC_ID_H264,              MKTAG('H', '2', '6', '4')},
     { CODEC_ID_MP3,               0x55},
     { CODEC_ID_MPEG4,             MKTAG('M', 'P', '4', 'V')},
+#if LIBAVUTIL_VERSION_MICRO >= 100
+    { CODEC_ID_PAF_AUDIO,         MKTAG('P', 'A', 'F', 'A')},
+    { CODEC_ID_PAF_VIDEO,         MKTAG('P', 'A', 'F', 'V')},
+#endif
     { CODEC_ID_PCM_BLURAY,        MKTAG('B', 'P', 'C', 'M')},
     { CODEC_ID_PCM_S8,            MKTAG('t', 'w', 'o', 's')},
     { CODEC_ID_PCM_U8,            1},