diff --git a/src/ccextractor.c b/src/ccextractor.c
index cb9dfcbe..8e13b1a6 100644
--- a/src/ccextractor.c
+++ b/src/ccextractor.c
@@ -491,7 +491,7 @@ int main(int argc, char *argv[])
 						write_subtitle_file_header(context_cc608_field_1.out);
 				}
 			}
-			if (ccx_options.extract == 12) 
+			if (ccx_options.extract == 12 && ccx_options.write_format != CCX_OF_RAW)
 				mprint (" and \n");
 			if (ccx_options.extract!=1)
 			{
@@ -500,6 +500,11 @@ int main(int argc, char *argv[])
 					wbout1.fh=STDOUT_FILENO;
 					mprint ("Sending captions to stdout.\n");
 				}
+				else if(ccx_options.write_format == CCX_OF_RAW
+					&& ccx_options.extract == 12)
+				{
+					memcpy(&wbout2, &wbout1,sizeof(wbout1));
+				}
 				else
 				{
 					if (wbout2.filename[0]==0)
@@ -515,12 +520,13 @@ int main(int argc, char *argv[])
 					{
 						fatal (EXIT_FILE_CREATION_FAILED, "Failed\n");				
 					}
+					if(ccx_options.write_format == CCX_OF_RAW)
+						writeraw (BROADCAST_HEADER,sizeof (BROADCAST_HEADER),&wbout2);
 				}
+
 				switch (ccx_options.write_format)
 				{
 					case CCX_OF_RAW:
-						writeraw (BROADCAST_HEADER,sizeof (BROADCAST_HEADER),&wbout2);
-						break;
 					case CCX_OF_DVDRAW:
 						break;
 					case CCX_OF_RCWT:
diff --git a/src/ccextractor.h b/src/ccextractor.h
index e2485508..1d151915 100644
--- a/src/ccextractor.h
+++ b/src/ccextractor.h
@@ -364,9 +364,6 @@ int parse_PAT (void);
 // myth.c
 void myth_loop(void);
 
-// mp4_bridge2bento4.c
-void mp4_loop (char *filename);
-
 // xds.c
 void process_xds_bytes (const unsigned char hi, int lo);
 void do_end_of_xds (unsigned char expected_checksum);