cosmetic update

huuguanghui · Jul 17, 2010 · 3421758 · 3421758
1 parent a3359d1
commit 3421758
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/jni/ffmpeg/android/com_media_ffmpeg_android_FFMpegPlayerAndroid.cpp b/jni/ffmpeg/android/com_media_ffmpeg_android_FFMpegPlayerAndroid.cpp
@@ -290,9 +290,18 @@ static void FFMpegPlayerAndroid_play(JNIEnv *env, jobject obj, jobject bitmap) {
 	int						result = -1;
 	int 					samples_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
 	int16_t*				samples;
+	AVFrame*				pFrameRGB;
 
 	// Allocate an AVFrame structure
-	AVFrame *pFrameRGB = FFMpegPlayerAndroid_createFrame(env);
+	if(ffmpeg_video.initzialized) {
+		pFrameRGB = FFMpegPlayerAndroid_createFrame(env);
+		if (pFrameRGB == NULL) {
+			jniThrowException(env,
+							  "java/io/IOException",
+							  "Couldn't crate frame buffer");
+			return;
+		}
+	}
 
 	if(ffmpeg_audio.initzialized) {
 		samples = (int16_t *) av_malloc(samples_size);

diff --git a/src/com/media/ffmpeg/android/FFMpegPlayerAndroid.java b/src/com/media/ffmpeg/android/FFMpegPlayerAndroid.java
@@ -50,7 +50,6 @@ public class FFMpegPlayerAndroid extends SurfaceView {
 	private boolean							mPlaying;
 	private Bitmap							mBitmap;
 	private FFMpegAVFormatContext			mInputVideo;
-	private boolean 						mFitToScreen;
 
 	public FFMpegPlayerAndroid(Context context) {
         super(context);
@@ -69,7 +68,6 @@ public FFMpegPlayerAndroid(Context context, AttributeSet attrs, int defStyle) {
 
     private void initVideoView(Context context) {
     	mContext = context;
-    	mFitToScreen = true;
     	getHolder().addCallback(mSHCallback);
     }