# HG changeset patch
# User cehoyos
# Date 1318765685 0
# Node ID 5feea143727930b30e08cde42b6736cde5297605
# Parent  3959e81b0bcb64f76658ac3e992b17e19107236b
Support ASP by QNAP Systems.

diff -r 3959e81b0bcb -r 5feea1437279 etc/codecs.conf
--- a/etc/codecs.conf	Sun Oct 16 10:49:48 2011 +0000
+++ b/etc/codecs.conf	Sun Oct 16 11:48:05 2011 +0000
@@ -1209,6 +1209,7 @@
   fourcc uldx,ULDX,VSPX
   fourcc SIPP ; Samsung SHR-6040
   fourcc DreX,DM4V,LMP4,DP02
+  fourcc QMP4
   driver ffmpeg
   dll mpeg4 ;opendivx
   out YV12,I420,IYUV
@@ -1243,6 +1244,7 @@
   fourcc uldx,ULDX,VSPX
   fourcc SIPP ; Samsung SHR-6040
   fourcc DreX,DM4V,LMP4,DP02
+  fourcc QMP4
   driver ffmpeg
   dll mpeg4_vdpau
   out VDPAU_MPEG4
@@ -1331,6 +1333,7 @@
   format 0x10000004  ; mpeg 4 es
   fourcc SIPP ; Samsung SHR-6040
   fourcc DreX,DM4V,LMP4,DP02
+  fourcc QMP4
   driver xvid
   out YV12
   out I420