# HG changeset patch
# User Ritor1
# Date 1401614280 -21600
# Node ID 7bf6901add4a75eff8e2a62dbd2f93ae354dab24
# Parent  bbf8a522dcec39ac73007efb284b508971c62e71# Parent  43f29cb2e6edad2a97867a228b3d05f7a9412f46
Слияние

diff -r bbf8a522dcec -r 7bf6901add4a MediaPlayer.cpp
--- 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