[flvmeta] 15 new revisions pushed by marc.noi...@gmail.com on 2013-02-17 20:33 GMT
5 views
Skip to first unread message
flv...@googlecode.com
Feb 17, 2013, 3:34:09 PM2/17/13
to flvme...@googlegroups.com
15 new revisions:
Revision: a4dc1588496d
Author: Neutron Soutmun <neo.n...@gmail.com>
Date: Fri Oct 12 02:57:38 2012
Log: Fix spelling error in manpage...
http://code.google.com/p/flvmeta/source/detail?r=a4dc1588496d
Revision: 593fe475bdb4
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jul 21 02:46:12 2012
Log: Removed support for the Autotools build system.
http://code.google.com/p/flvmeta/source/detail?r=593fe475bdb4
Revision: 28cc189bef4e
Author: Marc Noirot <marc....@gmail.com>
Date: Thu Oct 18 02:25:14 2012
Log: Updated software version to 1.1.0.1.
http://code.google.com/p/flvmeta/source/detail?r=28cc189bef4e
Revision: 9dc6906819f3
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jul 21 03:28:31 2012
Log: Updated CMakeLists.txt to version 1.2.
http://code.google.com/p/flvmeta/source/detail?r=9dc6906819f3
Revision: 702a50595101
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jul 21 03:29:39 2012
Log: Updated INSTALL file to contain CMake-specific build and
installation ...
http://code.google.com/p/flvmeta/source/detail?r=702a50595101
Revision: ba399ed07826
Author: Neutron Soutmun <neo.n...@gmail.com>
Date: Fri Oct 12 02:57:38 2012
Log: Fix spelling error in manpage...
http://code.google.com/p/flvmeta/source/detail?r=ba399ed07826
Revision: 160b946c723b
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jul 21 09:45:27 2012
Log: Added a schema and a sample file to specify metadata injection.
http://code.google.com/p/flvmeta/source/detail?r=160b946c723b
Revision: 113e317922ea
Author: Marc Noirot <marc....@gmail.com>
Date: Thu Oct 18 01:13:50 2012
Log: Merge pull request #4 from
neutronth/fix-spelling-error-in-manpage...
http://code.google.com/p/flvmeta/source/detail?r=113e317922ea
Revision: 93652ed01edc
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jul 21 11:41:54 2012
Log: Updated injection schema for improved clarity....
http://code.google.com/p/flvmeta/source/detail?r=93652ed01edc
Revision: 9d3d30dd3f05
Author: Marc Noirot <marc....@gmail.com>
Date: Thu Oct 18 02:28:16 2012
Log: Updated THANKS file.
http://code.google.com/p/flvmeta/source/detail?r=9d3d30dd3f05
Revision: c515ca9b17e4
Author: Marc Noirot <marc....@gmail.com>
Date: Mon Aug 6 05:25:48 2012
Log: Added usage text for the inject command.
http://code.google.com/p/flvmeta/source/detail?r=c515ca9b17e4
Revision: 1f50699bdc99
Author: Marc Noirot <marc....@gmail.com>
Date: Mon Dec 10 07:57:34 2012
Log: Added FLV buffer copy helper functions.
http://code.google.com/p/flvmeta/source/detail?r=1f50699bdc99
Revision: 7294984acd84
Author: Marc Noirot <marc....@gmail.com>
Date: Fri Dec 28 03:05:07 2012
Log: Added typedef and constants for AVC packet types.
http://code.google.com/p/flvmeta/source/detail?r=7294984acd84
Revision: d0271d2d117a
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jan 5 04:20:36 2013
Log: Updated copyright notices to 2013.
http://code.google.com/p/flvmeta/source/detail?r=d0271d2d117a
Revision: 1e9a602367f1
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jan 5 05:26:45 2013
Log: Fixed FLVMeta product spelling.
http://code.google.com/p/flvmeta/source/detail?r=1e9a602367f1
==============================================================================
Revision: a4dc1588496d
Author: Neutron Soutmun <neo.n...@gmail.com>
Date: Fri Oct 12 02:57:38 2012
Log: Fix spelling error in manpage
* Lintian (Debian package tool) has warned the spelling error in
manpage.
http://code.google.com/p/flvmeta/source/detail?r=a4dc1588496d
Modified:
/man/flvmeta.1.md
=======================================
--- /man/flvmeta.1.md Thu May 3 07:56:29 2012
+++ /man/flvmeta.1.md Fri Oct 12 02:57:38 2012
@@ -81,7 +81,7 @@
## -C, \--check
Print a report to standard output listing warnings and errors detected in
-*INPUT_FILE*, as well as potential incompatibilities, and informations
about
+*INPUT_FILE*, as well as potential incompatibilities, and information about
the codecs used in the file. The exit code will be set to a non-zero value
if there is at least one error in the file.
@@ -99,8 +99,8 @@
* **fatal**: messages that inform of errors that make further file reading
impossible therefore ending parsing completely
-The **\--level** option allows to limit the display of messages to a
minimum
-level among those, for example if the user is only interested in error
+The **\--level** option allows **flvmeta** to limit the display of
messages to
+a minimum level among those, for example if the user is only interested in
error
messages and above.
Each message or message template presented to the user is identified by a
@@ -146,7 +146,7 @@
the operation. This is due to the fact that the output file is written
while the original file is being read due to the two-pass method.
-The computed metadata contains among other data full keyframe informations,
+The computed metadata contains among other data full keyframe information,
in order to allow HTTP pseudo-streaming and random-access seeking in the
file.
==============================================================================
Revision: 593fe475bdb4
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jul 21 02:46:12 2012
Log: Removed support for the Autotools build system.
http://code.google.com/p/flvmeta/source/detail?r=593fe475bdb4
Deleted:
/Makefile.am
/autogen.sh
/configure.ac
/man/Makefile.am
/schemas/Makefile.am
/src/Makefile.am
/src/libyaml/Makefile.am
/tests/Makefile.am
=======================================
--- /Makefile.am Thu May 3 08:05:20 2012
+++ /dev/null
@@ -1,10 +0,0 @@
-if BUILD_MAN
- MAN_SUBDIR = man
-endif
-
-SUBDIRS = src tests schemas $(MAN_SUBDIR)
-EXTRA_DIST = autogen.sh \
- CMakeLists.txt \
- .gitignore \
- config-cmake.h.in \
- cmake/modules/FindLibYAML.cmake
=======================================
--- /autogen.sh Tue May 6 12:46:13 2008
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-if aclocal && autoheader && automake -a && autoconf; then
- echo "Next, run ./configure && make"
-else
- echo
- echo "An error occured."
- exit 1
-fi
=======================================
--- /configure.ac Thu May 3 03:49:12 2012
+++ /dev/null
@@ -1,78 +0,0 @@
-dnl -*- Autoconf -*-
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.61)
-
-AC_INIT([flvmeta], [1.1.0], [flvmeta-d...@googlegroups.com])
-AC_CONFIG_SRCDIR([config.h.in])
-AC_CONFIG_HEADER([config.h])
-AM_INIT_AUTOMAKE
-AC_LANG([C])
-
-dnl Checks for programs.
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_RANLIB
-
-dnl Checks for pandoc
-AC_ARG_VAR(PANDOC, [pandoc path])
-AC_PATH_PROG(PANDOC, [pandoc], [])
-
-AM_CONDITIONAL([BUILD_MAN], [test -x "$PANDOC"])
-
-dnl Checks for check.
-ifdef([PKG_CHECK_MODULES],
- [PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],
- [have_check=yes],
- [have_check=no]
- )]
-)
-AM_CONDITIONAL([MAKE_TESTS], [test "$have_check" = yes])
-
-dnl Checks for --with-system-libs
-AC_ARG_WITH([system-libs],
- [AC_HELP_STRING([--with-system-libs], [Build with system libraries])]
-)
-AM_CONDITIONAL([USE_SYSTEM_LIBS], [test "x$with_system_libs" = "xyes"])
-
-if test "x$with_system_libs" = "xyes"; then
- PKG_CHECK_MODULES([YAML], [yaml-0.1 >= 0.1.3])
-fi
-
-dnl Checks for header files.
-AC_CHECK_HEADERS([stdlib.h stdio.h string.h])
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_C_BIGENDIAN
-AC_TYPE_SIZE_T
-AC_TYPE_UINT8_T
-AC_TYPE_UINT16_T
-AC_TYPE_INT16_T
-AC_TYPE_UINT32_T
-AC_TYPE_INT32_T
-AC_TYPE_UINT64_T
-AC_TYPE_INT64_T
-AC_CHECK_SIZEOF([float])
-AC_CHECK_SIZEOF([double])
-AC_CHECK_SIZEOF([long double])
-
-dnl Checks for large file support
-AC_SYS_LARGEFILE
-AC_FUNC_FSEEKO
-
-dnl Checks for library functions.
-AC_FUNC_MALLOC
-AC_FUNC_STRFTIME
-AC_CHECK_FUNCS([tzset])
-
-dnl Output files
-AC_CONFIG_FILES([
-Makefile
-src/Makefile
-src/libyaml/Makefile
-tests/Makefile
-schemas/Makefile
-man/Makefile
-])
-AC_OUTPUT
=======================================
--- /man/Makefile.am Mon Apr 23 06:57:23 2012
+++ /dev/null
@@ -1,8 +0,0 @@
-man_MANS = $(builddir)/flvmeta.1
-
-CLEANFILES = $(builddir)/flvmeta.1
-
-flvmeta.1: $(srcdir)/flvmeta.1.md
- pandoc -s $(srcdir)/flvmeta.1.md -o $(builddir)/flvmeta.1
-
-EXTRA_DIST = $(srcdir)/flvmeta.1.md
=======================================
--- /schemas/Makefile.am Mon Mar 8 06:42:47 2010
+++ /dev/null
@@ -1,3 +0,0 @@
-EXTRA_DIST = Amf0.xsd \
- flv.xsd \
- report.xsd
=======================================
--- /src/Makefile.am Tue Nov 22 11:31:26 2011
+++ /dev/null
@@ -1,52 +0,0 @@
-bin_PROGRAMS = flvmeta
-
-if USE_SYSTEM_LIBS
-EXPORT_CFLAGS = $(YAML_CFLAGS)
-EXPORT_LDADD = $(YAML_LIBS)
-else
-SUBDIRS = libyaml
-EXPORT_CFLAGS = -I@srcdir@/libyaml
-EXPORT_LDADD = @builddir@/libyaml/libyaml.a
-endif
-
-AM_CFLAGS = -Wall $(EXPORT_CFLAGS)
-flvmeta_LDADD = $(EXPORT_LDADD)
-
-flvmeta_SOURCES = amf.c \
- amf.h \
- avc.c \
- avc.h \
- check.c \
- check.h \
- dump.c \
- dump.h \
- dump_json.c \
- dump_json.h \
- dump_raw.c \
- dump_raw.h \
- dump_xml.c \
- dump_xml.h \
- dump_yaml.c \
- dump_yaml.h \
- flv.c \
- flv.h \
- flvmeta.c \
- flvmeta.h \
- info.c \
- info.h \
- json.c \
- json.h \
- types.c \
- types.h \
- update.c \
- update.h \
- util.c \
- util.h
-
-EXTRA_DIST = CMakeLists.txt \
- compat/gettext.h \
- compat/getopt.h \
- compat/getopt.c \
- compat/getopt1.c \
- compat/win32_tmpfile.c \
- compat/win32_tmpfile.h
=======================================
--- /src/libyaml/Makefile.am Mon Feb 8 05:25:22 2010
+++ /dev/null
@@ -1,7 +0,0 @@
-noinst_LIBRARIES = libyaml.a
-
-libyaml_a_CFLAGS = -DHAVE_CONFIG_H
-
-libyaml_a_SOURCES = api.c config.h dumper.c emitter.c loader.c parser.c
reader.c scanner.c writer.c yaml.h yaml_private.h
-
-EXTRA_DIST = CMakeLists.txt
=======================================
--- /tests/Makefile.am Mon Apr 12 03:00:28 2010
+++ /dev/null
@@ -1,15 +0,0 @@
-if MAKE_TESTS
- TESTS = check_flvmeta
- check_PROGRAMS = check_flvmeta
- check_flvmeta_SOURCES = check_flvmeta.c \
- check_amf.c \
- check_flv.c \
- $(top_srcdir)/src/amf.h \
- $(top_srcdir)/src/flv.h \
- $(top_srcdir)/src/types.h
- check_flvmeta_CFLAGS = -I$(top_srcdir) @CHECK_CFLAGS@
- check_flvmeta_LDADD = @CHECK_LIBS@ \
- $(top_builddir)/src/amf.o \
- $(top_builddir)/src/flv.o \
- $(top_builddir)/src/types.o
-endif
==============================================================================
Revision: 28cc189bef4e
Author: Marc Noirot <marc....@gmail.com>
Date: Thu Oct 18 02:25:14 2012
Log: Updated software version to 1.1.0.1.
http://code.google.com/p/flvmeta/source/detail?r=28cc189bef4e
Modified:
/CMakeLists.txt
/NEWS
/THANKS
/configure.ac
=======================================
--- /CMakeLists.txt Thu May 3 03:54:03 2012
+++ /CMakeLists.txt Thu Oct 18 02:25:14 2012
@@ -3,7 +3,7 @@
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules
${CMAKE_MODULE_PATH})
-set(FLVMETA_VERSION "1.1.0")
+set(FLVMETA_VERSION "1.1.0.1")
set(FLVMETA_RELEASE yes)
# check whether we are building a release or a git snapshot
=======================================
--- /NEWS Thu May 3 03:49:12 2012
+++ /NEWS Thu Oct 18 02:25:14 2012
@@ -1,3 +1,7 @@
+Version 1.1.0.1 (2012-10-18)
+ - No change in the code.
+ - Fixed spelling errors in the man page.
+
Version 1.1.0 (2012-05-03)
- Beta release. All features should be considered relatively
stable unless explicitely stated otherwise.
=======================================
--- /THANKS Mon Jun 27 08:07:21 2011
+++ /THANKS Thu Oct 18 02:25:14 2012
@@ -1,9 +1,9 @@
I would like to thank the following contributors:
+Neutron Soutmun <neo.n...@gmail.com> - spelling fixes, patches and
Debian package maintenance
Eric Priou <erixt...@gmail.com> - support and MacOSX builds
Zou Guangxian <zougua...@gmail.com> - VP60 related bug fix
nicma...@yahoo.com - malformed metadata related bug fix
Robert M. Hall, II <rh...@impossibilities.com> - sample files to implement
extended timestamp support
pod...@gmail.com - extended timestamp related bug report
Anton Gorodchanin <anton.go...@gmail.com> - command line and AVC
bugfixes
-Neutron Soutmun <neo.n...@gmail.com> - spelling fixes, patches and
Debian package maintenance
=======================================
--- /configure.ac Thu May 3 03:49:12 2012
+++ /configure.ac Thu Oct 18 02:25:14 2012
@@ -3,7 +3,7 @@
AC_PREREQ(2.61)
-AC_INIT([flvmeta], [1.1.0], [flvmeta-d...@googlegroups.com])
+AC_INIT([flvmeta], [1.1.0.1], [flvmeta-d...@googlegroups.com])
AC_CONFIG_SRCDIR([config.h.in])
AC_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE
==============================================================================
Revision: 9dc6906819f3
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jul 21 03:28:31 2012
Log: Updated CMakeLists.txt to version 1.2.
http://code.google.com/p/flvmeta/source/detail?r=9dc6906819f3
Modified:
/CMakeLists.txt
=======================================
--- /CMakeLists.txt Thu May 3 03:54:03 2012
+++ /CMakeLists.txt Sat Jul 21 03:28:31 2012
@@ -3,8 +3,8 @@
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules
${CMAKE_MODULE_PATH})
-set(FLVMETA_VERSION "1.1.0")
-set(FLVMETA_RELEASE yes)
+set(FLVMETA_VERSION "1.2")
+set(FLVMETA_RELEASE no)
# check whether we are building a release or a git snapshot
if(NOT FLVMETA_RELEASE)
==============================================================================
Revision: 702a50595101
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jul 21 03:29:39 2012
Log: Updated INSTALL file to contain CMake-specific build and
installation instruction, courtesy of the MariaDB project INSTALL file.
http://code.google.com/p/flvmeta/source/detail?r=702a50595101
Modified:
/INSTALL
=======================================
--- /INSTALL Wed Sep 19 14:42:36 2007
+++ /INSTALL Sat Jul 21 03:29:39 2012
@@ -1,229 +1,243 @@
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
+Copyright (c) 2012 Marc Noirot
- This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+How to Build FLVmeta with CMake
-Basic Installation
-==================
+WHAT YOU NEED
+---------------------------------------------------------------
+CMake version 2.6 or later installed on your system.
- These are generic installation instructions.
+HOW TO INSTALL:
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
+Linux distributions:
+shell> sudo apt-get install cmake
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
+The above works on Debian/Ubuntu based distributions. On others, the
command
+line needs to be modified to e.g "yum install" on Fedora or "zypper
install"
+on OpenSUSE.
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
+OpenSolaris:
+shell> pfexec pkgadd install SUNWcmake
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+Windows and Mac OSX:
+Download and install the latest distribution from
+http://www.cmake.org/cmake/resources/software.html
+On Windows, download installer exe file and run it. On MacOS, download
+the .dmg image and open it.
-The simplest way to compile this package is:
+Other Unixes:
+Precompiled packages for other Unix flavors (HPUX, AIX) are available from
+http://www.cmake.org/cmake/resources/software.html
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+Alternatively, you can build from source, source package is also available
on
+CMake download page.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
- 2. Type `make' to compile the package.
+Compiler Tools
+--------------
+You will need a working compiler and make utility on your OS.
+On Windows, install Visual Studio (Express editions will work too).
+On Mac OSX, install Xcode tools.
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
- 4. Type `make install' to install the programs and any data files and
- documentation.
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
+BUILD
+---------------------------------------------------------------
+Ensure that compiler and cmake are in PATH.
+The following description assumes that current working directory
+is the source directory.
-Compilers and Options
-=====================
- Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. Run `./configure --help'
-for details on some of the pertinent environment variables.
+- Generic build on Unix, using "Unix Makefiles" generator
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
+shell>cmake .
+shell>make
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+Note: by default, cmake build is less verbose than automake build. Use
+"make VERBOSE=1" if you want to see add command lines for each compiled
source.
- *Note Defining Variables::, for more details.
+- Windows, using "Visual Studio 9 2008" generator
+shell>cmake . -G "Visual Studio 9 2008"
+shell>devenv flvmeta.sln /build /relwithdebinfo
+(alternatively, open flvmeta.sln and build using the IDE)
-Compiling For Multiple Architectures
-====================================
+- Windows, using "NMake Makefiles" generator
+shell>cmake . -G "NMake Makefiles"
+shell>nmake
- You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+- Mac OSX build with Xcode
+shell>cmake . -G Xcode
+shell>xcodebuild -configuration Relwithdebinfo
+(alternatively, open flvmeta.xcodeproj and build using the IDE)
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+Command line build with CMake 2.8
+After creating project with cmake -G as above, issue
+cmake . --build
+this works with any CMake generator.
-Installation Names
-==================
+For Visual Studio and Xcode you might want to add an extra
+configuration parameter, to avoid building all configurations.
- By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
+cmake . --build --config Relwithdebinfo
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+Building "out-of-source"
+---------------------------------------------------------------
+Building out-of-source provides additional benefits. For example it allows
to
+build both Release and Debug configurations using the single source tree.Or
+build the same source with different version of the same compiler or with
+different compilers. Also you will prevent polluting the source tree with
the
+objects and binaries produced during the make.
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+Here is an example on how to do it (generic Unix), assuming the source
tree is
+in directory named src and the current working directory is source root.
-Optional Features
-=================
+shell>mkdir ../build # build directory is called build
+shell>cd ../build
+shell>cmake ../src
- Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
+Note: if a directory was used for in-source build, out-of-source will
+not work. To reenable out-of-source build, remove
<source-root>/CMakeCache.txt
+file.
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-Specifying the System Type
-==========================
+CONFIGURATION PARAMETERS
+---------------------------------------------------------------
+The procedure above will build with default configuration.
- There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on. Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
+Let's you want to change the configuration parameters and have archive
+storage engine compiled into the server instead of building it as pluggable
+module.
+
+1)You can provide parameters on the command line, like
+
+shell> cmake . -DFLVMETA_USE_SYSTEM_LIBYAML=1
+
+This can be done during the initial configuration or any time later.
+
+Note, that parameters are "sticky", that is they are remebered in the CMake
+cache (CMakeCache.txt file in the build directory)
+
+2) Configuration using cmake-gui (Windows, OSX, or Linux with cmake-gui
+installed)
+
+From the build directory, issue
+shell> cmake-gui .
+
+- Check the FLVMETA_USE_SYSTEM_LIBYAML checkbox
+- Click on "Configure" button
+- Click on "Generate" button
+- Close cmake-gui
+shell> make
+
+3)Using ccmake (Unix)
+ccmake is curses-based GUI application that provides the same functionality
+as cmake-gui. It is less user-friendly compared to cmake-gui but works also
+on exotic Unixes like HPUX, AIX or Solaris.
+
+Besides storage engines, probably the most important parameter from a
+developer's point of view is CMAKE_BUILD_TYPE (this allows to build server
with
+dbug tracing library and with debug compile flags).
+
+After changing the configuration, recompile using
+shell> make
+
+
+Listing configuration parameters
+---------------------------------------------------------------
+shell> cmake -L
+
+Gives a brief overview of important configuration parameters (dump to
stdout)
+
+shell> cmake -LH
+
+Does the same but also provides a short help text for each parameter.
+
+shell> cmake -LAH
+
+Dumps all config parameters (including advanced) to the stdout.
+
+PACKAGING
+---------------------------------------------------------------
+-- Binary distribution --
+Packaging in form of tar.gz archives (or .zip on Windows) is also supported
+To create a tar.gz package,
- CPU-COMPANY-SYSTEM
+1)If you're using "generic" Unix build with makefiles
-where SYSTEM can have one of these forms:
+shell> make package
+this will create a tar.gz file in the top level build directory.
- OS KERNEL-OS
+2)On Windows, using "NMake Makefiles" generator
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
+shell> nmake package
- If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
-produce code for.
+3)On Windows, using "Visual Studio" generator
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
+shell> devenv flvmeta.sln /build relwithdebinfo /project package
-Sharing Defaults
-================
+Note On Windows, 7Zip or Winzip must be installed and 7z.exe rsp winzip.exe
+need to be in the PATH.
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-Defining Variables
-==================
+Another way to build packages is calling cpack executable directly like
+shell> cpack -G TGZ --config CPackConfig.cmake
+(-G TGZ is for tar.gz generator, there is also -GZIP)
- Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
+-- Source distribution --
+"make package_source" target is provided.
- ./configure CC=/usr/local2/bin/gcc
+ADDITIONAL MAKE TARGETS: "make install" AND "make test"
+----------------------------------------------------------------
+install target also provided for Makefile based generators. Installation
+directory can be controlled using configure-time parameter
+CMAKE_INSTALL_PREFIX (default is /usr/local. It is also possible to
install to
+non-configured directory, using
-will cause the specified gcc to be used as the C compiler (unless it is
-overridden in the site shell script).
+shell> make install DESTDIR="/some/absolute/path"
-`configure' Invocation
-======================
+"make test" runs unit tests (uses CTest for it)
- `configure' recognizes the following options to control how it
-operates.
+FOR PROGRAMMERS: WRITING PLATFORM CHECKS
+--------------------------------------------------------------
+If you modify FLVmeta source and want to add a new platform check,please
read
+http://www.vtk.org/Wiki/CMake_HowToDoPlatformChecks first.
-`--help'
-`-h'
- Print a summary of the options to `configure', and exit.
+Bigger chunks of functionality, for example non-trivial macros are
implemented
+in files <src-root>/cmake subdirectory.
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
+For people with autotools background, it is important to remember CMake
does
+not provide autoheader functionality. That is, when you add a check
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
+CHECK_FUNCTION_EXISTS(foo HAVE_FOO)
+to config.cmake, then you will also need to add
+#cmakedefine HAVE_FOO 1
+to config.h.cmake
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
+Troubleshooting platform checks
+--------------------------------
+If you suspect that a platform check returned wrong result, examine
+<build-root>/CMakeFiles/CMakeError.log and
+<build-root>/CMakeFiles/CMakeOutput.log
+These files they contain compiler command line, and exact error messages.
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
+Troubleshooting CMake code
+----------------------------------
+While there are advanced flags for cmake like -debug-trycompile and
--trace,
+a simple and efficient way to debug to add
+MESSAGE("interesting variable=${some_invariable}")
+to the interesting places in CMakeLists.txt
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
+Tips:
+- When using Makefile generator it is easy to examine which compiler flags
are
+used to build. For example, compiler flags for flvmeta are in
+<build-root>/src/CMakeFiles/flvmeta.dir/flags.make and the linker command
line
+is in <build-root>/src/CMakeFiles/flvmeta.dir/link.txt
+- CMake caches results of platform checks in CMakeCache.txt. It is a nice
+feature because tests do not rerun when reconfiguring (e.g when a new test
was
+added).The downside of caching is that when a platform test was wrong and
was
+later corrected, the cached result is still used. If you encounter this
+situation, which should be a rare occation, you need either to remove the
+offending entry from CMakeCache.txt (if test was for HAVE_FOO, remove lines
+containing HAVE_FOO from CMakeCache.txt) or just remove the cache file.
==============================================================================
Revision: ba399ed07826
Author: Neutron Soutmun <neo.n...@gmail.com>
Date: Fri Oct 12 02:57:38 2012
Log: Fix spelling error in manpage
* Lintian (Debian package tool) has warned the spelling error in
manpage.
http://code.google.com/p/flvmeta/source/detail?r=ba399ed07826
Modified:
/man/flvmeta.1.md
=======================================
--- /man/flvmeta.1.md Thu May 3 07:56:29 2012
+++ /man/flvmeta.1.md Fri Oct 12 02:57:38 2012
@@ -81,7 +81,7 @@
## -C, \--check
Print a report to standard output listing warnings and errors detected in
-*INPUT_FILE*, as well as potential incompatibilities, and informations
about
+*INPUT_FILE*, as well as potential incompatibilities, and information about
the codecs used in the file. The exit code will be set to a non-zero value
if there is at least one error in the file.
@@ -99,8 +99,8 @@
* **fatal**: messages that inform of errors that make further file reading
impossible therefore ending parsing completely
-The **\--level** option allows to limit the display of messages to a
minimum
-level among those, for example if the user is only interested in error
+The **\--level** option allows **flvmeta** to limit the display of
messages to
+a minimum level among those, for example if the user is only interested in
error
messages and above.
Each message or message template presented to the user is identified by a
@@ -146,7 +146,7 @@
the operation. This is due to the fact that the output file is written
while the original file is being read due to the two-pass method.
-The computed metadata contains among other data full keyframe informations,
+The computed metadata contains among other data full keyframe information,
in order to allow HTTP pseudo-streaming and random-access seeking in the
file.
==============================================================================
Revision: 160b946c723b
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jul 21 09:45:27 2012
Log: Added a schema and a sample file to specify metadata injection.
http://code.google.com/p/flvmeta/source/detail?r=160b946c723b
Added:
/schemas/TestInject.xml
/schemas/inject.xsd
=======================================
--- /dev/null
+++ /schemas/TestInject.xml Sat Jul 21 09:45:27 2012
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inject xmlns="http://schemas.flvmeta.org/inject/1.0/"
xmlns:amf="http://schemas.flvmeta.org/AMF0/1.0/">
+ <insert name="onRandomPoint">
+ <offset>298125</offset>
+ <amf:associativeArray>
+ <amf:entry name="toto">
+ <amf:string>value</amf:string>
+ </amf:entry>
+ </amf:associativeArray>
+ </insert>
+
+ <update>
+ <tag name="onMetadata" match="first" />
+ <amf:associativeArray>
+ <amf:entry name="test">
+ <amf:boolean value="true"/>
+ </amf:entry>
+ </amf:associativeArray>
+ </update>
+
+ <delete>
+ <tag name="onCuePoint" match="all" />
+ </delete>
+
+ <replace>
+ <timestamp>123587</timestamp>
+ <amf:object>
+ <amf:entry name="test2">
+ <amf:number value="42" />
+ </amf:entry>
+ </amf:object>
+ </replace>
+
+ <append name="onFileEnd">
+ <amf:array>
+ <amf:number value="12.3" />
+ <amf:string>hello value</amf:string>
+ <amf:boolean value="false"/>
+ </amf:array>
+ </append>
+</inject>
=======================================
--- /dev/null
+++ /schemas/inject.xsd Sat Jul 21 09:45:27 2012
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema targetNamespace="http://schemas.flvmeta.org/inject/1.0/"
+ elementFormDefault="qualified"
+ xmlns="http://schemas.flvmeta.org/inject/1.0/"
+ xmlns:amf="http://schemas.flvmeta.org/AMF0/1.0/"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+>
+ <xs:import namespace="http://schemas.flvmeta.org/AMF0/1.0/"
schemaLocation="Amf0.xsd"/>
+
+ <xs:element name="inject">
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:choice>
+ <xs:element name="insert" type="tInsertAction" />
+ <xs:element name="replace" type="tUpdateAction" />
+ <xs:element name="update" type="tUpdateAction" />
+ <xs:element name="delete" type="tDeleteAction" />
+ <xs:element name="append" type="tAppendAction" />
+ </xs:choice>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:simpleType name="tFileOffset">
+ <xs:union>
+ <xs:simpleType>
+ <xs:restriction base="xs:unsignedLong"/>
+ </xs:simpleType>
+ </xs:union>
+ </xs:simpleType>
+
+ <xs:simpleType name="tMatchValue">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="first" />
+ <xs:enumeration value="last" />
+ <xs:enumeration value="all" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:group name="tLocation">
+ <xs:choice>
+ <xs:element name="offset" type="tFileOffset"/>
+ <xs:element name="timestamp" type="xs:unsignedInt" />
+ <xs:element name="tag">
+ <xs:complexType>
+ <xs:attribute name="name" type="xs:string"
use="required" />
+ <xs:attribute name="match" type="tMatchValue"
use="optional" default="first" />
+ </xs:complexType>
+ </xs:element>
+ </xs:choice>
+ </xs:group>
+
+ <xs:group name="tUpdateData">
+ <xs:sequence>
+ <xs:group minOccurs="1" maxOccurs="1" ref="tLocation" />
+ <xs:group minOccurs="1" maxOccurs="1" ref="amf:tData" />
+ </xs:sequence>
+ </xs:group>
+
+ <xs:complexType name="tInsertAction">
+ <xs:group ref="tUpdateData" />
+ <xs:attribute name="name" type="xs:string" use="required" />
+ </xs:complexType>
+
+ <xs:complexType name="tUpdateAction">
+ <xs:group ref="tUpdateData" />
+ </xs:complexType>
+
+ <xs:complexType name="tDeleteAction">
+ <xs:group minOccurs="1" maxOccurs="1" ref="tLocation" />
+ </xs:complexType>
+
+ <xs:complexType name="tAppendAction">
+ <xs:group ref="amf:tData" />
+ <xs:attribute name="name" type="xs:string" use="required" />
+ </xs:complexType>
+</xs:schema>
==============================================================================
Revision: 113e317922ea
Author: Marc Noirot <marc....@gmail.com>
Date: Thu Oct 18 01:13:50 2012
Log: Merge pull request #4 from neutronth/fix-spelling-error-in-manpage
Fixed spelling errors in man page.
http://code.google.com/p/flvmeta/source/detail?r=113e317922ea
==============================================================================
Revision: 93652ed01edc
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jul 21 11:41:54 2012
Log: Updated injection schema for improved clarity.
Added rename operation.
http://code.google.com/p/flvmeta/source/detail?r=93652ed01edc
Modified:
/schemas/TestInject.xml
/schemas/inject.xsd
=======================================
--- /schemas/TestInject.xml Sat Jul 21 09:45:27 2012
+++ /schemas/TestInject.xml Sat Jul 21 11:41:54 2012
@@ -1,16 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<inject xmlns="http://schemas.flvmeta.org/inject/1.0/"
xmlns:amf="http://schemas.flvmeta.org/AMF0/1.0/">
- <insert name="onRandomPoint">
+ <insertAfter>
<offset>298125</offset>
+ <name>onRandomPoint</name>
<amf:associativeArray>
<amf:entry name="toto">
<amf:string>value</amf:string>
</amf:entry>
</amf:associativeArray>
- </insert>
+ </insertAfter>
+
+ <insertBefore>
+ <metadata name="onLastSecond" match="last" />
+ <name>onBeforeLastSecond</name>
+ <amf:boolean value="1" />
+ </insertBefore>
<update>
- <tag name="onMetadata" match="first" />
+ <metadata name="onMetadata" match="first" />
<amf:associativeArray>
<amf:entry name="test">
<amf:boolean value="true"/>
@@ -19,7 +26,7 @@
</update>
<delete>
- <tag name="onCuePoint" match="all" />
+ <metadata name="onCuePoint" match="all" />
</delete>
<replace>
@@ -31,6 +38,10 @@
</amf:object>
</replace>
+ <rename to="onCuePoint">
+ <metadata name="onCuepoint" match="all" />
+ </rename>
+
<append name="onFileEnd">
<amf:array>
<amf:number value="12.3" />
=======================================
--- /schemas/inject.xsd Sat Jul 21 09:45:27 2012
+++ /schemas/inject.xsd Sat Jul 21 11:41:54 2012
@@ -11,11 +11,13 @@
<xs:complexType>
<xs:sequence minOccurs="0" maxOccurs="unbounded">
<xs:choice>
- <xs:element name="insert" type="tInsertAction" />
+ <xs:element name="insertBefore" type="tInsertAction" />
+ <xs:element name="insertAfter" type="tInsertAction" />
<xs:element name="replace" type="tUpdateAction" />
<xs:element name="update" type="tUpdateAction" />
<xs:element name="delete" type="tDeleteAction" />
<xs:element name="append" type="tAppendAction" />
+ <xs:element name="rename" type="tRenameAction" />
</xs:choice>
</xs:sequence>
</xs:complexType>
@@ -41,7 +43,7 @@
<xs:choice>
<xs:element name="offset" type="tFileOffset"/>
<xs:element name="timestamp" type="xs:unsignedInt" />
- <xs:element name="tag">
+ <xs:element name="metadata">
<xs:complexType>
<xs:attribute name="name" type="xs:string"
use="required" />
<xs:attribute name="match" type="tMatchValue"
use="optional" default="first" />
@@ -58,8 +60,11 @@
</xs:group>
<xs:complexType name="tInsertAction">
- <xs:group ref="tUpdateData" />
- <xs:attribute name="name" type="xs:string" use="required" />
+ <xs:sequence>
+ <xs:group minOccurs="1" maxOccurs="1" ref="tLocation" />
+ <xs:element name="name" minOccurs="1" maxOccurs="1"
type="xs:string" />
+ <xs:group minOccurs="1" maxOccurs="1" ref="amf:tData" />
+ </xs:sequence>
</xs:complexType>
<xs:complexType name="tUpdateAction">
@@ -70,6 +75,11 @@
<xs:group minOccurs="1" maxOccurs="1" ref="tLocation" />
</xs:complexType>
+ <xs:complexType name="tRenameAction">
+ <xs:group minOccurs="1" maxOccurs="unbounded" ref="tLocation" />
+ <xs:attribute name="to" type="xs:string" use="required" />
+ </xs:complexType>
+
<xs:complexType name="tAppendAction">
<xs:group ref="amf:tData" />
<xs:attribute name="name" type="xs:string" use="required" />
==============================================================================
Revision: 9d3d30dd3f05
Author: Marc Noirot <marc....@gmail.com>
Date: Thu Oct 18 02:28:16 2012
Log: Updated THANKS file.
http://code.google.com/p/flvmeta/source/detail?r=9d3d30dd3f05
Modified:
/THANKS
=======================================
--- /THANKS Mon Jun 27 08:07:21 2011
+++ /THANKS Thu Oct 18 02:28:16 2012
@@ -1,9 +1,9 @@
I would like to thank the following contributors:
+Neutron Soutmun <neo.n...@gmail.com> - spelling fixes, patches and
Debian package maintenance
Eric Priou <erixt...@gmail.com> - support and MacOSX builds
Zou Guangxian <zougua...@gmail.com> - VP60 related bug fix
nicma...@yahoo.com - malformed metadata related bug fix
Robert M. Hall, II <rh...@impossibilities.com> - sample files to implement
extended timestamp support
pod...@gmail.com - extended timestamp related bug report
Anton Gorodchanin <anton.go...@gmail.com> - command line and AVC
bugfixes
-Neutron Soutmun <neo.n...@gmail.com> - spelling fixes, patches and
Debian package maintenance
==============================================================================
Revision: c515ca9b17e4
Author: Marc Noirot <marc....@gmail.com>
Date: Mon Aug 6 05:25:48 2012
Log: Added usage text for the inject command.
http://code.google.com/p/flvmeta/source/detail?r=c515ca9b17e4
Modified:
/src/flvmeta.c
=======================================
--- /src/flvmeta.c Sun Apr 29 11:49:47 2012
+++ /src/flvmeta.c Mon Aug 6 05:25:48 2012
@@ -39,6 +39,7 @@
{ "full-dump", no_argument, NULL, 'F'},
{ "check", no_argument, NULL, 'C'},
{ "update", no_argument, NULL, 'U'},
+ { "inject", no_argument, NULL, 'I'},
{ "dump-format", required_argument, NULL, 'd'},
{ "json", no_argument, NULL, 'j'},
{ "raw", no_argument, NULL, 'r'},
@@ -66,6 +67,7 @@
#define FULL_DUMP_COMMAND "F"
#define CHECK_COMMAND "C"
#define UPDATE_COMMAND "U"
+#define INJECT_COMMAND "I"
#define DUMP_FORMAT_OPTION "d:"
#define JSON_OPTION "j"
#define RAW_OPTION "r"
@@ -102,12 +104,15 @@
printf("Usage: %s [COMMAND] [OPTIONS] INPUT_FILE [OUTPUT_FILE]\n",
name);
printf("\nIf OUTPUT_FILE is omitted for commands expecting it,
INPUT_FILE will be overwritten instead.\n"
"\nCommands:\n"
- " -D, --dump dump onMetaData tag (default
without output file)\n"
- " -F, --full-dump dump all tags\n"
+ " -D, --dump dump onMetaData tag to standard
output (default command\n"
+ " without output file)\n"
+ " -F, --full-dump dump all tags to standard output\n"
" -C, --check check the validity of INPUT_FILE,
returning 0 if\n"
" the file is valid, or 10 if it
contains errors\n"
" -U, --update update computed onMetaData tag
from INPUT_FILE\n"
- " into OUTPUT_FILE (default with
output file)\n"
+ " into OUTPUT_FILE (default command
with output file)\n"
+ " -I, --inject inject metadata in an XML
specification file\n"
+ " from INPUT_FILE into OUTPUT_FILE\n"
/* " -A, --extract-audio extract raw audio data into
OUTPUT_FILE\n"*/
/* " -E, --extract-video extract raw video data into
OUTPUT_FILE\n"*/
"\nDump options:\n"
@@ -134,6 +139,9 @@
" (the default is to stop with an
error)\n"
" -t, --reset-timestamps reset timestamps so OUTPUT_FILE
starts at zero\n"
" -k, --all-keyframes index all keyframe tags, including
duplicate timestamps\n"
+ "\nInject options:\n"
+ " -u, --input-file name of the XML specification
file, if omitted,\n"
+ " data will be read from standard
input\n"
"\nCommon options:\n"
" -v, --verbose display informative messages\n"
"\nMiscellaneous:\n"
==============================================================================
Revision: 1f50699bdc99
Author: Marc Noirot <marc....@gmail.com>
Date: Mon Dec 10 07:57:34 2012
Log: Added FLV buffer copy helper functions.
http://code.google.com/p/flvmeta/source/detail?r=1f50699bdc99
Modified:
/src/flv.c
/src/flv.h
=======================================
--- /src/flv.c Sun Apr 22 02:58:28 2012
+++ /src/flv.c Mon Dec 10 07:57:34 2012
@@ -68,7 +68,7 @@
|| header->signature[2] != 'V') {
return FLV_ERROR_NO_FLV;
}
-
+
stream->state = FLV_STREAM_STATE_PREV_TAG_SIZE;
return FLV_OK;
}
@@ -120,13 +120,13 @@
lfs_fseek(stream->flvin, stream->current_tag_offset + FLV_TAG_SIZE
+ uint24_be_to_uint32(stream->current_tag.body_length), SEEK_SET);
stream->state = FLV_STREAM_STATE_PREV_TAG_SIZE;
}
-
+
/* skip previous tag size */
if (stream->state == FLV_STREAM_STATE_PREV_TAG_SIZE) {
lfs_fseek(stream->flvin, sizeof(uint32_be), SEEK_CUR);
stream->state = FLV_STREAM_STATE_TAG;
}
-
+
if (stream->state == FLV_STREAM_STATE_TAG) {
stream->current_tag_offset = lfs_ftell(stream->flvin);
@@ -165,7 +165,7 @@
if (fread(tag, sizeof(flv_audio_tag), 1, stream->flvin) == 0) {
return FLV_ERROR_EOF;
}
-
+
if (stream->current_tag_body_length >= sizeof(flv_audio_tag)) {
stream->current_tag_body_length -= sizeof(flv_audio_tag);
}
@@ -233,7 +233,7 @@
if (stream->current_tag_body_length == 0) {
return FLV_ERROR_EMPTY_TAG;
}
-
+
/* read metadata name */
d = amf_data_file_read(stream->flvin);
*name = d;
@@ -244,7 +244,7 @@
else if (error_code != AMF_ERROR_OK) {
return FLV_ERROR_INVALID_METADATA_NAME;
}
-
+
/* if only name can be read, metadata are invalid */
data_size = amf_data_size(d);
if (stream->current_tag_body_length > data_size) {
@@ -261,7 +261,7 @@
return FLV_ERROR_INVALID_METADATA;
}
-
+
/* read metadata contents */
d = amf_data_file_read(stream->flvin);
*data = d;
@@ -272,7 +272,7 @@
if (error_code != AMF_ERROR_OK) {
return FLV_ERROR_INVALID_METADATA;
}
-
+
data_size = amf_data_size(d);
if (stream->current_tag_body_length >= data_size) {
stream->current_tag_body_length -= (uint32)data_size;
@@ -304,7 +304,7 @@
bytes_number = (buffer_size > stream->current_tag_body_length) ?
stream->current_tag_body_length : buffer_size;
bytes_number = fread(buffer, sizeof(byte), bytes_number,
stream->flvin);
-
+
stream->current_tag_body_length -= (uint32)bytes_number;
if (stream->current_tag_body_length == 0) {
@@ -341,6 +341,62 @@
free(stream);
}
}
+
+/* FLV buffer copy helper functions */
+size_t flv_copy_header(void * to, const flv_header * header, size_t
buffer_size) {
+ char * out = to;
+ if (buffer_size < FLV_HEADER_SIZE) {
+ return 0;
+ }
+
+ memcpy(out, &header->signature, sizeof(header->signature));
+ out += sizeof(header->signature);
+
+ memcpy(out, &header->version, sizeof(header->version));
+ out += sizeof(header->version);
+
+ memcpy(out, &header->flags, sizeof(header->flags));
+ out += sizeof(header->flags);
+
+ memcpy(out, &header->offset, sizeof(header->offset));
+
+ return FLV_HEADER_SIZE;
+}
+
+size_t flv_copy_tag(void * to, const flv_tag * tag, size_t buffer_size) {
+ char * out = to;
+ if (buffer_size < FLV_TAG_SIZE) {
+ return 0;
+ }
+
+ memcpy(out, &tag->type, sizeof(tag->type));
+ out += sizeof(tag->type);
+
+ memcpy(out, &tag->body_length, sizeof(tag->body_length));
+ out += sizeof(tag->body_length);
+
+ memcpy(out, &tag->timestamp, sizeof(tag->timestamp));
+ out += sizeof(tag->timestamp);
+
+ memcpy(out, &tag->timestamp_extended, sizeof(tag->timestamp_extended));
+ out += sizeof(tag->timestamp_extended);
+
+ memcpy(out, &tag->stream_id, sizeof(tag->stream_id));
+
+ return FLV_TAG_SIZE;
+}
+
+size_t flv_copy_prev_tag_size(void *to, uint32 prev_tag_size, size_t
buffer_size) {
+ uint32_be pts = swap_uint32(prev_tag_size);
+
+ if (buffer_size < sizeof(uint32)) {
+ return 0;
+ }
+
+ memcpy(to, &pts, sizeof(uint32_be));
+
+ return sizeof(uint32_be);
+}
/* FLV stdio writing helper functions */
size_t flv_write_header(FILE * out, const flv_header * header) {
@@ -482,7 +538,7 @@
}
}
}
-
+
if (parser->on_stream_end != NULL) {
retval = parser->on_stream_end(parser);
if (retval != FLV_OK) {
=======================================
--- /src/flv.h Thu Apr 5 09:32:57 2012
+++ /src/flv.h Mon Dec 10 07:57:34 2012
@@ -175,6 +175,11 @@
void flv_reset(flv_stream * stream);
void flv_close(flv_stream * stream);
+/* FLV buffer copy helper functions */
+size_t flv_copy_header(void * to, const flv_header * header, size_t
buffer_size);
+size_t flv_copy_tag(void * to, const flv_tag * tag, size_t buffer_size);
+size_t flv_copy_prev_tag_size(void * to, uint32 prev_tag_size, size_t
buffer_size);
+
/* FLV stdio writing helper functions */
size_t flv_write_header(FILE * out, const flv_header * header);
size_t flv_write_tag(FILE * out, const flv_tag * tag);
==============================================================================
Revision: 7294984acd84
Author: Marc Noirot <marc....@gmail.com>
Date: Fri Dec 28 03:05:07 2012
Log: Added typedef and constants for AVC packet types.
http://code.google.com/p/flvmeta/source/detail?r=7294984acd84
Modified:
/src/flv.h
=======================================
--- /src/flv.h Mon Dec 10 07:57:34 2012
+++ /src/flv.h Fri Dec 28 03:05:07 2012
@@ -139,6 +139,13 @@
#define flv_video_tag_codec_id(tag) (((tag) & 0x0F) >> 0)
#define flv_video_tag_frame_type(tag) (((tag) & 0xF0) >> 4)
+/* AVC packet types */
+typedef byte flv_avc_packet_type;
+
+#define FLV_AVC_PACKET_TYPE_SEQUENCE_HEADER 0
+#define FLV_AVC_PACKET_TYPE_NALU 1
+#define FLV_AVC_PACKET_TYPE_SEQUENCE_END 2
+
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
==============================================================================
Revision: d0271d2d117a
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jan 5 04:20:36 2013
Log: Updated copyright notices to 2013.
http://code.google.com/p/flvmeta/source/detail?r=d0271d2d117a
Modified:
/INSTALL
/man/flvmeta.1.md
/src/amf.c
/src/amf.h
/src/avc.c
/src/avc.h
/src/check.c
/src/check.h
/src/compat/win32_tmpfile.c
/src/compat/win32_tmpfile.h
/src/dump.c
/src/dump.h
/src/dump_json.c
/src/dump_json.h
/src/dump_raw.c
/src/dump_raw.h
/src/dump_xml.c
/src/dump_xml.h
/src/dump_yaml.c
/src/dump_yaml.h
/src/flv.c
/src/flv.h
/src/flvmeta.c
/src/flvmeta.h
/src/info.c
/src/info.h
/src/json.c
/src/json.h
/src/types.c
/src/types.h
/src/update.c
/src/update.h
/src/util.c
/src/util.h
=======================================
--- /INSTALL Sat Jul 21 03:29:39 2012
+++ /INSTALL Sat Jan 5 04:20:36 2013
@@ -1,4 +1,4 @@
-Copyright (c) 2012 Marc Noirot
+Copyright (c) 2012-2013 Marc Noirot
How to Build FLVmeta with CMake
=======================================
--- /man/flvmeta.1.md Fri Oct 12 02:57:38 2012
+++ /man/flvmeta.1.md Sat Jan 5 04:20:36 2013
@@ -303,7 +303,7 @@
# COPYRIGHT
-Copyright 2007-2012 Marc Noirot
+Copyright 2007-2013 Marc Noirot
This is free software; see the source for copying conditions.
There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
PARTICULAR
=======================================
--- /src/amf.c Tue Apr 3 02:23:47 2012
+++ /src/amf.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: amf.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/amf.h Tue Apr 3 02:23:47 2012
+++ /src/amf.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: amf.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/avc.c Mon Jun 11 05:06:14 2012
+++ /src/avc.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: avc.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/avc.h Tue Apr 3 02:23:47 2012
+++ /src/avc.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: avc.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/check.c Thu Apr 12 02:07:34 2012
+++ /src/check.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: check.c 236 2011-08-10 15:30:04Z marc....@gmail.com $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/check.h Thu Apr 5 09:32:57 2012
+++ /src/check.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: check.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/compat/win32_tmpfile.c Tue Apr 3 02:23:47 2012
+++ /src/compat/win32_tmpfile.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: win32_tmpfile.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/compat/win32_tmpfile.h Tue Apr 3 02:23:47 2012
+++ /src/compat/win32_tmpfile.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: win32_tmpfile.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/dump.c Mon Apr 30 08:42:22 2012
+++ /src/dump.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: dump.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/dump.h Tue Apr 3 02:23:47 2012
+++ /src/dump.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: dump.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/dump_json.c Tue May 1 13:10:40 2012
+++ /src/dump_json.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: dump_json.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/dump_json.h Mon Apr 30 08:42:22 2012
+++ /src/dump_json.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: dump_json.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/dump_raw.c Mon Apr 30 08:42:22 2012
+++ /src/dump_raw.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: dump_raw.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/dump_raw.h Mon Apr 30 08:42:22 2012
+++ /src/dump_raw.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: dump_raw.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/dump_xml.c Mon Apr 30 08:42:22 2012
+++ /src/dump_xml.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: dump_xml.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/dump_xml.h Mon Apr 30 08:42:22 2012
+++ /src/dump_xml.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: dump_xml.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/dump_yaml.c Mon Apr 30 08:42:22 2012
+++ /src/dump_yaml.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: dump_yaml.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/dump_yaml.h Mon Apr 30 08:42:22 2012
+++ /src/dump_yaml.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: dump_yaml.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/flv.c Mon Dec 10 07:57:34 2012
+++ /src/flv.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: flv.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/flv.h Fri Dec 28 03:05:07 2012
+++ /src/flv.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: flv.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/flvmeta.c Sun Apr 29 11:49:47 2012
+++ /src/flvmeta.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: flvmeta.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/flvmeta.h Sun Apr 29 11:49:47 2012
+++ /src/flvmeta.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: flvmeta.h 231 2011-06-27 13:46:19Z marc.noirot $
+ FLVmeta - FLV Metadata Editor
- FLV Metadata updater
-
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
@@ -32,7 +30,7 @@
#include "flv.h"
/* copyright string */
-#define COPYRIGHT_STR "Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT
gmail.com>"
+#define COPYRIGHT_STR "Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT
gmail.com>"
/* error statuses */
#define OK FLV_OK
=======================================
--- /src/info.c Thu Apr 5 09:32:57 2012
+++ /src/info.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: info.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/info.h Thu Apr 5 09:32:57 2012
+++ /src/info.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: info.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/json.c Fri May 4 05:44:38 2012
+++ /src/json.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: json.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/json.h Tue May 1 13:10:40 2012
+++ /src/json.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: json.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/types.c Tue Apr 3 02:23:47 2012
+++ /src/types.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: types.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/types.h Tue Apr 3 02:23:47 2012
+++ /src/types.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: types.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/update.c Mon Jun 11 14:21:16 2012
+++ /src/update.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: update.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/update.h Tue Apr 3 02:23:47 2012
+++ /src/update.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: update.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/util.c Tue Apr 3 02:23:47 2012
+++ /src/util.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: util.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/util.h Tue Apr 3 02:23:47 2012
+++ /src/util.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: util.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
==============================================================================
Revision: 1e9a602367f1
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jan 5 05:26:45 2013
Log: Fixed FLVMeta product spelling.
http://code.google.com/p/flvmeta/source/detail?r=1e9a602367f1
Modified:
/src/amf.c
/src/amf.h
/src/avc.c
/src/avc.h
/src/check.c
/src/check.h
/src/compat/win32_tmpfile.c
/src/compat/win32_tmpfile.h
/src/dump.c
/src/dump.h
/src/dump_json.c
/src/dump_json.h
/src/dump_raw.c
/src/dump_raw.h
/src/dump_xml.c
/src/dump_xml.h
/src/dump_yaml.c
/src/dump_yaml.h
/src/flv.c
/src/flv.h
/src/flvmeta.c
/src/flvmeta.h
/src/info.c
/src/info.h
/src/json.c
/src/json.h
/src/types.c
/src/types.h
/src/update.c
/src/update.h
/src/util.c
/src/util.h
=======================================
--- /src/amf.c Sat Jan 5 04:20:36 2013
+++ /src/amf.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/amf.h Sat Jan 5 04:20:36 2013
+++ /src/amf.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/avc.c Sat Jan 5 04:20:36 2013
+++ /src/avc.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/avc.h Sat Jan 5 04:20:36 2013
+++ /src/avc.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/check.c Sat Jan 5 04:20:36 2013
+++ /src/check.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/check.h Sat Jan 5 04:20:36 2013
+++ /src/check.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/compat/win32_tmpfile.c Sat Jan 5 04:20:36 2013
+++ /src/compat/win32_tmpfile.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/compat/win32_tmpfile.h Sat Jan 5 04:20:36 2013
+++ /src/compat/win32_tmpfile.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/dump.c Sat Jan 5 04:20:36 2013
+++ /src/dump.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/dump.h Sat Jan 5 04:20:36 2013
+++ /src/dump.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/dump_json.c Sat Jan 5 04:20:36 2013
+++ /src/dump_json.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/dump_json.h Sat Jan 5 04:20:36 2013
+++ /src/dump_json.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/dump_raw.c Sat Jan 5 04:20:36 2013
+++ /src/dump_raw.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/dump_raw.h Sat Jan 5 04:20:36 2013
+++ /src/dump_raw.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/dump_xml.c Sat Jan 5 04:20:36 2013
+++ /src/dump_xml.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/dump_xml.h Sat Jan 5 04:20:36 2013
+++ /src/dump_xml.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/dump_yaml.c Sat Jan 5 04:20:36 2013
+++ /src/dump_yaml.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/dump_yaml.h Sat Jan 5 04:20:36 2013
+++ /src/dump_yaml.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/flv.c Sat Jan 5 04:20:36 2013
+++ /src/flv.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/flv.h Sat Jan 5 04:20:36 2013
+++ /src/flv.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/flvmeta.c Sat Jan 5 04:20:36 2013
+++ /src/flvmeta.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/flvmeta.h Sat Jan 5 04:20:36 2013
+++ /src/flvmeta.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/info.c Sat Jan 5 04:20:36 2013
+++ /src/info.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/info.h Sat Jan 5 04:20:36 2013
+++ /src/info.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/json.c Sat Jan 5 04:20:36 2013
+++ /src/json.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/json.h Sat Jan 5 04:20:36 2013
+++ /src/json.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/types.c Sat Jan 5 04:20:36 2013
+++ /src/types.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/types.h Sat Jan 5 04:20:36 2013
+++ /src/types.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/update.c Sat Jan 5 04:20:36 2013
+++ /src/update.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/update.h Sat Jan 5 04:20:36 2013
+++ /src/update.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/util.c Sat Jan 5 04:20:36 2013
+++ /src/util.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/util.h Sat Jan 5 04:20:36 2013
+++ /src/util.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
Revision: a4dc1588496d
Author: Neutron Soutmun <neo.n...@gmail.com>
Date: Fri Oct 12 02:57:38 2012
Log: Fix spelling error in manpage...
http://code.google.com/p/flvmeta/source/detail?r=a4dc1588496d
Revision: 593fe475bdb4
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jul 21 02:46:12 2012
Log: Removed support for the Autotools build system.
http://code.google.com/p/flvmeta/source/detail?r=593fe475bdb4
Revision: 28cc189bef4e
Author: Marc Noirot <marc....@gmail.com>
Date: Thu Oct 18 02:25:14 2012
Log: Updated software version to 1.1.0.1.
http://code.google.com/p/flvmeta/source/detail?r=28cc189bef4e
Revision: 9dc6906819f3
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jul 21 03:28:31 2012
Log: Updated CMakeLists.txt to version 1.2.
http://code.google.com/p/flvmeta/source/detail?r=9dc6906819f3
Revision: 702a50595101
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jul 21 03:29:39 2012
Log: Updated INSTALL file to contain CMake-specific build and
installation ...
http://code.google.com/p/flvmeta/source/detail?r=702a50595101
Revision: ba399ed07826
Author: Neutron Soutmun <neo.n...@gmail.com>
Date: Fri Oct 12 02:57:38 2012
Log: Fix spelling error in manpage...
http://code.google.com/p/flvmeta/source/detail?r=ba399ed07826
Revision: 160b946c723b
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jul 21 09:45:27 2012
Log: Added a schema and a sample file to specify metadata injection.
http://code.google.com/p/flvmeta/source/detail?r=160b946c723b
Revision: 113e317922ea
Author: Marc Noirot <marc....@gmail.com>
Date: Thu Oct 18 01:13:50 2012
Log: Merge pull request #4 from
neutronth/fix-spelling-error-in-manpage...
http://code.google.com/p/flvmeta/source/detail?r=113e317922ea
Revision: 93652ed01edc
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jul 21 11:41:54 2012
Log: Updated injection schema for improved clarity....
http://code.google.com/p/flvmeta/source/detail?r=93652ed01edc
Revision: 9d3d30dd3f05
Author: Marc Noirot <marc....@gmail.com>
Date: Thu Oct 18 02:28:16 2012
Log: Updated THANKS file.
http://code.google.com/p/flvmeta/source/detail?r=9d3d30dd3f05
Revision: c515ca9b17e4
Author: Marc Noirot <marc....@gmail.com>
Date: Mon Aug 6 05:25:48 2012
Log: Added usage text for the inject command.
http://code.google.com/p/flvmeta/source/detail?r=c515ca9b17e4
Revision: 1f50699bdc99
Author: Marc Noirot <marc....@gmail.com>
Date: Mon Dec 10 07:57:34 2012
Log: Added FLV buffer copy helper functions.
http://code.google.com/p/flvmeta/source/detail?r=1f50699bdc99
Revision: 7294984acd84
Author: Marc Noirot <marc....@gmail.com>
Date: Fri Dec 28 03:05:07 2012
Log: Added typedef and constants for AVC packet types.
http://code.google.com/p/flvmeta/source/detail?r=7294984acd84
Revision: d0271d2d117a
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jan 5 04:20:36 2013
Log: Updated copyright notices to 2013.
http://code.google.com/p/flvmeta/source/detail?r=d0271d2d117a
Revision: 1e9a602367f1
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jan 5 05:26:45 2013
Log: Fixed FLVMeta product spelling.
http://code.google.com/p/flvmeta/source/detail?r=1e9a602367f1
==============================================================================
Revision: a4dc1588496d
Author: Neutron Soutmun <neo.n...@gmail.com>
Date: Fri Oct 12 02:57:38 2012
Log: Fix spelling error in manpage
* Lintian (Debian package tool) has warned the spelling error in
manpage.
http://code.google.com/p/flvmeta/source/detail?r=a4dc1588496d
Modified:
/man/flvmeta.1.md
=======================================
--- /man/flvmeta.1.md Thu May 3 07:56:29 2012
+++ /man/flvmeta.1.md Fri Oct 12 02:57:38 2012
@@ -81,7 +81,7 @@
## -C, \--check
Print a report to standard output listing warnings and errors detected in
-*INPUT_FILE*, as well as potential incompatibilities, and informations
about
+*INPUT_FILE*, as well as potential incompatibilities, and information about
the codecs used in the file. The exit code will be set to a non-zero value
if there is at least one error in the file.
@@ -99,8 +99,8 @@
* **fatal**: messages that inform of errors that make further file reading
impossible therefore ending parsing completely
-The **\--level** option allows to limit the display of messages to a
minimum
-level among those, for example if the user is only interested in error
+The **\--level** option allows **flvmeta** to limit the display of
messages to
+a minimum level among those, for example if the user is only interested in
error
messages and above.
Each message or message template presented to the user is identified by a
@@ -146,7 +146,7 @@
the operation. This is due to the fact that the output file is written
while the original file is being read due to the two-pass method.
-The computed metadata contains among other data full keyframe informations,
+The computed metadata contains among other data full keyframe information,
in order to allow HTTP pseudo-streaming and random-access seeking in the
file.
==============================================================================
Revision: 593fe475bdb4
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jul 21 02:46:12 2012
Log: Removed support for the Autotools build system.
http://code.google.com/p/flvmeta/source/detail?r=593fe475bdb4
Deleted:
/Makefile.am
/autogen.sh
/configure.ac
/man/Makefile.am
/schemas/Makefile.am
/src/Makefile.am
/src/libyaml/Makefile.am
/tests/Makefile.am
=======================================
--- /Makefile.am Thu May 3 08:05:20 2012
+++ /dev/null
@@ -1,10 +0,0 @@
-if BUILD_MAN
- MAN_SUBDIR = man
-endif
-
-SUBDIRS = src tests schemas $(MAN_SUBDIR)
-EXTRA_DIST = autogen.sh \
- CMakeLists.txt \
- .gitignore \
- config-cmake.h.in \
- cmake/modules/FindLibYAML.cmake
=======================================
--- /autogen.sh Tue May 6 12:46:13 2008
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-if aclocal && autoheader && automake -a && autoconf; then
- echo "Next, run ./configure && make"
-else
- echo
- echo "An error occured."
- exit 1
-fi
=======================================
--- /configure.ac Thu May 3 03:49:12 2012
+++ /dev/null
@@ -1,78 +0,0 @@
-dnl -*- Autoconf -*-
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.61)
-
-AC_INIT([flvmeta], [1.1.0], [flvmeta-d...@googlegroups.com])
-AC_CONFIG_SRCDIR([config.h.in])
-AC_CONFIG_HEADER([config.h])
-AM_INIT_AUTOMAKE
-AC_LANG([C])
-
-dnl Checks for programs.
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_RANLIB
-
-dnl Checks for pandoc
-AC_ARG_VAR(PANDOC, [pandoc path])
-AC_PATH_PROG(PANDOC, [pandoc], [])
-
-AM_CONDITIONAL([BUILD_MAN], [test -x "$PANDOC"])
-
-dnl Checks for check.
-ifdef([PKG_CHECK_MODULES],
- [PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],
- [have_check=yes],
- [have_check=no]
- )]
-)
-AM_CONDITIONAL([MAKE_TESTS], [test "$have_check" = yes])
-
-dnl Checks for --with-system-libs
-AC_ARG_WITH([system-libs],
- [AC_HELP_STRING([--with-system-libs], [Build with system libraries])]
-)
-AM_CONDITIONAL([USE_SYSTEM_LIBS], [test "x$with_system_libs" = "xyes"])
-
-if test "x$with_system_libs" = "xyes"; then
- PKG_CHECK_MODULES([YAML], [yaml-0.1 >= 0.1.3])
-fi
-
-dnl Checks for header files.
-AC_CHECK_HEADERS([stdlib.h stdio.h string.h])
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_C_BIGENDIAN
-AC_TYPE_SIZE_T
-AC_TYPE_UINT8_T
-AC_TYPE_UINT16_T
-AC_TYPE_INT16_T
-AC_TYPE_UINT32_T
-AC_TYPE_INT32_T
-AC_TYPE_UINT64_T
-AC_TYPE_INT64_T
-AC_CHECK_SIZEOF([float])
-AC_CHECK_SIZEOF([double])
-AC_CHECK_SIZEOF([long double])
-
-dnl Checks for large file support
-AC_SYS_LARGEFILE
-AC_FUNC_FSEEKO
-
-dnl Checks for library functions.
-AC_FUNC_MALLOC
-AC_FUNC_STRFTIME
-AC_CHECK_FUNCS([tzset])
-
-dnl Output files
-AC_CONFIG_FILES([
-Makefile
-src/Makefile
-src/libyaml/Makefile
-tests/Makefile
-schemas/Makefile
-man/Makefile
-])
-AC_OUTPUT
=======================================
--- /man/Makefile.am Mon Apr 23 06:57:23 2012
+++ /dev/null
@@ -1,8 +0,0 @@
-man_MANS = $(builddir)/flvmeta.1
-
-CLEANFILES = $(builddir)/flvmeta.1
-
-flvmeta.1: $(srcdir)/flvmeta.1.md
- pandoc -s $(srcdir)/flvmeta.1.md -o $(builddir)/flvmeta.1
-
-EXTRA_DIST = $(srcdir)/flvmeta.1.md
=======================================
--- /schemas/Makefile.am Mon Mar 8 06:42:47 2010
+++ /dev/null
@@ -1,3 +0,0 @@
-EXTRA_DIST = Amf0.xsd \
- flv.xsd \
- report.xsd
=======================================
--- /src/Makefile.am Tue Nov 22 11:31:26 2011
+++ /dev/null
@@ -1,52 +0,0 @@
-bin_PROGRAMS = flvmeta
-
-if USE_SYSTEM_LIBS
-EXPORT_CFLAGS = $(YAML_CFLAGS)
-EXPORT_LDADD = $(YAML_LIBS)
-else
-SUBDIRS = libyaml
-EXPORT_CFLAGS = -I@srcdir@/libyaml
-EXPORT_LDADD = @builddir@/libyaml/libyaml.a
-endif
-
-AM_CFLAGS = -Wall $(EXPORT_CFLAGS)
-flvmeta_LDADD = $(EXPORT_LDADD)
-
-flvmeta_SOURCES = amf.c \
- amf.h \
- avc.c \
- avc.h \
- check.c \
- check.h \
- dump.c \
- dump.h \
- dump_json.c \
- dump_json.h \
- dump_raw.c \
- dump_raw.h \
- dump_xml.c \
- dump_xml.h \
- dump_yaml.c \
- dump_yaml.h \
- flv.c \
- flv.h \
- flvmeta.c \
- flvmeta.h \
- info.c \
- info.h \
- json.c \
- json.h \
- types.c \
- types.h \
- update.c \
- update.h \
- util.c \
- util.h
-
-EXTRA_DIST = CMakeLists.txt \
- compat/gettext.h \
- compat/getopt.h \
- compat/getopt.c \
- compat/getopt1.c \
- compat/win32_tmpfile.c \
- compat/win32_tmpfile.h
=======================================
--- /src/libyaml/Makefile.am Mon Feb 8 05:25:22 2010
+++ /dev/null
@@ -1,7 +0,0 @@
-noinst_LIBRARIES = libyaml.a
-
-libyaml_a_CFLAGS = -DHAVE_CONFIG_H
-
-libyaml_a_SOURCES = api.c config.h dumper.c emitter.c loader.c parser.c
reader.c scanner.c writer.c yaml.h yaml_private.h
-
-EXTRA_DIST = CMakeLists.txt
=======================================
--- /tests/Makefile.am Mon Apr 12 03:00:28 2010
+++ /dev/null
@@ -1,15 +0,0 @@
-if MAKE_TESTS
- TESTS = check_flvmeta
- check_PROGRAMS = check_flvmeta
- check_flvmeta_SOURCES = check_flvmeta.c \
- check_amf.c \
- check_flv.c \
- $(top_srcdir)/src/amf.h \
- $(top_srcdir)/src/flv.h \
- $(top_srcdir)/src/types.h
- check_flvmeta_CFLAGS = -I$(top_srcdir) @CHECK_CFLAGS@
- check_flvmeta_LDADD = @CHECK_LIBS@ \
- $(top_builddir)/src/amf.o \
- $(top_builddir)/src/flv.o \
- $(top_builddir)/src/types.o
-endif
==============================================================================
Revision: 28cc189bef4e
Author: Marc Noirot <marc....@gmail.com>
Date: Thu Oct 18 02:25:14 2012
Log: Updated software version to 1.1.0.1.
http://code.google.com/p/flvmeta/source/detail?r=28cc189bef4e
Modified:
/CMakeLists.txt
/NEWS
/THANKS
/configure.ac
=======================================
--- /CMakeLists.txt Thu May 3 03:54:03 2012
+++ /CMakeLists.txt Thu Oct 18 02:25:14 2012
@@ -3,7 +3,7 @@
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules
${CMAKE_MODULE_PATH})
-set(FLVMETA_VERSION "1.1.0")
+set(FLVMETA_VERSION "1.1.0.1")
set(FLVMETA_RELEASE yes)
# check whether we are building a release or a git snapshot
=======================================
--- /NEWS Thu May 3 03:49:12 2012
+++ /NEWS Thu Oct 18 02:25:14 2012
@@ -1,3 +1,7 @@
+Version 1.1.0.1 (2012-10-18)
+ - No change in the code.
+ - Fixed spelling errors in the man page.
+
Version 1.1.0 (2012-05-03)
- Beta release. All features should be considered relatively
stable unless explicitely stated otherwise.
=======================================
--- /THANKS Mon Jun 27 08:07:21 2011
+++ /THANKS Thu Oct 18 02:25:14 2012
@@ -1,9 +1,9 @@
I would like to thank the following contributors:
+Neutron Soutmun <neo.n...@gmail.com> - spelling fixes, patches and
Debian package maintenance
Eric Priou <erixt...@gmail.com> - support and MacOSX builds
Zou Guangxian <zougua...@gmail.com> - VP60 related bug fix
nicma...@yahoo.com - malformed metadata related bug fix
Robert M. Hall, II <rh...@impossibilities.com> - sample files to implement
extended timestamp support
pod...@gmail.com - extended timestamp related bug report
Anton Gorodchanin <anton.go...@gmail.com> - command line and AVC
bugfixes
-Neutron Soutmun <neo.n...@gmail.com> - spelling fixes, patches and
Debian package maintenance
=======================================
--- /configure.ac Thu May 3 03:49:12 2012
+++ /configure.ac Thu Oct 18 02:25:14 2012
@@ -3,7 +3,7 @@
AC_PREREQ(2.61)
-AC_INIT([flvmeta], [1.1.0], [flvmeta-d...@googlegroups.com])
+AC_INIT([flvmeta], [1.1.0.1], [flvmeta-d...@googlegroups.com])
AC_CONFIG_SRCDIR([config.h.in])
AC_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE
==============================================================================
Revision: 9dc6906819f3
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jul 21 03:28:31 2012
Log: Updated CMakeLists.txt to version 1.2.
http://code.google.com/p/flvmeta/source/detail?r=9dc6906819f3
Modified:
/CMakeLists.txt
=======================================
--- /CMakeLists.txt Thu May 3 03:54:03 2012
+++ /CMakeLists.txt Sat Jul 21 03:28:31 2012
@@ -3,8 +3,8 @@
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules
${CMAKE_MODULE_PATH})
-set(FLVMETA_VERSION "1.1.0")
-set(FLVMETA_RELEASE yes)
+set(FLVMETA_VERSION "1.2")
+set(FLVMETA_RELEASE no)
# check whether we are building a release or a git snapshot
if(NOT FLVMETA_RELEASE)
==============================================================================
Revision: 702a50595101
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jul 21 03:29:39 2012
Log: Updated INSTALL file to contain CMake-specific build and
installation instruction, courtesy of the MariaDB project INSTALL file.
http://code.google.com/p/flvmeta/source/detail?r=702a50595101
Modified:
/INSTALL
=======================================
--- /INSTALL Wed Sep 19 14:42:36 2007
+++ /INSTALL Sat Jul 21 03:29:39 2012
@@ -1,229 +1,243 @@
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
+Copyright (c) 2012 Marc Noirot
- This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+How to Build FLVmeta with CMake
-Basic Installation
-==================
+WHAT YOU NEED
+---------------------------------------------------------------
+CMake version 2.6 or later installed on your system.
- These are generic installation instructions.
+HOW TO INSTALL:
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
+Linux distributions:
+shell> sudo apt-get install cmake
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
+The above works on Debian/Ubuntu based distributions. On others, the
command
+line needs to be modified to e.g "yum install" on Fedora or "zypper
install"
+on OpenSUSE.
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
+OpenSolaris:
+shell> pfexec pkgadd install SUNWcmake
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+Windows and Mac OSX:
+Download and install the latest distribution from
+http://www.cmake.org/cmake/resources/software.html
+On Windows, download installer exe file and run it. On MacOS, download
+the .dmg image and open it.
-The simplest way to compile this package is:
+Other Unixes:
+Precompiled packages for other Unix flavors (HPUX, AIX) are available from
+http://www.cmake.org/cmake/resources/software.html
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+Alternatively, you can build from source, source package is also available
on
+CMake download page.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
- 2. Type `make' to compile the package.
+Compiler Tools
+--------------
+You will need a working compiler and make utility on your OS.
+On Windows, install Visual Studio (Express editions will work too).
+On Mac OSX, install Xcode tools.
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
- 4. Type `make install' to install the programs and any data files and
- documentation.
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
+BUILD
+---------------------------------------------------------------
+Ensure that compiler and cmake are in PATH.
+The following description assumes that current working directory
+is the source directory.
-Compilers and Options
-=====================
- Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. Run `./configure --help'
-for details on some of the pertinent environment variables.
+- Generic build on Unix, using "Unix Makefiles" generator
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
+shell>cmake .
+shell>make
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+Note: by default, cmake build is less verbose than automake build. Use
+"make VERBOSE=1" if you want to see add command lines for each compiled
source.
- *Note Defining Variables::, for more details.
+- Windows, using "Visual Studio 9 2008" generator
+shell>cmake . -G "Visual Studio 9 2008"
+shell>devenv flvmeta.sln /build /relwithdebinfo
+(alternatively, open flvmeta.sln and build using the IDE)
-Compiling For Multiple Architectures
-====================================
+- Windows, using "NMake Makefiles" generator
+shell>cmake . -G "NMake Makefiles"
+shell>nmake
- You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+- Mac OSX build with Xcode
+shell>cmake . -G Xcode
+shell>xcodebuild -configuration Relwithdebinfo
+(alternatively, open flvmeta.xcodeproj and build using the IDE)
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+Command line build with CMake 2.8
+After creating project with cmake -G as above, issue
+cmake . --build
+this works with any CMake generator.
-Installation Names
-==================
+For Visual Studio and Xcode you might want to add an extra
+configuration parameter, to avoid building all configurations.
- By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
+cmake . --build --config Relwithdebinfo
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+Building "out-of-source"
+---------------------------------------------------------------
+Building out-of-source provides additional benefits. For example it allows
to
+build both Release and Debug configurations using the single source tree.Or
+build the same source with different version of the same compiler or with
+different compilers. Also you will prevent polluting the source tree with
the
+objects and binaries produced during the make.
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+Here is an example on how to do it (generic Unix), assuming the source
tree is
+in directory named src and the current working directory is source root.
-Optional Features
-=================
+shell>mkdir ../build # build directory is called build
+shell>cd ../build
+shell>cmake ../src
- Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
+Note: if a directory was used for in-source build, out-of-source will
+not work. To reenable out-of-source build, remove
<source-root>/CMakeCache.txt
+file.
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-Specifying the System Type
-==========================
+CONFIGURATION PARAMETERS
+---------------------------------------------------------------
+The procedure above will build with default configuration.
- There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on. Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
+Let's you want to change the configuration parameters and have archive
+storage engine compiled into the server instead of building it as pluggable
+module.
+
+1)You can provide parameters on the command line, like
+
+shell> cmake . -DFLVMETA_USE_SYSTEM_LIBYAML=1
+
+This can be done during the initial configuration or any time later.
+
+Note, that parameters are "sticky", that is they are remebered in the CMake
+cache (CMakeCache.txt file in the build directory)
+
+2) Configuration using cmake-gui (Windows, OSX, or Linux with cmake-gui
+installed)
+
+From the build directory, issue
+shell> cmake-gui .
+
+- Check the FLVMETA_USE_SYSTEM_LIBYAML checkbox
+- Click on "Configure" button
+- Click on "Generate" button
+- Close cmake-gui
+shell> make
+
+3)Using ccmake (Unix)
+ccmake is curses-based GUI application that provides the same functionality
+as cmake-gui. It is less user-friendly compared to cmake-gui but works also
+on exotic Unixes like HPUX, AIX or Solaris.
+
+Besides storage engines, probably the most important parameter from a
+developer's point of view is CMAKE_BUILD_TYPE (this allows to build server
with
+dbug tracing library and with debug compile flags).
+
+After changing the configuration, recompile using
+shell> make
+
+
+Listing configuration parameters
+---------------------------------------------------------------
+shell> cmake -L
+
+Gives a brief overview of important configuration parameters (dump to
stdout)
+
+shell> cmake -LH
+
+Does the same but also provides a short help text for each parameter.
+
+shell> cmake -LAH
+
+Dumps all config parameters (including advanced) to the stdout.
+
+PACKAGING
+---------------------------------------------------------------
+-- Binary distribution --
+Packaging in form of tar.gz archives (or .zip on Windows) is also supported
+To create a tar.gz package,
- CPU-COMPANY-SYSTEM
+1)If you're using "generic" Unix build with makefiles
-where SYSTEM can have one of these forms:
+shell> make package
+this will create a tar.gz file in the top level build directory.
- OS KERNEL-OS
+2)On Windows, using "NMake Makefiles" generator
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
+shell> nmake package
- If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
-produce code for.
+3)On Windows, using "Visual Studio" generator
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
+shell> devenv flvmeta.sln /build relwithdebinfo /project package
-Sharing Defaults
-================
+Note On Windows, 7Zip or Winzip must be installed and 7z.exe rsp winzip.exe
+need to be in the PATH.
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-Defining Variables
-==================
+Another way to build packages is calling cpack executable directly like
+shell> cpack -G TGZ --config CPackConfig.cmake
+(-G TGZ is for tar.gz generator, there is also -GZIP)
- Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
+-- Source distribution --
+"make package_source" target is provided.
- ./configure CC=/usr/local2/bin/gcc
+ADDITIONAL MAKE TARGETS: "make install" AND "make test"
+----------------------------------------------------------------
+install target also provided for Makefile based generators. Installation
+directory can be controlled using configure-time parameter
+CMAKE_INSTALL_PREFIX (default is /usr/local. It is also possible to
install to
+non-configured directory, using
-will cause the specified gcc to be used as the C compiler (unless it is
-overridden in the site shell script).
+shell> make install DESTDIR="/some/absolute/path"
-`configure' Invocation
-======================
+"make test" runs unit tests (uses CTest for it)
- `configure' recognizes the following options to control how it
-operates.
+FOR PROGRAMMERS: WRITING PLATFORM CHECKS
+--------------------------------------------------------------
+If you modify FLVmeta source and want to add a new platform check,please
read
+http://www.vtk.org/Wiki/CMake_HowToDoPlatformChecks first.
-`--help'
-`-h'
- Print a summary of the options to `configure', and exit.
+Bigger chunks of functionality, for example non-trivial macros are
implemented
+in files <src-root>/cmake subdirectory.
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
+For people with autotools background, it is important to remember CMake
does
+not provide autoheader functionality. That is, when you add a check
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
+CHECK_FUNCTION_EXISTS(foo HAVE_FOO)
+to config.cmake, then you will also need to add
+#cmakedefine HAVE_FOO 1
+to config.h.cmake
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
+Troubleshooting platform checks
+--------------------------------
+If you suspect that a platform check returned wrong result, examine
+<build-root>/CMakeFiles/CMakeError.log and
+<build-root>/CMakeFiles/CMakeOutput.log
+These files they contain compiler command line, and exact error messages.
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
+Troubleshooting CMake code
+----------------------------------
+While there are advanced flags for cmake like -debug-trycompile and
--trace,
+a simple and efficient way to debug to add
+MESSAGE("interesting variable=${some_invariable}")
+to the interesting places in CMakeLists.txt
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
+Tips:
+- When using Makefile generator it is easy to examine which compiler flags
are
+used to build. For example, compiler flags for flvmeta are in
+<build-root>/src/CMakeFiles/flvmeta.dir/flags.make and the linker command
line
+is in <build-root>/src/CMakeFiles/flvmeta.dir/link.txt
+- CMake caches results of platform checks in CMakeCache.txt. It is a nice
+feature because tests do not rerun when reconfiguring (e.g when a new test
was
+added).The downside of caching is that when a platform test was wrong and
was
+later corrected, the cached result is still used. If you encounter this
+situation, which should be a rare occation, you need either to remove the
+offending entry from CMakeCache.txt (if test was for HAVE_FOO, remove lines
+containing HAVE_FOO from CMakeCache.txt) or just remove the cache file.
==============================================================================
Revision: ba399ed07826
Author: Neutron Soutmun <neo.n...@gmail.com>
Date: Fri Oct 12 02:57:38 2012
Log: Fix spelling error in manpage
* Lintian (Debian package tool) has warned the spelling error in
manpage.
http://code.google.com/p/flvmeta/source/detail?r=ba399ed07826
Modified:
/man/flvmeta.1.md
=======================================
--- /man/flvmeta.1.md Thu May 3 07:56:29 2012
+++ /man/flvmeta.1.md Fri Oct 12 02:57:38 2012
@@ -81,7 +81,7 @@
## -C, \--check
Print a report to standard output listing warnings and errors detected in
-*INPUT_FILE*, as well as potential incompatibilities, and informations
about
+*INPUT_FILE*, as well as potential incompatibilities, and information about
the codecs used in the file. The exit code will be set to a non-zero value
if there is at least one error in the file.
@@ -99,8 +99,8 @@
* **fatal**: messages that inform of errors that make further file reading
impossible therefore ending parsing completely
-The **\--level** option allows to limit the display of messages to a
minimum
-level among those, for example if the user is only interested in error
+The **\--level** option allows **flvmeta** to limit the display of
messages to
+a minimum level among those, for example if the user is only interested in
error
messages and above.
Each message or message template presented to the user is identified by a
@@ -146,7 +146,7 @@
the operation. This is due to the fact that the output file is written
while the original file is being read due to the two-pass method.
-The computed metadata contains among other data full keyframe informations,
+The computed metadata contains among other data full keyframe information,
in order to allow HTTP pseudo-streaming and random-access seeking in the
file.
==============================================================================
Revision: 160b946c723b
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jul 21 09:45:27 2012
Log: Added a schema and a sample file to specify metadata injection.
http://code.google.com/p/flvmeta/source/detail?r=160b946c723b
Added:
/schemas/TestInject.xml
/schemas/inject.xsd
=======================================
--- /dev/null
+++ /schemas/TestInject.xml Sat Jul 21 09:45:27 2012
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inject xmlns="http://schemas.flvmeta.org/inject/1.0/"
xmlns:amf="http://schemas.flvmeta.org/AMF0/1.0/">
+ <insert name="onRandomPoint">
+ <offset>298125</offset>
+ <amf:associativeArray>
+ <amf:entry name="toto">
+ <amf:string>value</amf:string>
+ </amf:entry>
+ </amf:associativeArray>
+ </insert>
+
+ <update>
+ <tag name="onMetadata" match="first" />
+ <amf:associativeArray>
+ <amf:entry name="test">
+ <amf:boolean value="true"/>
+ </amf:entry>
+ </amf:associativeArray>
+ </update>
+
+ <delete>
+ <tag name="onCuePoint" match="all" />
+ </delete>
+
+ <replace>
+ <timestamp>123587</timestamp>
+ <amf:object>
+ <amf:entry name="test2">
+ <amf:number value="42" />
+ </amf:entry>
+ </amf:object>
+ </replace>
+
+ <append name="onFileEnd">
+ <amf:array>
+ <amf:number value="12.3" />
+ <amf:string>hello value</amf:string>
+ <amf:boolean value="false"/>
+ </amf:array>
+ </append>
+</inject>
=======================================
--- /dev/null
+++ /schemas/inject.xsd Sat Jul 21 09:45:27 2012
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema targetNamespace="http://schemas.flvmeta.org/inject/1.0/"
+ elementFormDefault="qualified"
+ xmlns="http://schemas.flvmeta.org/inject/1.0/"
+ xmlns:amf="http://schemas.flvmeta.org/AMF0/1.0/"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+>
+ <xs:import namespace="http://schemas.flvmeta.org/AMF0/1.0/"
schemaLocation="Amf0.xsd"/>
+
+ <xs:element name="inject">
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:choice>
+ <xs:element name="insert" type="tInsertAction" />
+ <xs:element name="replace" type="tUpdateAction" />
+ <xs:element name="update" type="tUpdateAction" />
+ <xs:element name="delete" type="tDeleteAction" />
+ <xs:element name="append" type="tAppendAction" />
+ </xs:choice>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:simpleType name="tFileOffset">
+ <xs:union>
+ <xs:simpleType>
+ <xs:restriction base="xs:unsignedLong"/>
+ </xs:simpleType>
+ </xs:union>
+ </xs:simpleType>
+
+ <xs:simpleType name="tMatchValue">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="first" />
+ <xs:enumeration value="last" />
+ <xs:enumeration value="all" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:group name="tLocation">
+ <xs:choice>
+ <xs:element name="offset" type="tFileOffset"/>
+ <xs:element name="timestamp" type="xs:unsignedInt" />
+ <xs:element name="tag">
+ <xs:complexType>
+ <xs:attribute name="name" type="xs:string"
use="required" />
+ <xs:attribute name="match" type="tMatchValue"
use="optional" default="first" />
+ </xs:complexType>
+ </xs:element>
+ </xs:choice>
+ </xs:group>
+
+ <xs:group name="tUpdateData">
+ <xs:sequence>
+ <xs:group minOccurs="1" maxOccurs="1" ref="tLocation" />
+ <xs:group minOccurs="1" maxOccurs="1" ref="amf:tData" />
+ </xs:sequence>
+ </xs:group>
+
+ <xs:complexType name="tInsertAction">
+ <xs:group ref="tUpdateData" />
+ <xs:attribute name="name" type="xs:string" use="required" />
+ </xs:complexType>
+
+ <xs:complexType name="tUpdateAction">
+ <xs:group ref="tUpdateData" />
+ </xs:complexType>
+
+ <xs:complexType name="tDeleteAction">
+ <xs:group minOccurs="1" maxOccurs="1" ref="tLocation" />
+ </xs:complexType>
+
+ <xs:complexType name="tAppendAction">
+ <xs:group ref="amf:tData" />
+ <xs:attribute name="name" type="xs:string" use="required" />
+ </xs:complexType>
+</xs:schema>
==============================================================================
Revision: 113e317922ea
Author: Marc Noirot <marc....@gmail.com>
Date: Thu Oct 18 01:13:50 2012
Log: Merge pull request #4 from neutronth/fix-spelling-error-in-manpage
Fixed spelling errors in man page.
http://code.google.com/p/flvmeta/source/detail?r=113e317922ea
==============================================================================
Revision: 93652ed01edc
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jul 21 11:41:54 2012
Log: Updated injection schema for improved clarity.
Added rename operation.
http://code.google.com/p/flvmeta/source/detail?r=93652ed01edc
Modified:
/schemas/TestInject.xml
/schemas/inject.xsd
=======================================
--- /schemas/TestInject.xml Sat Jul 21 09:45:27 2012
+++ /schemas/TestInject.xml Sat Jul 21 11:41:54 2012
@@ -1,16 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<inject xmlns="http://schemas.flvmeta.org/inject/1.0/"
xmlns:amf="http://schemas.flvmeta.org/AMF0/1.0/">
- <insert name="onRandomPoint">
+ <insertAfter>
<offset>298125</offset>
+ <name>onRandomPoint</name>
<amf:associativeArray>
<amf:entry name="toto">
<amf:string>value</amf:string>
</amf:entry>
</amf:associativeArray>
- </insert>
+ </insertAfter>
+
+ <insertBefore>
+ <metadata name="onLastSecond" match="last" />
+ <name>onBeforeLastSecond</name>
+ <amf:boolean value="1" />
+ </insertBefore>
<update>
- <tag name="onMetadata" match="first" />
+ <metadata name="onMetadata" match="first" />
<amf:associativeArray>
<amf:entry name="test">
<amf:boolean value="true"/>
@@ -19,7 +26,7 @@
</update>
<delete>
- <tag name="onCuePoint" match="all" />
+ <metadata name="onCuePoint" match="all" />
</delete>
<replace>
@@ -31,6 +38,10 @@
</amf:object>
</replace>
+ <rename to="onCuePoint">
+ <metadata name="onCuepoint" match="all" />
+ </rename>
+
<append name="onFileEnd">
<amf:array>
<amf:number value="12.3" />
=======================================
--- /schemas/inject.xsd Sat Jul 21 09:45:27 2012
+++ /schemas/inject.xsd Sat Jul 21 11:41:54 2012
@@ -11,11 +11,13 @@
<xs:complexType>
<xs:sequence minOccurs="0" maxOccurs="unbounded">
<xs:choice>
- <xs:element name="insert" type="tInsertAction" />
+ <xs:element name="insertBefore" type="tInsertAction" />
+ <xs:element name="insertAfter" type="tInsertAction" />
<xs:element name="replace" type="tUpdateAction" />
<xs:element name="update" type="tUpdateAction" />
<xs:element name="delete" type="tDeleteAction" />
<xs:element name="append" type="tAppendAction" />
+ <xs:element name="rename" type="tRenameAction" />
</xs:choice>
</xs:sequence>
</xs:complexType>
@@ -41,7 +43,7 @@
<xs:choice>
<xs:element name="offset" type="tFileOffset"/>
<xs:element name="timestamp" type="xs:unsignedInt" />
- <xs:element name="tag">
+ <xs:element name="metadata">
<xs:complexType>
<xs:attribute name="name" type="xs:string"
use="required" />
<xs:attribute name="match" type="tMatchValue"
use="optional" default="first" />
@@ -58,8 +60,11 @@
</xs:group>
<xs:complexType name="tInsertAction">
- <xs:group ref="tUpdateData" />
- <xs:attribute name="name" type="xs:string" use="required" />
+ <xs:sequence>
+ <xs:group minOccurs="1" maxOccurs="1" ref="tLocation" />
+ <xs:element name="name" minOccurs="1" maxOccurs="1"
type="xs:string" />
+ <xs:group minOccurs="1" maxOccurs="1" ref="amf:tData" />
+ </xs:sequence>
</xs:complexType>
<xs:complexType name="tUpdateAction">
@@ -70,6 +75,11 @@
<xs:group minOccurs="1" maxOccurs="1" ref="tLocation" />
</xs:complexType>
+ <xs:complexType name="tRenameAction">
+ <xs:group minOccurs="1" maxOccurs="unbounded" ref="tLocation" />
+ <xs:attribute name="to" type="xs:string" use="required" />
+ </xs:complexType>
+
<xs:complexType name="tAppendAction">
<xs:group ref="amf:tData" />
<xs:attribute name="name" type="xs:string" use="required" />
==============================================================================
Revision: 9d3d30dd3f05
Author: Marc Noirot <marc....@gmail.com>
Date: Thu Oct 18 02:28:16 2012
Log: Updated THANKS file.
http://code.google.com/p/flvmeta/source/detail?r=9d3d30dd3f05
Modified:
/THANKS
=======================================
--- /THANKS Mon Jun 27 08:07:21 2011
+++ /THANKS Thu Oct 18 02:28:16 2012
@@ -1,9 +1,9 @@
I would like to thank the following contributors:
+Neutron Soutmun <neo.n...@gmail.com> - spelling fixes, patches and
Debian package maintenance
Eric Priou <erixt...@gmail.com> - support and MacOSX builds
Zou Guangxian <zougua...@gmail.com> - VP60 related bug fix
nicma...@yahoo.com - malformed metadata related bug fix
Robert M. Hall, II <rh...@impossibilities.com> - sample files to implement
extended timestamp support
pod...@gmail.com - extended timestamp related bug report
Anton Gorodchanin <anton.go...@gmail.com> - command line and AVC
bugfixes
-Neutron Soutmun <neo.n...@gmail.com> - spelling fixes, patches and
Debian package maintenance
==============================================================================
Revision: c515ca9b17e4
Author: Marc Noirot <marc....@gmail.com>
Date: Mon Aug 6 05:25:48 2012
Log: Added usage text for the inject command.
http://code.google.com/p/flvmeta/source/detail?r=c515ca9b17e4
Modified:
/src/flvmeta.c
=======================================
--- /src/flvmeta.c Sun Apr 29 11:49:47 2012
+++ /src/flvmeta.c Mon Aug 6 05:25:48 2012
@@ -39,6 +39,7 @@
{ "full-dump", no_argument, NULL, 'F'},
{ "check", no_argument, NULL, 'C'},
{ "update", no_argument, NULL, 'U'},
+ { "inject", no_argument, NULL, 'I'},
{ "dump-format", required_argument, NULL, 'd'},
{ "json", no_argument, NULL, 'j'},
{ "raw", no_argument, NULL, 'r'},
@@ -66,6 +67,7 @@
#define FULL_DUMP_COMMAND "F"
#define CHECK_COMMAND "C"
#define UPDATE_COMMAND "U"
+#define INJECT_COMMAND "I"
#define DUMP_FORMAT_OPTION "d:"
#define JSON_OPTION "j"
#define RAW_OPTION "r"
@@ -102,12 +104,15 @@
printf("Usage: %s [COMMAND] [OPTIONS] INPUT_FILE [OUTPUT_FILE]\n",
name);
printf("\nIf OUTPUT_FILE is omitted for commands expecting it,
INPUT_FILE will be overwritten instead.\n"
"\nCommands:\n"
- " -D, --dump dump onMetaData tag (default
without output file)\n"
- " -F, --full-dump dump all tags\n"
+ " -D, --dump dump onMetaData tag to standard
output (default command\n"
+ " without output file)\n"
+ " -F, --full-dump dump all tags to standard output\n"
" -C, --check check the validity of INPUT_FILE,
returning 0 if\n"
" the file is valid, or 10 if it
contains errors\n"
" -U, --update update computed onMetaData tag
from INPUT_FILE\n"
- " into OUTPUT_FILE (default with
output file)\n"
+ " into OUTPUT_FILE (default command
with output file)\n"
+ " -I, --inject inject metadata in an XML
specification file\n"
+ " from INPUT_FILE into OUTPUT_FILE\n"
/* " -A, --extract-audio extract raw audio data into
OUTPUT_FILE\n"*/
/* " -E, --extract-video extract raw video data into
OUTPUT_FILE\n"*/
"\nDump options:\n"
@@ -134,6 +139,9 @@
" (the default is to stop with an
error)\n"
" -t, --reset-timestamps reset timestamps so OUTPUT_FILE
starts at zero\n"
" -k, --all-keyframes index all keyframe tags, including
duplicate timestamps\n"
+ "\nInject options:\n"
+ " -u, --input-file name of the XML specification
file, if omitted,\n"
+ " data will be read from standard
input\n"
"\nCommon options:\n"
" -v, --verbose display informative messages\n"
"\nMiscellaneous:\n"
==============================================================================
Revision: 1f50699bdc99
Author: Marc Noirot <marc....@gmail.com>
Date: Mon Dec 10 07:57:34 2012
Log: Added FLV buffer copy helper functions.
http://code.google.com/p/flvmeta/source/detail?r=1f50699bdc99
Modified:
/src/flv.c
/src/flv.h
=======================================
--- /src/flv.c Sun Apr 22 02:58:28 2012
+++ /src/flv.c Mon Dec 10 07:57:34 2012
@@ -68,7 +68,7 @@
|| header->signature[2] != 'V') {
return FLV_ERROR_NO_FLV;
}
-
+
stream->state = FLV_STREAM_STATE_PREV_TAG_SIZE;
return FLV_OK;
}
@@ -120,13 +120,13 @@
lfs_fseek(stream->flvin, stream->current_tag_offset + FLV_TAG_SIZE
+ uint24_be_to_uint32(stream->current_tag.body_length), SEEK_SET);
stream->state = FLV_STREAM_STATE_PREV_TAG_SIZE;
}
-
+
/* skip previous tag size */
if (stream->state == FLV_STREAM_STATE_PREV_TAG_SIZE) {
lfs_fseek(stream->flvin, sizeof(uint32_be), SEEK_CUR);
stream->state = FLV_STREAM_STATE_TAG;
}
-
+
if (stream->state == FLV_STREAM_STATE_TAG) {
stream->current_tag_offset = lfs_ftell(stream->flvin);
@@ -165,7 +165,7 @@
if (fread(tag, sizeof(flv_audio_tag), 1, stream->flvin) == 0) {
return FLV_ERROR_EOF;
}
-
+
if (stream->current_tag_body_length >= sizeof(flv_audio_tag)) {
stream->current_tag_body_length -= sizeof(flv_audio_tag);
}
@@ -233,7 +233,7 @@
if (stream->current_tag_body_length == 0) {
return FLV_ERROR_EMPTY_TAG;
}
-
+
/* read metadata name */
d = amf_data_file_read(stream->flvin);
*name = d;
@@ -244,7 +244,7 @@
else if (error_code != AMF_ERROR_OK) {
return FLV_ERROR_INVALID_METADATA_NAME;
}
-
+
/* if only name can be read, metadata are invalid */
data_size = amf_data_size(d);
if (stream->current_tag_body_length > data_size) {
@@ -261,7 +261,7 @@
return FLV_ERROR_INVALID_METADATA;
}
-
+
/* read metadata contents */
d = amf_data_file_read(stream->flvin);
*data = d;
@@ -272,7 +272,7 @@
if (error_code != AMF_ERROR_OK) {
return FLV_ERROR_INVALID_METADATA;
}
-
+
data_size = amf_data_size(d);
if (stream->current_tag_body_length >= data_size) {
stream->current_tag_body_length -= (uint32)data_size;
@@ -304,7 +304,7 @@
bytes_number = (buffer_size > stream->current_tag_body_length) ?
stream->current_tag_body_length : buffer_size;
bytes_number = fread(buffer, sizeof(byte), bytes_number,
stream->flvin);
-
+
stream->current_tag_body_length -= (uint32)bytes_number;
if (stream->current_tag_body_length == 0) {
@@ -341,6 +341,62 @@
free(stream);
}
}
+
+/* FLV buffer copy helper functions */
+size_t flv_copy_header(void * to, const flv_header * header, size_t
buffer_size) {
+ char * out = to;
+ if (buffer_size < FLV_HEADER_SIZE) {
+ return 0;
+ }
+
+ memcpy(out, &header->signature, sizeof(header->signature));
+ out += sizeof(header->signature);
+
+ memcpy(out, &header->version, sizeof(header->version));
+ out += sizeof(header->version);
+
+ memcpy(out, &header->flags, sizeof(header->flags));
+ out += sizeof(header->flags);
+
+ memcpy(out, &header->offset, sizeof(header->offset));
+
+ return FLV_HEADER_SIZE;
+}
+
+size_t flv_copy_tag(void * to, const flv_tag * tag, size_t buffer_size) {
+ char * out = to;
+ if (buffer_size < FLV_TAG_SIZE) {
+ return 0;
+ }
+
+ memcpy(out, &tag->type, sizeof(tag->type));
+ out += sizeof(tag->type);
+
+ memcpy(out, &tag->body_length, sizeof(tag->body_length));
+ out += sizeof(tag->body_length);
+
+ memcpy(out, &tag->timestamp, sizeof(tag->timestamp));
+ out += sizeof(tag->timestamp);
+
+ memcpy(out, &tag->timestamp_extended, sizeof(tag->timestamp_extended));
+ out += sizeof(tag->timestamp_extended);
+
+ memcpy(out, &tag->stream_id, sizeof(tag->stream_id));
+
+ return FLV_TAG_SIZE;
+}
+
+size_t flv_copy_prev_tag_size(void *to, uint32 prev_tag_size, size_t
buffer_size) {
+ uint32_be pts = swap_uint32(prev_tag_size);
+
+ if (buffer_size < sizeof(uint32)) {
+ return 0;
+ }
+
+ memcpy(to, &pts, sizeof(uint32_be));
+
+ return sizeof(uint32_be);
+}
/* FLV stdio writing helper functions */
size_t flv_write_header(FILE * out, const flv_header * header) {
@@ -482,7 +538,7 @@
}
}
}
-
+
if (parser->on_stream_end != NULL) {
retval = parser->on_stream_end(parser);
if (retval != FLV_OK) {
=======================================
--- /src/flv.h Thu Apr 5 09:32:57 2012
+++ /src/flv.h Mon Dec 10 07:57:34 2012
@@ -175,6 +175,11 @@
void flv_reset(flv_stream * stream);
void flv_close(flv_stream * stream);
+/* FLV buffer copy helper functions */
+size_t flv_copy_header(void * to, const flv_header * header, size_t
buffer_size);
+size_t flv_copy_tag(void * to, const flv_tag * tag, size_t buffer_size);
+size_t flv_copy_prev_tag_size(void * to, uint32 prev_tag_size, size_t
buffer_size);
+
/* FLV stdio writing helper functions */
size_t flv_write_header(FILE * out, const flv_header * header);
size_t flv_write_tag(FILE * out, const flv_tag * tag);
==============================================================================
Revision: 7294984acd84
Author: Marc Noirot <marc....@gmail.com>
Date: Fri Dec 28 03:05:07 2012
Log: Added typedef and constants for AVC packet types.
http://code.google.com/p/flvmeta/source/detail?r=7294984acd84
Modified:
/src/flv.h
=======================================
--- /src/flv.h Mon Dec 10 07:57:34 2012
+++ /src/flv.h Fri Dec 28 03:05:07 2012
@@ -139,6 +139,13 @@
#define flv_video_tag_codec_id(tag) (((tag) & 0x0F) >> 0)
#define flv_video_tag_frame_type(tag) (((tag) & 0xF0) >> 4)
+/* AVC packet types */
+typedef byte flv_avc_packet_type;
+
+#define FLV_AVC_PACKET_TYPE_SEQUENCE_HEADER 0
+#define FLV_AVC_PACKET_TYPE_NALU 1
+#define FLV_AVC_PACKET_TYPE_SEQUENCE_END 2
+
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
==============================================================================
Revision: d0271d2d117a
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jan 5 04:20:36 2013
Log: Updated copyright notices to 2013.
http://code.google.com/p/flvmeta/source/detail?r=d0271d2d117a
Modified:
/INSTALL
/man/flvmeta.1.md
/src/amf.c
/src/amf.h
/src/avc.c
/src/avc.h
/src/check.c
/src/check.h
/src/compat/win32_tmpfile.c
/src/compat/win32_tmpfile.h
/src/dump.c
/src/dump.h
/src/dump_json.c
/src/dump_json.h
/src/dump_raw.c
/src/dump_raw.h
/src/dump_xml.c
/src/dump_xml.h
/src/dump_yaml.c
/src/dump_yaml.h
/src/flv.c
/src/flv.h
/src/flvmeta.c
/src/flvmeta.h
/src/info.c
/src/info.h
/src/json.c
/src/json.h
/src/types.c
/src/types.h
/src/update.c
/src/update.h
/src/util.c
/src/util.h
=======================================
--- /INSTALL Sat Jul 21 03:29:39 2012
+++ /INSTALL Sat Jan 5 04:20:36 2013
@@ -1,4 +1,4 @@
-Copyright (c) 2012 Marc Noirot
+Copyright (c) 2012-2013 Marc Noirot
How to Build FLVmeta with CMake
=======================================
--- /man/flvmeta.1.md Fri Oct 12 02:57:38 2012
+++ /man/flvmeta.1.md Sat Jan 5 04:20:36 2013
@@ -303,7 +303,7 @@
# COPYRIGHT
-Copyright 2007-2012 Marc Noirot
+Copyright 2007-2013 Marc Noirot
This is free software; see the source for copying conditions.
There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
PARTICULAR
=======================================
--- /src/amf.c Tue Apr 3 02:23:47 2012
+++ /src/amf.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: amf.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/amf.h Tue Apr 3 02:23:47 2012
+++ /src/amf.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: amf.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/avc.c Mon Jun 11 05:06:14 2012
+++ /src/avc.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: avc.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/avc.h Tue Apr 3 02:23:47 2012
+++ /src/avc.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: avc.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/check.c Thu Apr 12 02:07:34 2012
+++ /src/check.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: check.c 236 2011-08-10 15:30:04Z marc....@gmail.com $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/check.h Thu Apr 5 09:32:57 2012
+++ /src/check.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: check.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/compat/win32_tmpfile.c Tue Apr 3 02:23:47 2012
+++ /src/compat/win32_tmpfile.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: win32_tmpfile.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/compat/win32_tmpfile.h Tue Apr 3 02:23:47 2012
+++ /src/compat/win32_tmpfile.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: win32_tmpfile.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/dump.c Mon Apr 30 08:42:22 2012
+++ /src/dump.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: dump.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/dump.h Tue Apr 3 02:23:47 2012
+++ /src/dump.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: dump.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/dump_json.c Tue May 1 13:10:40 2012
+++ /src/dump_json.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: dump_json.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/dump_json.h Mon Apr 30 08:42:22 2012
+++ /src/dump_json.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: dump_json.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/dump_raw.c Mon Apr 30 08:42:22 2012
+++ /src/dump_raw.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: dump_raw.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/dump_raw.h Mon Apr 30 08:42:22 2012
+++ /src/dump_raw.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: dump_raw.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/dump_xml.c Mon Apr 30 08:42:22 2012
+++ /src/dump_xml.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: dump_xml.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/dump_xml.h Mon Apr 30 08:42:22 2012
+++ /src/dump_xml.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: dump_xml.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/dump_yaml.c Mon Apr 30 08:42:22 2012
+++ /src/dump_yaml.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: dump_yaml.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/dump_yaml.h Mon Apr 30 08:42:22 2012
+++ /src/dump_yaml.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: dump_yaml.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/flv.c Mon Dec 10 07:57:34 2012
+++ /src/flv.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: flv.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/flv.h Fri Dec 28 03:05:07 2012
+++ /src/flv.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: flv.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/flvmeta.c Sun Apr 29 11:49:47 2012
+++ /src/flvmeta.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: flvmeta.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/flvmeta.h Sun Apr 29 11:49:47 2012
+++ /src/flvmeta.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: flvmeta.h 231 2011-06-27 13:46:19Z marc.noirot $
+ FLVmeta - FLV Metadata Editor
- FLV Metadata updater
-
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
@@ -32,7 +30,7 @@
#include "flv.h"
/* copyright string */
-#define COPYRIGHT_STR "Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT
gmail.com>"
+#define COPYRIGHT_STR "Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT
gmail.com>"
/* error statuses */
#define OK FLV_OK
=======================================
--- /src/info.c Thu Apr 5 09:32:57 2012
+++ /src/info.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: info.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/info.h Thu Apr 5 09:32:57 2012
+++ /src/info.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: info.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/json.c Fri May 4 05:44:38 2012
+++ /src/json.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: json.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/json.h Tue May 1 13:10:40 2012
+++ /src/json.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: json.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/types.c Tue Apr 3 02:23:47 2012
+++ /src/types.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: types.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/types.h Tue Apr 3 02:23:47 2012
+++ /src/types.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: types.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/update.c Mon Jun 11 14:21:16 2012
+++ /src/update.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: update.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/update.h Tue Apr 3 02:23:47 2012
+++ /src/update.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: update.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/util.c Tue Apr 3 02:23:47 2012
+++ /src/util.c Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: util.c 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
=======================================
--- /src/util.h Tue Apr 3 02:23:47 2012
+++ /src/util.h Sat Jan 5 04:20:36 2013
@@ -1,9 +1,7 @@
/*
- $Id: util.h 231 2011-06-27 13:46:19Z marc.noirot $
-
- FLV Metadata updater
+ FLVmeta - FLV Metadata Editor
- Copyright (C) 2007-2012 Marc Noirot <marc.noirot AT gmail.com>
+ Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
This file is part of FLVMeta.
==============================================================================
Revision: 1e9a602367f1
Author: Marc Noirot <marc....@gmail.com>
Date: Sat Jan 5 05:26:45 2013
Log: Fixed FLVMeta product spelling.
http://code.google.com/p/flvmeta/source/detail?r=1e9a602367f1
Modified:
/src/amf.c
/src/amf.h
/src/avc.c
/src/avc.h
/src/check.c
/src/check.h
/src/compat/win32_tmpfile.c
/src/compat/win32_tmpfile.h
/src/dump.c
/src/dump.h
/src/dump_json.c
/src/dump_json.h
/src/dump_raw.c
/src/dump_raw.h
/src/dump_xml.c
/src/dump_xml.h
/src/dump_yaml.c
/src/dump_yaml.h
/src/flv.c
/src/flv.h
/src/flvmeta.c
/src/flvmeta.h
/src/info.c
/src/info.h
/src/json.c
/src/json.h
/src/types.c
/src/types.h
/src/update.c
/src/update.h
/src/util.c
/src/util.h
=======================================
--- /src/amf.c Sat Jan 5 04:20:36 2013
+++ /src/amf.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/amf.h Sat Jan 5 04:20:36 2013
+++ /src/amf.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/avc.c Sat Jan 5 04:20:36 2013
+++ /src/avc.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/avc.h Sat Jan 5 04:20:36 2013
+++ /src/avc.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/check.c Sat Jan 5 04:20:36 2013
+++ /src/check.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/check.h Sat Jan 5 04:20:36 2013
+++ /src/check.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/compat/win32_tmpfile.c Sat Jan 5 04:20:36 2013
+++ /src/compat/win32_tmpfile.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/compat/win32_tmpfile.h Sat Jan 5 04:20:36 2013
+++ /src/compat/win32_tmpfile.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/dump.c Sat Jan 5 04:20:36 2013
+++ /src/dump.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/dump.h Sat Jan 5 04:20:36 2013
+++ /src/dump.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/dump_json.c Sat Jan 5 04:20:36 2013
+++ /src/dump_json.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/dump_json.h Sat Jan 5 04:20:36 2013
+++ /src/dump_json.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/dump_raw.c Sat Jan 5 04:20:36 2013
+++ /src/dump_raw.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/dump_raw.h Sat Jan 5 04:20:36 2013
+++ /src/dump_raw.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/dump_xml.c Sat Jan 5 04:20:36 2013
+++ /src/dump_xml.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/dump_xml.h Sat Jan 5 04:20:36 2013
+++ /src/dump_xml.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/dump_yaml.c Sat Jan 5 04:20:36 2013
+++ /src/dump_yaml.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/dump_yaml.h Sat Jan 5 04:20:36 2013
+++ /src/dump_yaml.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/flv.c Sat Jan 5 04:20:36 2013
+++ /src/flv.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/flv.h Sat Jan 5 04:20:36 2013
+++ /src/flv.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/flvmeta.c Sat Jan 5 04:20:36 2013
+++ /src/flvmeta.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/flvmeta.h Sat Jan 5 04:20:36 2013
+++ /src/flvmeta.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/info.c Sat Jan 5 04:20:36 2013
+++ /src/info.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/info.h Sat Jan 5 04:20:36 2013
+++ /src/info.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/json.c Sat Jan 5 04:20:36 2013
+++ /src/json.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/json.h Sat Jan 5 04:20:36 2013
+++ /src/json.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/types.c Sat Jan 5 04:20:36 2013
+++ /src/types.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/types.h Sat Jan 5 04:20:36 2013
+++ /src/types.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/update.c Sat Jan 5 04:20:36 2013
+++ /src/update.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/update.h Sat Jan 5 04:20:36 2013
+++ /src/update.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/util.c Sat Jan 5 04:20:36 2013
+++ /src/util.c Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
=======================================
--- /src/util.h Sat Jan 5 04:20:36 2013
+++ /src/util.h Sat Jan 5 05:26:45 2013
@@ -1,5 +1,5 @@
/*
- FLVmeta - FLV Metadata Editor
+ FLVMeta - FLV Metadata Editor
Copyright (C) 2007-2013 Marc Noirot <marc.noirot AT gmail.com>
Reply all
Reply to author
Forward
0 new messages