[vlc-commits] demux: ogg: rename field

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Feb 13 17:08:19 2019 +0100| [dcadc335cd850b949c69aa534ab503efd8b3a0f1] | committer: Francois Cartegnie

demux: ogg: rename field

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

 modules/demux/ogg.c | 8 ++------
 modules/demux/ogg.h | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index d310c42146..8356234811 100644
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -2605,15 +2605,11 @@ static bool Ogg_ReadTheoraHeader( logical_stream_t *p_stream,
     }
 
     i_version = i_major * 1000000 + i_minor * 1000 + i_subminor;
-    p_stream->i_keyframe_offset = 0;
+    p_stream->i_first_frame_index = (i_version >= 3002001) ? 1 : 0;
     if ( !i_fps_denominator || !i_fps_numerator )
         return false;
     date_Init( &p_stream->dts, i_fps_numerator, i_fps_denominator );
 
-    if ( i_version >= 3002001 )
-    {
-        p_stream->i_keyframe_offset = 1;
-    }
     return true;
 }
 
@@ -2670,7 +2666,7 @@ static bool Ogg_ReadDaalaHeader( logical_stream_t *p_stream,
 
     i_version = i_major * 1000000 + i_minor * 1000 + i_subminor;
     VLC_UNUSED(i_version);
-    p_stream->i_keyframe_offset = 0;
+    p_stream->i_first_frame_index = 0;
     if ( !i_timebase_numerator || !i_timebase_denominator )
         return false;
     date_Init( &p_stream->dts, i_timebase_numerator, i_timebase_denominator );
diff --git a/modules/demux/ogg.h b/modules/demux/ogg.h
index a8b56a85c3..5c4523032d 100644
--- a/modules/demux/ogg.h
+++ b/modules/demux/ogg.h
@@ -90,7 +90,7 @@ typedef struct logical_stream_s
     int i_pre_skip;
 
     /* offset of first keyframe for theora; can be 0 or 1 depending on version number */
-    int8_t i_keyframe_offset;
+    int8_t i_first_frame_index;
 
     /* keyframe index for seeking, created as we discover keyframes */
     demux_index_entry_t *idx;