From f0ce1d9909efeb72ea8eefd44d447b7bada1a20c Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 1 Jun 2013 15:38:51 +0200 Subject: [PATCH 1/3] cpu: Restructure code to avoid pointless ret variable indirection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libavutil/cpu.c:133:9: warning: unused variable ‘ret’ [-Wunused-variable] --- libavutil/cpu.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavutil/cpu.c b/libavutil/cpu.c index 17273b638b..6384d6d7e7 100644 --- a/libavutil/cpu.c +++ b/libavutil/cpu.c @@ -130,27 +130,23 @@ int av_parse_cpu_flags(const char *s) int av_cpu_count(void) { - int ret, nb_cpus = 1; + int nb_cpus = 1; #if HAVE_SCHED_GETAFFINITY && defined(CPU_COUNT) cpu_set_t cpuset; CPU_ZERO(&cpuset); - ret = sched_getaffinity(0, sizeof(cpuset), &cpuset); - if (!ret) { + if (!sched_getaffinity(0, sizeof(cpuset), &cpuset)) nb_cpus = CPU_COUNT(&cpuset); - } #elif HAVE_GETPROCESSAFFINITYMASK DWORD_PTR proc_aff, sys_aff; - ret = GetProcessAffinityMask(GetCurrentProcess(), &proc_aff, &sys_aff); - if (ret) + if (GetProcessAffinityMask(GetCurrentProcess(), &proc_aff, &sys_aff)) nb_cpus = av_popcount64(proc_aff); #elif HAVE_SYSCTL && defined(HW_NCPU) int mib[2] = { CTL_HW, HW_NCPU }; size_t len = sizeof(nb_cpus); - ret = sysctl(mib, 2, &nb_cpus, &len, NULL, 0); - if (ret == -1) + if (sysctl(mib, 2, &nb_cpus, &len, NULL, 0) == -1) nb_cpus = 0; #elif HAVE_SYSCONF && defined(_SC_NPROC_ONLN) nb_cpus = sysconf(_SC_NPROC_ONLN); From 9f84ed8cc3ed03213861b653100a85dc39b7f305 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 16 May 2013 00:28:03 +0200 Subject: [PATCH 2/3] nsvdec: Remove commented-out debug cruft --- libavformat/nsvdec.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index ffe43cf335..18ebbe35f4 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -27,10 +27,6 @@ #include "internal.h" #include "libavutil/dict.h" -//#define DEBUG_DUMP_INDEX // XXX dumbdriving-271.nsv breaks with it commented!! -#define CHECK_SUBSEQUENT_NSVS -//#define DISABLE_AUDIO - /* max bytes to crawl for trying to resync * stupid streaming servers don't start at chunk boundaries... */ @@ -371,25 +367,6 @@ static int nsv_parse_NSVf_header(AVFormatContext *s) av_dlog(s, "NSV got index; filepos %"PRId64"\n", avio_tell(pb)); -#ifdef DEBUG_DUMP_INDEX -#define V(v) ((v<0x20 || v > 127)?'.':v) - /* dump index */ - av_dlog(s, "NSV %d INDEX ENTRIES:\n", table_entries); - av_dlog(s, "NSV [dataoffset][fileoffset]\n", table_entries); - for (i = 0; i < table_entries; i++) { - unsigned char b[8]; - avio_seek(pb, size + nsv->nsvs_file_offset[i], SEEK_SET); - avio_read(pb, b, 8); - av_dlog(s, "NSV [0x%08lx][0x%08lx]: %02x %02x %02x %02x %02x %02x %02x %02x" - "%c%c%c%c%c%c%c%c\n", - nsv->nsvs_file_offset[i], size + nsv->nsvs_file_offset[i], - b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7], - V(b[0]), V(b[1]), V(b[2]), V(b[3]), V(b[4]), V(b[5]), V(b[6]), V(b[7]) ); - } - //avio_seek(pb, size, SEEK_SET); /* go back to end of header */ -#undef V -#endif - avio_seek(pb, nsv->base_offset + size, SEEK_SET); /* required for dumbdriving-271.nsv (2 extra bytes) */ if (pb->eof_reached) @@ -480,7 +457,6 @@ static int nsv_parse_NSVs_header(AVFormatContext *s) } } if (atag != T_NONE) { -#ifndef DISABLE_AUDIO st = avformat_new_stream(s, NULL); if (!st) goto fail; @@ -500,15 +476,12 @@ static int nsv_parse_NSVs_header(AVFormatContext *s) avpriv_set_pts_info(st, 64, 1, framerate.num*1000); st->start_time = 0; st->duration = (int64_t)nsv->duration * framerate.num; -#endif } -#ifdef CHECK_SUBSEQUENT_NSVS } else { if (nsv->vtag != vtag || nsv->atag != atag || nsv->vwidth != vwidth || nsv->vheight != vwidth) { av_dlog(s, "NSV NSVs header values differ from the first one!!!\n"); //return -1; } -#endif /* CHECK_SUBSEQUENT_NSVS */ } nsv->state = NSV_HAS_READ_NSVS; From c011ceef78eae66039efc66d9551a7146e08838a Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 16 May 2013 00:28:17 +0200 Subject: [PATCH 3/3] swscale: ppc: Remove commented-out define cruft --- libswscale/ppc/yuv2rgb_altivec.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c index df435fc198..846a4dcfa2 100644 --- a/libswscale/ppc/yuv2rgb_altivec.c +++ b/libswscale/ppc/yuv2rgb_altivec.c @@ -245,8 +245,6 @@ static const vector unsigned char (vector unsigned short) \ vec_max(y, ((vector signed short) { 0 }))) -//#define out_pixels(a, b, c, ptr) vec_mstrgb32(__typeof__(a), ((__typeof__(a)) { 255 }), a, a, a, ptr) - static inline void cvtyuvtoRGB(SwsContext *c, vector signed short Y, vector signed short U, vector signed short V, vector signed short *R, vector signed short *G,