diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/spc/gstspc.c | 10 | ||||
| -rw-r--r-- | gst/deinterlace2/tvtime/tomsmocomp/SearchLoopTop.inc | 4 |
3 files changed, 14 insertions, 6 deletions
@@ -1,5 +1,11 @@ 2008-07-08 Sebastian Dröge <sebastian.droege@collabora.co.uk> + * ext/spc/gstspc.c: (spc_setup): + * gst/deinterlace2/tvtime/tomsmocomp/SearchLoopTop.inc: + Don't use declarations after statements in the remaining code. + +2008-07-08 Sebastian Dröge <sebastian.droege@collabora.co.uk> + Patch by: Jonathan Rosser <jonathan dot rosser at rd dot bbc dot co dot uk> diff --git a/ext/spc/gstspc.c b/ext/spc/gstspc.c index 3eee98f0..b8d7810a 100644 --- a/ext/spc/gstspc.c +++ b/ext/spc/gstspc.c @@ -454,16 +454,19 @@ static gboolean spc_setup (GstSpcDec * spc) { guchar *data = GST_BUFFER_DATA (spc->buf); + spc_tag_info *info; + GstTagList *taglist; + guint64 total_duration; if (!spc_negotiate (spc)) { return FALSE; } - spc_tag_info *info = &(spc->tag_info); + info = &(spc->tag_info); spc_tag_get_info (data, GST_BUFFER_SIZE (spc->buf), info); - GstTagList *taglist = gst_tag_list_new (); + taglist = gst_tag_list_new (); if (info->title) gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_TITLE, @@ -506,8 +509,7 @@ spc_setup (GstSpcDec * spc) gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_ENCODER, info->emulator == EMU_ZSNES ? "ZSNES" : "Snes9x", NULL); - guint64 total_duration = - (guint64) (gst_spc_duration (spc) + gst_spc_fadeout (spc)); + total_duration = (guint64) (gst_spc_duration (spc) + gst_spc_fadeout (spc)); gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_DURATION, total_duration, diff --git a/gst/deinterlace2/tvtime/tomsmocomp/SearchLoopTop.inc b/gst/deinterlace2/tvtime/tomsmocomp/SearchLoopTop.inc index 7560f404..64e562b8 100644 --- a/gst/deinterlace2/tvtime/tomsmocomp/SearchLoopTop.inc +++ b/gst/deinterlace2/tvtime/tomsmocomp/SearchLoopTop.inc @@ -17,6 +17,8 @@ int64_t Min_Vals = 0x0000000000000000ull; int64_t Max_Vals = 0x0000000000000000ull; int64_t ShiftMask = 0xfefffefffefffeffull; +long oldbx; + // long is int32 on ARCH_368, int64 on ARCH_AMD64. Declaring it this way // saves a lot of xor's to delete 64bit garbage. @@ -91,8 +93,6 @@ long dst_pitchw = dst_pitch; // local stor so asm can ref #define _oldbx "%18" #endif - long oldbx; - for (y=1; y < FldHeight-1; y++) { // pretend it's indented -->> |