Attachment #190759 for bug #269114

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

Line Link Here

(-)file_not_specified_in_diff (-21 / +26 lines)
0	-- avidemux/ADM_colorspace/ADM_rgb.h	0	++ avidemux/ADM_colorspace/ADM_rgb.h
Lines 19-24 Link Here
19	#ifndef COLYUVRGB_H	19	#ifndef COLYUVRGB_H
20	#define COLYUVRGB_H	20	#define COLYUVRGB_H
21		21
		22	#include <inttypes.h>
		23
22	#define ADM_COLOR_IS_YUV 0x1000	24	#define ADM_COLOR_IS_YUV 0x1000
23	typedef enum	25	typedef enum
24	{	26	{
25	-- avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp	27	++ avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp
Lines 71-77 Link Here
71	*/	71	*/
72	uint8_t fileParser::open( const char filename,FP_TYPE multi )	72	uint8_t fileParser::open( const char filename,FP_TYPE multi )
73	{	73	{
74	char *dot = NULL; // pointer to the last dot in filename	74	const char *dot = NULL; // pointer to the last dot in filename
75	uint8_t decimals = 0; // number of decimals	75	uint8_t decimals = 0; // number of decimals
76	char left = NULL, number = NULL, *right = NULL; // parts of filename (after splitting)	76	char left = NULL, number = NULL, *right = NULL; // parts of filename (after splitting)
77		77
78	-- avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc	78	++ avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc
Lines 104-110 Link Here
104		104
105	int y4m_parse_ratio(y4m_ratio_t r, const char s)	105	int y4m_parse_ratio(y4m_ratio_t r, const char s)
106	{	106	{
107	char *t = strchr(s, ':');	107	const char *t = strchr(s, ':');
108	if (t == NULL) return Y4M_ERR_RANGE;	108	if (t == NULL) return Y4M_ERR_RANGE;
109	r->n = atoi(s);	109	r->n = atoi(s);
110	r->d = atoi(t+1);	110	r->d = atoi(t+1);
111	-- avidemux/ADM_libraries/ADM_mplex/lpcmstrm_in.cpp	111	++ avidemux/ADM_libraries/ADM_mplex/lpcmstrm_in.cpp
Lines 53-59 Link Here
53		53
54	bool LPCMStream::Probe(IBitStream &bs )	54	bool LPCMStream::Probe(IBitStream &bs )
55	{	55	{
56	char *last_dot = strrchr( bs.StreamName(), '.' );	56	const char *last_dot = strrchr( bs.StreamName(), '.' );
57	return	57	return
58	last_dot != NULL	58	last_dot != NULL
59	&& strcmp( last_dot+1, "lpcm") == 0;	59	&& strcmp( last_dot+1, "lpcm") == 0;
60	-- avidemux/ADM_osSupport/ADM_fileio.cpp	60	++ avidemux/ADM_osSupport/ADM_fileio.cpp
Lines 543-549 Link Here
543	*/	543	*/
544	const char GetFileName(const char str)	544	const char GetFileName(const char str)
545	{	545	{
546	char *filename;	546	const char *filename;
547	char *filename2;	547	char *filename2;
548	#ifndef ADM_WIN32	548	#ifndef ADM_WIN32
549	filename = strrchr(str, '/');	549	filename = strrchr(str, '/');
550	-- avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_color.cpp	550	++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_color.cpp
Lines 1-6 Link Here
1	#include <QtGui>	1	#include <QtGui>
2		2
3	#include "../ADM_toolkit/qtToolkit.h"	3	#include "../ADM_toolkit/qtToolkit.h"
		4	#include <stdint.h>
4		5
5	int DIA_colorSel(uint8_t r, uint8_t g, uint8_t *b)	6	int DIA_colorSel(uint8_t r, uint8_t g, uint8_t *b)
6	{	7	{
Lines 17-20 Link Here
17	}	18	}
18		19
19	return 0;	20	return 0;
20	}	21	}
21	-- avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_cnr2.cpp	22	++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_cnr2.cpp
Lines 16-21 Link Here
16	***************************************************************************/	16	***************************************************************************/
17		17
18	#include <math.h>	18	#include <math.h>
		19	#include <stdint.h>
19		20
20	#include "config.h"	21	#include "config.h"
21	#include "ui_cnr2.h"	22	#include "ui_cnr2.h"
22	-- avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_coloryuv.cpp	23	++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_coloryuv.cpp
Lines 16-21 Link Here
16	***************************************************************************/	16	***************************************************************************/
17	#include "config.h"	17	#include "config.h"
18		18
		19	#include <stdint.h>
19	#include <QtGui/QDialog>	20	#include <QtGui/QDialog>
20		21
21	#include "ui_coloryuv.h"	22	#include "ui_coloryuv.h"
22	-- avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.cpp	23	++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.cpp
Lines 13-19 Link Here
13	***************************************************************************/	13	***************************************************************************/
14		14
15	#include "config.h"	15	#include "config.h"
16		16	#include <cstdio>
17	#include <math.h>	17	#include <math.h>
18	#include <QPainter>	18	#include <QPainter>
19	#include <QSlider>	19	#include <QSlider>
20	-- avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.h	20	++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.h
Lines 1-6 Link Here
1	#ifndef ADM_Q_SLIDER_H	1	#ifndef ADM_Q_SLIDER_H
2	#define ADM_Q_SLIDER_H	2	#define ADM_Q_SLIDER_H
3		3	#include <inttypes.h>
4	class ADM_QSlider : public QSlider	4	class ADM_QSlider : public QSlider
5	{	5	{
6	protected:	6	protected:
7	-- avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui_none.cpp	7	++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui_none.cpp
Lines 9-15 Link Here
9	//	9	//
10		10
11	#include "config.h"	11	#include "config.h"
12		12	#include <inttypes.h>
13	#include <QtGui/QApplication>	13	#include <QtGui/QApplication>
14	#include <QtGui/QDesktopWidget>	14	#include <QtGui/QDesktopWidget>
15		15
16	-- avidemux/ADM_video/mmx_macros.h	16	++ avidemux/ADM_video/mmx_macros.h
Lines 353-359 Link Here
353	#define mmx_m2r(op, mem, reg) \	353	#define mmx_m2r(op, mem, reg) \
354	__asm__ __volatile__ (#op " %0, %%" #reg \	354	__asm__ __volatile__ (#op " %0, %%" #reg \
355	: /* nothing */ \	355	: /* nothing */ \
356	: "X" (mem))	356	: "m" (mem))
357		357
358	#define mmx_r2m(op, reg, mem) \	358	#define mmx_r2m(op, reg, mem) \
359	__asm__ __volatile__ (#op " %%" #reg ", %0" \	359	__asm__ __volatile__ (#op " %%" #reg ", %0" \

Return to bug 269114