[x264-devel] commit: Fix crash with MP4-muxing if zero frames were encoded ( Anton Mitrofanov )

[git at videolan.org]

x264 | branch: master | Anton Mitrofanov <BugMaster at narod.ru> | Mon May 31 22:36:50 2010 +0400| [d51fde592507649e22757a23f0ea0252ec35b5b6] | committer: Jason Garrett-Glaser 

Fix crash with MP4-muxing if zero frames were encoded

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

 output/mp4.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/output/mp4.c b/output/mp4.c
index f76541e..0aa5070 100644
--- a/output/mp4.c
+++ b/output/mp4.c
@@ -112,6 +112,7 @@ static int close_file( hnd_t handle, int64_t largest_pts, int64_t second_largest
         if( p_mp4->p_sample->data )
             free( p_mp4->p_sample->data );
 
+        p_mp4->p_sample->dataLength = 0;
         gf_isom_sample_del( &p_mp4->p_sample );
     }
 
@@ -135,7 +136,7 @@ static int close_file( hnd_t handle, int64_t largest_pts, int64_t second_largest
          * The reason is that an Edit Box maps the presentation time-line to the media time-line.
          * Any demuxers should follow the Edit Box if it exists. */
         GF_ISOSample *sample = gf_isom_get_sample_info( p_mp4->p_file, p_mp4->i_track, 1, NULL, NULL );
-        if( sample->CTS_Offset > 0 )
+        if( sample && sample->CTS_Offset > 0 )
         {
             uint32_t mvhd_timescale = gf_isom_get_timescale( p_mp4->p_file );
             uint64_t tkhd_duration = (uint64_t)( mdhd_duration * ( (double)mvhd_timescale / p_mp4->i_time_res ) );