# HG changeset patch
# User cehoyos
# Date 1341578098 0
# Node ID 1431b26d1427308e7955ca4bda39ab7c3c1669dd
# Parent  2ca0d6df88c3928aab6e1c211027a68708f03a65
Support FFmpeg Packed Animation File decoder.

diff -r 2ca0d6df88c3 -r 1431b26d1427 etc/codecs.conf
--- 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
diff -r 2ca0d6df88c3 -r 1431b26d1427 libmpdemux/mp_taglists.c
--- 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},