[vlc-commits] demux: mp4: remove captions ordered flag

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed May 17 20:20:56 2017 +0200| [901bddaa744658e4df1355d647d59e5b93542755] | committer: Francois Cartegnie

demux: mp4: remove captions ordered flag

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=901bddaa744658e4df1355d647d59e5b93542755
---

 modules/codec/cc.h      | 2 --
 modules/demux/mp4/mp4.c | 6 ++++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/codec/cc.h b/modules/codec/cc.h
index 6f8b6c48ca..c221dacefd 100644
--- a/modules/codec/cc.h
+++ b/modules/codec/cc.h
@@ -26,8 +26,6 @@
 
 #include <vlc_bits.h>
 
-#define BLOCK_FLAG_ORDERED_CAPTIONS (0x01 << BLOCK_FLAG_PRIVATE_SHIFT)
-
 #define CC_PKT_BYTE0(field) (0xFC | (0x03 & field))
 
 /* CC have a maximum rate of 9600 bit/s (per field?) */
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 0defeaf6b3..c77379b289 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -481,9 +481,11 @@ static block_t * MP4_EIA608_Convert( block_t * p_block )
         } while( i_bytes >= 2 );
     }
 
-    block_Release( p_block );
+    p_newblock->i_pts = p_block->i_dts;
     p_newblock->i_buffer = i_copied;
-    p_newblock->i_flags = BLOCK_FLAG_ORDERED_CAPTIONS;
+    p_newblock->i_flags = BLOCK_FLAG_TYPE_P;
+    block_Release( p_block );
+
     return p_newblock;
 }