From ff24109403676a01143e1b63a2574f4fc4512d8d Mon Sep 17 00:00:00 2001
From: martii <m4rtii@gmx.de>
Date: Thu, 3 Apr 2014 18:10:03 +0200
Subject: [PATCH] libeplayer/container_ffmpeg: switch to ffmpeg 2.0 API

---
 libeplayer3/container/container_ffmpeg.c |  6 +++---
 libeplayer3/output/writer/pcm.c          | 20 ++++++--------------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/libeplayer3/container/container_ffmpeg.c b/libeplayer3/container/container_ffmpeg.c
index bcba86a..ff20690 100644
--- a/libeplayer3/container/container_ffmpeg.c
+++ b/libeplayer3/container/container_ffmpeg.c
@@ -435,7 +435,7 @@ static void FFMPEGThread(Context_t * context)
 			    swr = NULL;
 			}
 			if (decoded_frame) {
-			    avcodec_free_frame(&decoded_frame);
+			    av_frame_free(&decoded_frame);
 			    decoded_frame = NULL;
 			}
 			context->output->Command(context, OUTPUT_CLEAR, NULL);
@@ -455,7 +455,7 @@ static void FFMPEGThread(Context_t * context)
 				exit(1);
 			    }
 			} else
-			    avcodec_get_frame_defaults(decoded_frame);
+			    av_frame_unref(decoded_frame);
 
 			int len = avcodec_decode_audio4(c, decoded_frame, &got_frame, &packet);
 			if (len < 0) {
@@ -635,7 +635,7 @@ static void FFMPEGThread(Context_t * context)
     if (swr)
 	swr_free(&swr);
     if (decoded_frame)
-	avcodec_free_frame(&decoded_frame);
+	av_frame_free(&decoded_frame);
 
     if (context->playback)
 	context->playback->abortPlayback = 1;
diff --git a/libeplayer3/output/writer/pcm.c b/libeplayer3/output/writer/pcm.c
index be55e28..b09da56 100644
--- a/libeplayer3/output/writer/pcm.c
+++ b/libeplayer3/output/writer/pcm.c
@@ -125,8 +125,7 @@ static int prepareClipPlay(int uNoOfChannels, int uSampleRate,
 
     memcpy(lpcm_prv, clpcm_prv, sizeof(lpcm_prv));
 
-    //figure out size of subframe
-    //and set up sample rate
+    // figure out size of subframe and set up sample rate
     switch (uSampleRate) {
     case 48000:
 	SubFrameLen = 40;
@@ -172,8 +171,7 @@ static int prepareClipPlay(int uNoOfChannels, int uSampleRate,
     case 16:
 	break;
     default:
-	printf("inappropriate bits per sample (%d) - must be 16 or 24\n",
-	       uBitsPerSample);
+	printf("inappropriate bits per sample (%d) - must be 16 or 24\n", uBitsPerSample);
 	return 1;
     }
 
@@ -240,16 +238,12 @@ static int writeData(void *_call)
 	}
 	//get first PES's worth
 	if (breakBufferFillSize > 0) {
-	    memcpy(injectBuffer, breakBuffer,
-		   sizeof(unsigned char) * breakBufferFillSize);
-	    memcpy(&injectBuffer[breakBufferFillSize], &buffer[pos],
-		   sizeof(unsigned char) * (SubFrameLen -
-					    breakBufferFillSize));
+	    memcpy(injectBuffer, breakBuffer, sizeof(unsigned char) * breakBufferFillSize);
+	    memcpy(&injectBuffer[breakBufferFillSize], &buffer[pos], sizeof(unsigned char) * (SubFrameLen - breakBufferFillSize));
 	    pos += (SubFrameLen - breakBufferFillSize);
 	    breakBufferFillSize = 0;
 	} else {
-	    memcpy(injectBuffer, &buffer[pos],
-		   sizeof(unsigned char) * SubFrameLen);
+	    memcpy(injectBuffer, &buffer[pos], sizeof(unsigned char) * SubFrameLen);
 	    pos += SubFrameLen;
 	}
 
@@ -291,9 +285,7 @@ static int writeData(void *_call)
 	//increment err... subframe count?
 	lpcm_prv[1] = ((lpcm_prv[1] + SubFramesPerPES) & 0x1F);
 
-	iov[0].iov_len =
-	    InsertPesHeader(PesHeader, iov[1].iov_len + iov[2].iov_len,
-			    PCM_PES_START_CODE, call->Pts, 0);
+	iov[0].iov_len = InsertPesHeader(PesHeader, iov[1].iov_len + iov[2].iov_len, PCM_PES_START_CODE, call->Pts, 0);
 	int len = writev(call->fd, iov, 3);
 	if (len < 0)
 	    break;