Added QTYPE_NONE to easily detect if qp are present (vout).

diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index 23e98adc4d02b197ebb9cd96890d5b02c33ceffc..059ffea33bed3d585a5b505e2ae49e96a07c9ef4 100644 (file)
--- a/include/vlc_vout.h
+++ b/include/vlc_vout.h
@@ -266,6 +266,8 @@ enum
 /* Quantification type */
 enum
 {
+    QTYPE_NONE,
+
     QTYPE_MPEG1,
     QTYPE_MPEG2,
     QTYPE_H264,

diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c
index 60c1fca80e110a9ad479adaa192a61877034e79a..ffec72ded7776faa5400273f68ab1ed7905f9af9 100644 (file)
--- a/src/video_output/vout_pictures.c
+++ b/src/video_output/vout_pictures.c
@@ -710,9 +710,9 @@ int __vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic,
     p_pic->pf_unlock = NULL;
     p_pic->i_refcount = 0;
 
-    p_pic->p_q = NULL;
+    p_pic->i_qtype = QTYPE_NONE;
     p_pic->i_qstride = 0;
-    p_pic->i_qtype = 0;
+    p_pic->p_q = NULL;
 
     vout_InitFormat( &p_pic->format, i_chroma, i_width, i_height, i_aspect );