diff --git a/etc/codecs.conf b/etc/codecs.conf
index 23bff5dc8e..515f313ba6 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -1037,6 +1037,7 @@ videocodec ffodivxvdpau
   fourcc M4T3,DMK2,DIGI,INMC
   fourcc EPHV,SN40
   fourcc uldx,ULDX,VSPX
+  fourcc SIPP ; Samsung SHR-6040
   driver ffmpeg
   dll mpeg4_vdpau
   out VDPAU_MPEG4
@@ -1090,6 +1091,7 @@ videocodec xvid
   fourcc EPHV,SN40
   fourcc uldx,ULDX,VSPX
   format 0x10000004  ; mpeg 4 es
+  fourcc SIPP ; Samsung SHR-6040
   driver xvid
   out YV12
   out I420