Merge branch 'master' of github.com:Jackarain/avplayer

ezhong0812 · Apr 16, 2012 · 3ffdf68 · 3ffdf68
2 parents 98f49ff + ac9e8b9
commit 3ffdf68
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/avcore/player_impl.cpp b/avcore/player_impl.cpp
@@ -680,8 +680,11 @@ BOOL player_impl::open(LPCTSTR movie, int media_type, int video_out_type/* = 0*/
 		configure(m_avplay, m_audio, AUDIO_RENDER);
 
 		// 得到视频宽高.
-		m_video_width = m_avplay->m_video_ctx->width;
-		m_video_height = m_avplay->m_video_ctx->height;
+		if (m_avplay->m_video_ctx)
+		{
+			m_video_width = m_avplay->m_video_ctx->width;
+			m_video_height = m_avplay->m_video_ctx->height;			
+		}
 
 		return TRUE;
 

diff --git a/libav/src/avplay.c b/libav/src/avplay.c
@@ -460,7 +460,8 @@ audio_render* alloc_audio_render()
 
 void free_audio_render(audio_render *render)
 {
-	render->destory_audio(render->ctx);
+	if (render->ctx)
+		render->destory_audio(render->ctx);
 	free(render);
 }
 
@@ -474,7 +475,8 @@ video_render* alloc_video_render(void *user_data)
 
 void free_video_render(video_render *render)
 {
-	render->destory_video(render->ctx);
+	if (render->ctx)
+		render->destory_video(render->ctx);
 	free(render);
 }