diff --git a/libeplayer3/container/container_ffmpeg.c b/libeplayer3/container/container_ffmpeg.c
index eedc2ca..1eb9be6 100644
--- a/libeplayer3/container/container_ffmpeg.c
+++ b/libeplayer3/container/container_ffmpeg.c
@@ -436,7 +436,6 @@ static void FFMPEGThread(Context_t *context) {
 	    Track_t * subtitleTrack = NULL;
 	    Track_t * dvbsubtitleTrack = NULL;
 	    Track_t * teletextTrack = NULL;
-#endif
 
 	    context->playback->readCount += packet.size;
 
@@ -500,7 +499,7 @@ static void FFMPEGThread(Context_t *context) {
                         avOut.data       = packet.data;
                         avOut.len        = packet.size;
                         avOut.pts        = pts;
-                        avOut.extradata  = &extradata;
+                        avOut.extradata  = (unsigned char *) &extradata;
                         avOut.extralen   = sizeof(extradata);
                         avOut.frameRate  = 0;
                         avOut.timeScale  = 0;
@@ -513,8 +512,7 @@ static void FFMPEGThread(Context_t *context) {
                             ffmpeg_err("(raw pcm) writing data to audio device failed\n");
                         }
                     }
-
-		    else if (audioTrack->inject_as_pcm == 1)
+                    else if (audioTrack->inject_as_pcm == 1)
 		    {
 			AVCodecContext *c = ((AVStream*)(audioTrack->stream))->codec;
 
diff --git a/libeplayer3/output/writer/pes.c b/libeplayer3/output/writer/pes.c
index 64fa503..370912c 100644
--- a/libeplayer3/output/writer/pes.c
+++ b/libeplayer3/output/writer/pes.c
@@ -90,8 +90,6 @@ int InsertPesHeader (unsigned char *data, int size, unsigned char stream_id, uns
 {
     BitPacker_t ld2 = {data, 0, 32};
 
-#if 0
-    /* does not seem to hurt, at least with h264 data...? */
     if (size > MAX_PES_PACKET_SIZE)
     size = 0; // unbounded