[libdvbpsi-devel] Fix generation of the video stream descriptor

[Daniel Kamil Kozar]

libdvbpsi | branch: branch/1.3.0-bugfix | Daniel Kamil Kozar <dkk089 at gmail.com> | Mon Jun  1 19:11:43 2015 +0200| [bbd9ced914d4d2f96c57b022b425b8bf1011d3cb] | committer: Jean-Paul Saman

Fix generation of the video stream descriptor

dvbpsi_GenVStreamDr set the MPEG_1_only_flag incorrectly : it should be
set only if the descriptor does not carry extra information about MPEG-2
video. The previous behaviour was exactly the opposite.

Signed-off-by: Jean-Paul Saman <jpsaman at videolan.org>

> http://git.videolan.org/gitweb.cgi/libdvbpsi.git/?a=commit;h=bbd9ced914d4d2f96c57b022b425b8bf1011d3cb
---

 src/descriptors/dr_02.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/descriptors/dr_02.c b/src/descriptors/dr_02.c
index 774a1c0..e85f61d 100644
--- a/src/descriptors/dr_02.c
+++ b/src/descriptors/dr_02.c
@@ -100,7 +100,7 @@ dvbpsi_descriptor_t * dvbpsi_GenVStreamDr(dvbpsi_vstream_dr_t * p_decoded,
         return NULL;
 
     /* Encode data */
-    p_descriptor->p_data[0] = 0;
+    p_descriptor->p_data[0] = (p_decoded->b_mpeg2) ? 0 : 0x04;
     if (p_decoded->b_multiple_frame_rate)
         p_descriptor->p_data[0] |= 0x80;
     p_descriptor->p_data[0] |= (p_decoded->i_frame_rate_code & 0x0f) << 3;
@@ -111,7 +111,6 @@ dvbpsi_descriptor_t * dvbpsi_GenVStreamDr(dvbpsi_vstream_dr_t * p_decoded,
 
     if (p_decoded->b_mpeg2)
     {
-        p_descriptor->p_data[0] |= 0x04;
         p_descriptor->p_data[1] = p_decoded->i_profile_level_indication;
         p_descriptor->p_data[2] = 0x1f;
         p_descriptor->p_data[2] |= (p_decoded->i_chroma_format & 0x03) << 6;