head	1.4;
access;
symbols;
locks; strict;
comment	@# @;


1.4
date	2009.06.19.17.44.36;	author rse;	state Exp;
branches;
next	1.3;
commitid	xedjsj1W7hezzuSt;

1.3
date	2009.06.12.19.07.25;	author rse;	state Exp;
branches;
next	1.2;
commitid	9zOalwLxfsOVfBRt;

1.2
date	2009.03.08.09.20.52;	author rse;	state Exp;
branches;
next	1.1;
commitid	aJW4m0YYtNa16dFt;

1.1
date	2009.03.07.20.19.55;	author rse;	state Exp;
branches;
next	;
commitid	k8AVNjuLrCa7M8Ft;


desc
@@


1.4
log
@upgrading package: flvtoolxx 1.2.0 -> 1.2.1
@
text
@Index: AMFData.h
--- AMFData.h.orig	2009-01-22 02:09:49 +0100
+++ AMFData.h	2009-06-19 19:40:41 +0200
@@@@ -17,13 +17,20 @@@@
 #ifdef __APPLE__
   #include <architecture/byte_order.h>
   #define hton64(x) OSSwapHostToBigInt64(x)
-#else
+#elif defined(__linux__)
   #include <byteswap.h>
   #if __BYTE_ORDER == __LITTLE_ENDIAN
     #define hton64(x) bswap_64(x)
   #else
     #define hton64(x) (x)
   #endif
+#elif defined(__FreeBSD__)
+  #include <sys/endian.h>
+  #if __BYTE_ORDER == __LITTLE_ENDIAN
+    #define hton64(x) bswap64(x)
+  #else
+    #define hton64(x) (x)
+  #endif
 #endif
 
 enum AMFType {
Index: SConscript
--- SConscript.orig	2007-06-05 05:35:40 +0200
+++ SConscript	2009-06-19 19:40:41 +0200
@@@@ -4,6 +4,6 @@@@
                         source = ['flvtool++.cpp',
                                   'AMFData.cpp'],
                         CPPPATH= ['.',
-                                  '/usr/local/include/boost-1_33_1'])
+                                  '@@l_prefix@@/include', '@@l_prefix@@/include/boost'])
 
 Return('flvtoolxx')
Index: SConstruct
--- SConstruct.orig	2009-06-19 05:23:23 +0200
+++ SConstruct	2009-06-19 19:40:41 +0200
@@@@ -1,5 +1,5 @@@@
 libd = '#lib/'
-env = Environment(CPPFLAGS='-ggdb -O3 -Wall', LINKFLAGS='-ggdb')
+env = Environment(CPPFLAGS='-O3', LINKFLAGS='')
 env.TargetSignatures('content')
 
 Export('env libd')
Index: flvtool++.cpp
--- flvtool++.cpp.orig	2009-06-19 05:29:27 +0200
+++ flvtool++.cpp	2009-06-19 19:40:41 +0200
@@@@ -214,6 +214,7 @@@@
             case 2: codec = "H.263"; break;
             case 3: codec = "SCREEN"; break;
             case 4: codec = "VP6"; break;
+            case 5: codec = "VP6A"; break;
             case 6: codec = "SCREEN v2"; break;
             case 7: codec = "H.264"; break;
             default: codec = "(unknown)";
@@@@ -394,7 +395,7 @@@@
           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 3: audio_format_str = "Linear PCM (little endian)"; break;
Index: serialized_buffer.h
--- serialized_buffer.h.orig	2009-06-12 08:58:56 +0200
+++ serialized_buffer.h	2009-06-19 19:40:41 +0200
@@@@ -18,7 +18,7 @@@@
 #define LE32(x) OSSwapLittleToHostInt32(x)
 #define LE64(x) OSSwapLittleToHostInt64(x)
 
-#else // Linux byteswap defs
+#elif defined(__linux__)
 
 #include <byteswap.h>
 #include <endian.h>
@@@@ -39,6 +39,26 @@@@
   #define LE64(x) __bswap_64(x)
 #endif
 
+#elif defined(__FreeBSD__)
+
+#include <sys/endian.h>
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+  #define BE16(x) bswap16(x)
+  #define BE32(x) bswap32(x)
+  #define BE64(x) bswap64(x)
+  #define LE16(x) (x)
+  #define LE32(x) (x)
+  #define LE64(x) (x)
+#else
+  #define BE16(x) (x)
+  #define BE32(x) (x)
+  #define BE64(x) (x)
+  #define LE16(x) bswap16(x)
+  #define LE32(x) bswap32(x)
+  #define LE64(x) bswap64(x)
+#endif
+
 #endif
 
 class end_of_buffer : public std::exception {
@


1.3
log
@upgrading package: flvtoolxx 1.1.7 -> 1.2.0
@
text
@d3 1
a3 1
+++ AMFData.h	2009-06-12 20:59:31 +0200
d28 1
a28 1
+++ SConscript	2009-06-12 20:59:31 +0200
d38 2
a39 2
--- SConstruct.orig	2008-10-17 03:00:36 +0200
+++ SConstruct	2009-06-12 20:59:31 +0200
d48 3
a50 12
--- flvtool++.cpp.orig	2009-06-12 08:59:01 +0200
+++ flvtool++.cpp	2009-06-12 21:01:07 +0200
@@@@ -52,7 +52,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.2.0\nCopyright (c) 2007-2009 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");
@@@@ -209,6 +209,7 @@@@
d58 1
a58 1
@@@@ -389,7 +390,7 @@@@
d69 1
a69 1
+++ serialized_buffer.h	2009-06-12 20:59:31 +0200
@


1.2
log
@fix version and recognize more formats (info from FFmpeg)
@
text
@d3 1
a3 1
+++ AMFData.h	2009-03-08 10:17:14 +0100
d28 1
a28 1
+++ SConscript	2009-03-08 10:17:14 +0100
d39 1
a39 1
+++ SConstruct	2009-03-08 10:17:14 +0100
d48 3
a50 3
--- flvtool++.cpp.orig	2009-01-22 22:46:02 +0100
+++ flvtool++.cpp	2009-03-08 10:17:39 +0100
@@@@ -51,7 +51,7 @@@@
d55 1
a55 1
+    printf("flvtool++ 1.1.7\nCopyright (c) 2007-2008 Dan Weatherford and Facebook, inc.\n");
d59 1
a59 1
@@@@ -208,6 +208,9 @@@@
d64 2
a65 2
+            case 6: codec = "SCREEN2"; break;
+            case 7: codec = "H.264"; break;
d67 1
a67 3
            };
           // Scrape width & height data from the video
@@@@ -295,11 +298,13 @@@@
d75 1
a75 7
             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;
d77 3
a79 3
--- serialized_buffer.h.orig	2008-11-05 01:54:15 +0100
+++ serialized_buffer.h	2009-03-08 10:17:14 +0100
@@@@ -17,7 +17,7 @@@@
d88 1
a88 1
@@@@ -38,6 +38,26 @@@@
@


1.1
log
@new package: flvtoolxx 1.1.7 (Flash Video Manipulation Tool)
@
text
@d3 1
a3 1
+++ AMFData.h	2009-03-07 21:14:29 +0100
d28 1
a28 1
+++ SConscript	2009-03-07 21:14:29 +0100
d39 1
a39 1
+++ SConstruct	2009-03-07 21:14:56 +0100
d47 37
d86 1
a86 1
+++ serialized_buffer.h	2009-03-07 21:14:29 +0100
@