Mercurial > mm7

diff MediaPlayer.cpp @ 2372:7bf6901add4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sun, 01 Jun 2014 15:18:00 +0600
parents 43f29cb2e6ed
children 6eb63623cbe8
line wrap: on
line diff
--- a/MediaPlayer.cpp	Mon May 12 01:55:23 2014 +0200
+++ b/MediaPlayer.cpp	Sun Jun 01 15:18:00 2014 +0600
@@ -727,7 +727,7 @@
 
             device_buffer = provider->CreateTrack16(audio.dec_ctx->channels, audio.dec_ctx->sample_rate, 2, num_audio_samples, audio_plain_data.Ptr());
 
-            ReleaseAvcodec();
+            Release();
             return true;
           }
         }
@@ -813,6 +813,7 @@
 	  delete decoding_frame;
       if (last_resampled_frame_data[0])
         av_freep(&last_resampled_frame_data[0]);
+
     }
 
     bool Load(const wchar_t *filename, int dst_width, int dst_height, int cache_ms)	//
@@ -990,7 +991,7 @@
           last_resampled_frame_num = desired_frame_number;
           memcpy(last_resampled_frame_data, rescaled_data, sizeof(rescaled_data));
           memcpy(last_resampled_frame_linesize, rescaled_linesize, sizeof(rescaled_linesize));
-          //   av_freep(&rescaled_data[0]);
+          //av_freep(&rescaled_data[0]);//   
         }
       }
       else