Attachment #131882 for bug #193705

View | Details | Raw Unified | Return to bug 193705
Collapse All | Expand All




	c->width = info->width;  
	c->height = info->height; 
	
	AVRational fps25 = (AVRational){1001,25025};
	AVRational fps24 = (AVRational){1001,24000};
	AVRational fps30 = (AVRational){1001,30000};
	AVRational fpsfree = (AVRational){1001,_fps1000};

    	switch(_fps1000)
	{
		case 25000:
			 c->time_base= fps25;
			//c->frame_rate = 25025;  
			//c->frame_rate_base = 1001;	
			break;

*/
                        if(_type==MUXER_MP4 || _type==MUXER_PSP)
                        {
                                 c->time_base= fps24;
                                break;
                        }
		case  29970:
			 c->time_base= fps30;
			//c->frame_rate = 30000;  
			//c->frame_rate_base = 1001;	
			break;
		default:
                        if(_type==MUXER_MP4 || _type==MUXER_PSP)
                        {
                                c->time_base= fpsfree;
                                break;
                        }
                        else

Return to bug 193705

Lines 257-266 uint8_t lavMuxer::open(const char *filen Link Here

(-)avidemux_2.3.0/avidemux/ADM_lavformat/ADM_lavformat.cpp (-4 / +9 lines)
257	c->width = info->width;	257	c->width = info->width;
258	c->height = info->height;	258	c->height = info->height;
259		259
		260	AVRational fps25 = (AVRational){1001,25025};
		261	AVRational fps24 = (AVRational){1001,24000};
		262	AVRational fps30 = (AVRational){1001,30000};
		263	AVRational fpsfree = (AVRational){1001,_fps1000};
		264
260	switch(_fps1000)	265	switch(_fps1000)
261	{	266	{
262	case 25000:	267	case 25000:
263	c->time_base= (AVRational){1001,25025};	268	c->time_base= fps25;
264	//c->frame_rate = 25025;	269	//c->frame_rate = 25025;
265	//c->frame_rate_base = 1001;	270	//c->frame_rate_base = 1001;
266	break;	271	break;
Lines 272-289 uint8_t lavMuxer::open(const char *filen Link Here
272	*/	277	*/
273	if(_type==MUXER_MP4 \|\| _type==MUXER_PSP)	278	if(_type==MUXER_MP4 \|\| _type==MUXER_PSP)
274	{	279	{
275	c->time_base= (AVRational){1001,24000};	280	c->time_base= fps24;
276	break;	281	break;
277	}	282	}
278	case 29970:	283	case 29970:
279	c->time_base= (AVRational){1001,30000};	284	c->time_base= fps30;
280	//c->frame_rate = 30000;	285	//c->frame_rate = 30000;
281	//c->frame_rate_base = 1001;	286	//c->frame_rate_base = 1001;
282	break;	287	break;
283	default:	288	default:
284	if(_type==MUXER_MP4 \|\| _type==MUXER_PSP)	289	if(_type==MUXER_MP4 \|\| _type==MUXER_PSP)
285	{	290	{
286	c->time_base= (AVRational){1000,_fps1000};	291	c->time_base= fpsfree;
287	break;	292	break;
288	}	293	}
289	else	294	else