Attachment #192645 for bug #271476

Lines 30-35 Link Here

(-)export/export_mov.c.old (+1 lines)
30	#define MOD_CODEC "(video) * \| (audio) *"	30	#define MOD_CODEC "(video) * \| (audio) *"
31		31
32	#include "transcode.h"	32	#include "transcode.h"
		33	#include "libtc/optstr.h"
33	#include "import/magic.h"	34	#include "import/magic.h"
34	#include "encoder.h"	35	#include "encoder.h"
35	#include "libtcvideo/tcvideo.h"	36	#include "libtcvideo/tcvideo.h"

Lines 27-32 Link Here

(-)import/import_mov.c.old (+1 lines)
27	#define MOD_CODEC "(video) * \| (audio) *"	27	#define MOD_CODEC "(video) * \| (audio) *"
28		28
29	#include "transcode.h"	29	#include "transcode.h"
		30	#include "filter.h"
30		31
31	static int verbose_flag = TC_QUIET;	32	static int verbose_flag = TC_QUIET;
32	static int capability_flag = TC_CAP_PCM \| TC_CAP_RGB \| TC_CAP_YUV \|	33	static int capability_flag = TC_CAP_PCM \| TC_CAP_RGB \| TC_CAP_YUV \|




                    val = inptr[x*4] ^ 0x80;
                    break;
                  case SINGLE: {
                    union {float f;uint32_t u;} f;
                    /* Convert from big-endian to native format */
                    f.u = (uint32_t)(inptr[x*4  ]) << 24
                                      | (uint32_t)(inptr[x*4+1]) << 16
                                      | (uint32_t)(inptr[x*4+2]) <<  8
                                      | (uint32_t)(inptr[x*4+3]);
                    val = (int)floor(((f.f - single_base) / single_range) * 255 + 0.5);
                    break;
                  } // SINGLE
                  case DOUBLE: {
                    union {double d; uint64_t u} d;
                    /* Convert from big-endian to native format */
                    d.u = (uint64_t)(inptr[x*8  ]) << 56
                                      | (uint64_t)(inptr[x*8+1]) << 48
                                      | (uint64_t)(inptr[x*8+2]) << 40
                                      | (uint64_t)(inptr[x*8+3]) << 32

                                      | (uint64_t)(inptr[x*8+5]) << 16
                                      | (uint64_t)(inptr[x*8+6]) <<  8
                                      | (uint64_t)(inptr[x*8+7]);
                    val = (int)floor(((d.d - double_base) / double_range) * 255 + 0.5);
                    break;
                  } // DOUBLE
                } // switch (datatype) 

Lines 164-172 Link Here

(-)aclib/accore.c.old (-3 / +3 lines)
164	/* Determine the maximum function number available, and save the vendor	164	/* Determine the maximum function number available, and save the vendor
165	* string */	165	* string */
166	CPUID(0, cpuid_max, ebx, ecx, edx);	166	CPUID(0, cpuid_max, ebx, ecx, edx);
167	((uint32_t )(cpu_vendor )) = ebx;	167	memcpy(cpu_vendor, &ebx, 4);
168	((uint32_t )(cpu_vendor+4)) = edx;	168	memcpy(cpu_vendor+4, &edx, 4);
169	((uint32_t )(cpu_vendor+8)) = ecx;	169	memcpy(cpu_vendor+8, &ecx, 4);
170	cpu_vendor[12] = 0;	170	cpu_vendor[12] = 0;
171	cpuid_ext_max = 0; /* FIXME: how do early CPUs respond to 0x80000000? */	171	cpuid_ext_max = 0; /* FIXME: how do early CPUs respond to 0x80000000? */
172	CPUID(0x80000000, cpuid_ext_max, ebx, ecx, edx);	172	CPUID(0x80000000, cpuid_ext_max, ebx, ecx, edx);

Return to bug 271476

Lines 503-521 Link Here

(-)import/import_pvn.c.old (-6 / +6 lines)
503	val = inptr[x*4] ^ 0x80;	503	val = inptr[x*4] ^ 0x80;
504	break;	504	break;
505	case SINGLE: {	505	case SINGLE: {
506	float f;	506	union {float f;uint32_t u;} f;
507	/* Convert from big-endian to native format */	507	/* Convert from big-endian to native format */
508	((uint32_t )&f) = (uint32_t)(inptr[x*4 ]) << 24	508	f.u = (uint32_t)(inptr[x*4 ]) << 24
509	\| (uint32_t)(inptr[x*4+1]) << 16	509	\| (uint32_t)(inptr[x*4+1]) << 16
510	\| (uint32_t)(inptr[x*4+2]) << 8	510	\| (uint32_t)(inptr[x*4+2]) << 8
511	\| (uint32_t)(inptr[x*4+3]);	511	\| (uint32_t)(inptr[x*4+3]);
512	val = (int)floor(((f - single_base) / single_range) * 255 + 0.5);	512	val = (int)floor(((f.f - single_base) / single_range) * 255 + 0.5);
513	break;	513	break;
514	} // SINGLE	514	} // SINGLE
515	case DOUBLE: {	515	case DOUBLE: {
516	double d;	516	union {double d; uint64_t u} d;
517	/* Convert from big-endian to native format */	517	/* Convert from big-endian to native format */
518	((uint64_t )&d) = (uint64_t)(inptr[x*8 ]) << 56	518	d.u = (uint64_t)(inptr[x*8 ]) << 56
519	\| (uint64_t)(inptr[x*8+1]) << 48	519	\| (uint64_t)(inptr[x*8+1]) << 48
520	\| (uint64_t)(inptr[x*8+2]) << 40	520	\| (uint64_t)(inptr[x*8+2]) << 40
521	\| (uint64_t)(inptr[x*8+3]) << 32	521	\| (uint64_t)(inptr[x*8+3]) << 32
Lines 523-529 Link Here
523	\| (uint64_t)(inptr[x*8+5]) << 16	523	\| (uint64_t)(inptr[x*8+5]) << 16
524	\| (uint64_t)(inptr[x*8+6]) << 8	524	\| (uint64_t)(inptr[x*8+6]) << 8
525	\| (uint64_t)(inptr[x*8+7]);	525	\| (uint64_t)(inptr[x*8+7]);
526	val = (int)floor(((d - double_base) / double_range) * 255 + 0.5);	526	val = (int)floor(((d.d - double_base) / double_range) * 255 + 0.5);
527	break;	527	break;
528	} // DOUBLE	528	} // DOUBLE
529	} // switch (datatype)	529	} // switch (datatype)