Project: FFmpeg2theora

Revision: 14992

Author: j

Date: 03 Jun 2008 11:58:28

• /trunk/ffmpeg2theora/src/subtitles.c

  ......	@@ -41,5 +41,5 @@
  41	41	* adds a new kate stream structure
  42	42	*/
  43		static void add_kate_stream(ff2theora this){
  	43	void add_kate_stream(ff2theora this){
  44	44	ff2theora_kate_stream *ks;
  45	45	this->kate_streams=(ff2theora_kate_stream*)realloc(this->kate_streams,(this->n_kate_streams+1)*sizeof(ff2theora_kate_stream));
  ......	@@ -112,5 +112,5 @@
  112	112	}
  113	113
  114		static char *fgets2(char *s,size_t sz,FILE *f)
  	114	char *fgets2(char *s,size_t sz,FILE *f)
  115	115	{
  116	116	char *ret = fgets(s, sz, f);
  ......	@@ -121,5 +121,5 @@
  121	121	}
  122	122
  123		static double hmsms2s(int h,int m,int s,int ms)
  	123	double hmsms2s(int h,int m,int s,int ms)
  124	124	{
  125	125	return h*3600+m*60+s+ms/1000.0;
  ......	@@ -127,5 +127,5 @@
  127	127
  128	128	/* very simple implementation when no iconv */
  129		static void convert_subtitle_to_utf8(F2T_ENCODING encoding,unsigned char *text)
  	129	void convert_subtitle_to_utf8(F2T_ENCODING encoding,unsigned char *text)
  130	130	{
  131	131	size_t nbytes;
  ......	@@ -184,5 +184,6 @@
  184	184	static char text[4096];
  185	185	int h0,m0,s0,ms0,h1,m1,s1,ms1;
  186		double t0,t1;
  	186	double t0=0.0;
  	187	double t1=0.0;
  187	188	static char str[4096];
  188	189	int warned=0;

• /trunk/ffmpeg2theora/src/subtitles.h

  ......	@@ -16,5 +16,5 @@
  16	16	#define SUPPORTED_ENCODINGS "utf-8, utf8, iso-8859-1, latin1"
  17	17
  18		static void add_kate_stream(ff2theora this);
  	18	extern void add_kate_stream(ff2theora this);
  19	19	extern int load_subtitles(ff2theora_kate_stream *this);
  20	20	extern void free_subtitles(ff2theora this);
  ......	@@ -26,7 +26,7 @@
  26	26	extern void report_unknown_subtitle_encoding(const char *name);
  27	27
  28		static char *fgets2(char *s,size_t sz,FILE *f);
  29		static double hmsms2s(int h,int m,int s,int ms);
  30		static void convert_subtitle_to_utf8(F2T_ENCODING encoding,unsigned char *text);
  	28	extern char *fgets2(char *s,size_t sz,FILE *f);
  	29	extern double hmsms2s(int h,int m,int s,int ms);
  	30	extern void convert_subtitle_to_utf8(F2T_ENCODING encoding,unsigned char *text);
  31	31	#endif
  32	32

• /trunk/ffmpeg2theora/src/ffmpeg2theora.c

  ......	@@ -30,4 +30,5 @@
  30	30	#include "libavformat/avformat.h"
  31	31	#include "libavdevice/avdevice.h"
  	32	#include "libavformat/framehook.h"
  32	33	#include "libswscale/swscale.h"
  33	34	#include "libpostproc/postprocess.h"
  ......	@@ -184,6 +185,4 @@
  184	185	this->y_lut_used = 0;
  185	186	this->uv_lut_used = 0;
  186		this->y_lut[256];
  187		this->uv_lut[256];
  188	187	}
  189	188	return this;
  ......	@@ -297,5 +296,5 @@
  297	296	pp_mode_t *ppMode = NULL;
  298	297	pp_context_t *ppContext = NULL;
  299		float frame_aspect;
  	298	float frame_aspect = 0;
  300	299	double fps = 0.0;
  301	300
  ......	@@ -605,8 +604,8 @@
  605	604	int16_t *audio_buf=av_malloc(4*AVCODEC_MAX_AUDIO_FRAME_SIZE);
  606	605	int16_t *resampled=av_malloc(4*AVCODEC_MAX_AUDIO_FRAME_SIZE);
  607		int16_t *audio_p;
  	606	int16_t *audio_p=NULL;
  608	607	int no_frames;
  609	608
  610		double framerate_add;
  	609	double framerate_add = 0;
  611	610	double framerate_tmpcount = 0;
  612	611
  ......	@@ -761,5 +760,5 @@
  761	760	ptr = pkt.data;
  762	761	len = pkt.size;
  763		if (e_o_s && !info.audio_only || (ret >= 0 && pkt.stream_index == this->video_index)){
  	762	if ((e_o_s && !info.audio_only) || (ret >= 0 && pkt.stream_index == this->video_index)){
  764	763	if(len == 0 && !first && !e_o_s){
  765	764	fprintf (stderr, "no frame available\n");
  ......	@@ -833,4 +832,5 @@
  833	832	}
  834	833	// now output
  	834
  835	835	if(ppMode)
  836	836	pp_postprocess(output->data, output->linesize,
  ......	@@ -840,5 +840,5 @@
  840	840	ppMode, ppContext, this->pix_fmt);
  841	841	if(this->vhook)
  842		frame_hook_process((AVPicture *)output, this->pix_fmt, venc->width,venc->height);
  	842	frame_hook_process((AVPicture *)output, this->pix_fmt, venc->width,venc->height, 0);
  843	843
  844	844	if (this->frame_topBand || this->frame_leftBand) {
  ......	@@ -883,5 +883,5 @@
  883	883
  884	884	}
  885		if(e_o_s && !info.video_only
  	885	if((e_o_s && !info.video_only)
  886	886	|| (ret >= 0 && pkt.stream_index == this->audio_index)){
  887	887	this->pts_offset = (double) pkt.pts / AV_TIME_BASE -
  ......	@@ -1736,5 +1736,5 @@
  1736	1736	#endif
  1737	1737	if(info.frontend) {
  1738		fprintf(stderr, "\nf2t ;duration: %d;\n", convert->context->duration / AV_TIME_BASE);
  	1738	fprintf(stderr, "\nf2t ;duration: %d;\n", (int)(convert->context->duration / AV_TIME_BASE));
  1739	1739	}
  1740	1740	else {