[MPlayer-cvslog] r35014 - in trunk: etc/codecs.conf libmpdemux/mp_taglists.c

[cehoyos]

Author: cehoyos
Date: Fri Jul  6 14:34:58 2012
New Revision: 35014

Log:
Support FFmpeg Packed Animation File decoder.

Modified:
   trunk/etc/codecs.conf
   trunk/libmpdemux/mp_taglists.c

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Thu Jul  5 21:04:28 2012	(r35013)
+++ trunk/etc/codecs.conf	Fri Jul  6 14:34:58 2012	(r35014)
@@ -93,6 +93,14 @@ videocodec ffsanm
   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 @@ audiocodec ffvima
   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

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Thu Jul  5 21:04:28 2012	(r35013)
+++ trunk/libmpdemux/mp_taglists.c	Fri Jul  6 14:34:58 2012	(r35014)
@@ -100,6 +100,10 @@ static const struct AVCodecTag mp_codeci
     { 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},