patch-modules_demux_avformat_demux_c 1.5 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546
  1. --- vlc-2.2.4.orig/modules/demux/avformat/demux.c 2016-01-18 21:49:57.000000000 +0100
  2. +++ vlc-2.2.4/modules/demux/avformat/demux.c 2016-09-24 20:35:02.681191261 +0200
  3. @@ -734,14 +734,14 @@ static int Demux( demux_t *p_demux )
  4. }
  5. if( pkt.stream_index < 0 || pkt.stream_index >= p_sys->i_tk )
  6. {
  7. - av_free_packet( &pkt );
  8. + av_packet_unref( &pkt );
  9. return 1;
  10. }
  11. const AVStream *p_stream = p_sys->ic->streams[pkt.stream_index];
  12. if( p_stream->time_base.den <= 0 )
  13. {
  14. msg_Warn( p_demux, "Invalid time base for the stream %d", pkt.stream_index );
  15. - av_free_packet( &pkt );
  16. + av_packet_unref( &pkt );
  17. return 1;
  18. }
  19. if( p_stream->codec->codec_id == AV_CODEC_ID_SSA )
  20. @@ -749,7 +749,7 @@ static int Demux( demux_t *p_demux )
  21. p_frame = BuildSsaFrame( &pkt, p_sys->i_ssa_order++ );
  22. if( !p_frame )
  23. {
  24. - av_free_packet( &pkt );
  25. + av_packet_unref( &pkt );
  26. return 1;
  27. }
  28. }
  29. @@ -757,7 +757,7 @@ static int Demux( demux_t *p_demux )
  30. {
  31. if( ( p_frame = block_Alloc( pkt.size ) ) == NULL )
  32. {
  33. - av_free_packet( &pkt );
  34. + av_packet_unref( &pkt );
  35. return 0;
  36. }
  37. memcpy( p_frame->p_buffer, pkt.data, pkt.size );
  38. @@ -838,7 +838,7 @@ static int Demux( demux_t *p_demux )
  39. else
  40. block_Release( p_frame );
  41. - av_free_packet( &pkt );
  42. + av_packet_unref( &pkt );
  43. return 1;
  44. }