diff --git a/DOCS/codecs.conf b/DOCS/codecs.conf
index bd8d68818b..963510599d 100644
--- a/DOCS/codecs.conf
+++ b/DOCS/codecs.conf
@@ -82,6 +82,20 @@ videocodec divx
   out YUY2 yuvhack
   out BGR32,BGR24,BGR15
 
+  
+videocodec odivx
+  info "OpenDivX (MPEG-4 v2)"
+  comment "with postprocessing"
+  status working
+  fourcc DIVX,divx
+  fourcc DIV1,div1 divx
+  fourcc MP4S,mp4s	; ISO MPEG-4 Video V1
+  fourcc MP43,mp43,DIV3,div3,DIV4,div4 DIV3  ; for DivX4Linux only!
+  format 0x4
+  driver odivx
+  dll "opendivx decore"
+  out YV12
+
 videocodec divx4
   info "DivX4Linux (MPEG-4 v2,v3)"
   comment "with postprocessing"
@@ -98,19 +112,6 @@ videocodec divx4
   out YUY2
   out UYVY
   out BGR32,BGR24,BGR16,BGR15
-  
-videocodec odivx
-  info "OpenDivX (MPEG-4 v2)"
-  comment "with postprocessing"
-  status working
-  fourcc DIVX,divx
-  fourcc DIV1,div1 divx
-  fourcc MP4S,mp4s	; ISO MPEG-4 Video V1
-  fourcc MP43,mp43,DIV3,div3,DIV4,div4 DIV3  ; for DivX4Linux only!
-  format 0x4
-  driver odivx
-  dll "opendivx decore"
-  out YV12
 
 ; =============== FFMPEG MPEG CODECS =========================
 
@@ -128,7 +129,7 @@ videocodec ffdivx
 videocodec ffodivx
   info "FFmpeg OpenDivX"
   status working
-  comment "doesn't support >= 4.0alpha48 movies yet"
+;  comment "doesn't support >= 4.0alpha48 movies yet"
   fourcc DIVX,divx
   fourcc DIV1,div1 divx
   fourcc MP4S,mp4s	; ISO MPEG-4 Video V1
@@ -377,6 +378,17 @@ videocodec asv1
   out UYVY
   out BGR32,BGR24,BGR15 flip
 
+videocodec null
+  info "NULL codec (no decoding)"
+  status working
+  comment "for unknown/unsupported codecs or testing"
+  driver null
+  out YV12
+  out I420
+  out YUY2
+  out UYVY
+  out BGR32,BGR24,BGR16,BGR15
+
 ;=============================================================================
 ;                   AUDIO CODECS
 ;=============================================================================