fix version and recognize more formats (info from FFmpeg)

flvtoolxx/flvtoolxx.patch

@@ -1,6 +1,6 @@
 Index: AMFData.h
 --- AMFData.h.orig	2009-01-22 02:09:49 +0100
-+++ AMFData.h	2009-03-07 21:14:29 +0100
++++ AMFData.h	2009-03-08 10:17:14 +0100
 @@ -17,13 +17,20 @@
  #ifdef __APPLE__
    #include <architecture/byte_order.h>
@@ -25,7 +25,7 @@ Index: AMFData.h
  enum AMFType {
 Index: SConscript
 --- SConscript.orig	2007-06-05 05:35:40 +0200
-+++ SConscript	2009-03-07 21:14:29 +0100
++++ SConscript	2009-03-08 10:17:14 +0100
 @@ -4,6 +4,6 @@
                          source = ['flvtool++.cpp',
                                    'AMFData.cpp'],
@@ -36,7 +36,7 @@ Index: SConscript
  Return('flvtoolxx')
 Index: SConstruct
 --- SConstruct.orig	2008-10-17 03:00:36 +0200
-+++ SConstruct	2009-03-07 21:14:56 +0100
++++ SConstruct	2009-03-08 10:17:14 +0100
 @@ -1,5 +1,5 @@
  libd = '#lib/'
 -env = Environment(CPPFLAGS='-ggdb -O3 -Wall', LINKFLAGS='-ggdb')
@@ -44,9 +44,46 @@ Index: SConstruct
  env.TargetSignatures('content')
  
  Export('env libd')
+Index: flvtool++.cpp
+--- flvtool++.cpp.orig	2009-01-22 22:46:02 +0100
++++ flvtool++.cpp	2009-03-08 10:17:39 +0100
+@@ -51,7 +51,7 @@
+ 
+ int main(int argc, char* argv[]) {
+   if (argc < 2) {
+-    printf("flvtool++ 1.1.6\nCopyright (c) 2007-2008 Dan Weatherford and Facebook, inc.\n");
++    printf("flvtool++ 1.1.7\nCopyright (c) 2007-2008 Dan Weatherford and Facebook, inc.\n");
+     printf("http://developers.facebook.com/opensource.php\n");
+     printf("Published under the BSD license.\n\n");
+     printf("usage: flvtool++ [options] [input filename] [output filename]\n");
+@@ -208,6 +208,9 @@
+             case 2: codec = "H.263"; break;
+             case 3: codec = "SCREEN"; break;
+             case 4: codec = "VP6"; break;
++            case 5: codec = "VP6A"; break;
++            case 6: codec = "SCREEN2"; break;
++            case 7: codec = "H.264"; break;
+             default: codec = "(unknown)";
+            };
+           // Scrape width & height data from the video
+@@ -295,11 +298,13 @@
+           onMetaData->dmap["stereo"] = shared_ptr<AMFData>(new AMFBoolean(stereo));
+           const char* audio_format_str = NULL;
+           switch (audio_format) {
+-            case 0: audio_format_str = "Uncompressed"; break;
++            case 0: audio_format_str = "Uncompressed (PCM)"; break;
+             case 1: audio_format_str = "ADPCM"; break;
+             case 2: audio_format_str = "MP3"; break;
+             case 5: audio_format_str = "NellyMoser (8kHz Mono special case)"; break;
+             case 6: audio_format_str = "NellyMoser"; break;
++            case 10: audio_format_str = "AAC"; break;
++            case 11: audio_format_str = "Speex"; break;
+           }
+           printf("Audio: %dHz %dbit %s, codec ID %d (%s)\n", audio_rate, audio_sample_size, (stereo ? "stereo" : "mono"), audio_format, audio_format_str);
+           have_audio_params = true;
 Index: serialized_buffer.h
 --- serialized_buffer.h.orig	2008-11-05 01:54:15 +0100
-+++ serialized_buffer.h	2009-03-07 21:14:29 +0100
++++ serialized_buffer.h	2009-03-08 10:17:14 +0100
 @@ -17,7 +17,7 @@
  #define LE32(x) OSSwapLittleToHostInt32(x)
  #define LE64(x) OSSwapLittleToHostInt64(x)

flvtoolxx/flvtoolxx.spec

@@ -32,7 +32,7 @@ Class:        EVAL
 Group:        Video
 License:      BSD
 Version:      1.1.7
-Release:      20090307
+Release:      20090308
 
 #   list of sources
 Source0:      http://mirror.facebook.com/facebook/flvtool++/flvtool++-%{version}.tar.gz