Merge remote-tracking branch 'qatar/master'

* qatar/master: (22 commits)
  wma: Clip WMA1 and WMA2 frame length to 11 bits.
  movenc: Don't require frame_size to be set for modes other than mov
  doc: Update APIchanges with info on muxer flushing
  movenc: Reindent a block
  tools: Remove some unnecessary #undefs.
  rv20: prevent calling ff_h263_decode_mba() with unset height/width
  tools: K&R reformatting cosmetics
  Ignore generated aviocat and ismindex tools.
  build: Automatically include architecture-specific library Makefile snippets.
  indeo5: prevent null pointer dereference on broken files
  pktdumper: Use usleep instead of sleep
  cosmetics: Remove some unnecessary block braces.
  Drop unnecessary prefix from *sink* variable and struct names.
  Add a tool for creating smooth streaming manifests
  movdec: Calculate an average bit rate for fragmented streams, too
  movenc: Write the sample rate instead of time scale in the stsd atom
  movenc: Add a separate ismv/isma (smooth streaming) muxer
  movenc: Allow the caller to decide on fragmentation
  libavformat: Add a flag for muxers that support write_packet(NULL) for flushing
  movenc: Add support for writing fragmented mov files
  ...

Conflicts:
	Changelog
	cmdutils.c
	cmdutils.h
	doc/APIchanges
	ffmpeg.c
	ffplay.c
	libavfilter/Makefile
	libavformat/Makefile
	libavformat/avformat.h
	libavformat/movenc.c
	libavformat/movenc.h
	libavformat/version.h
	tools/graph2dot.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 25 insertions, 31 deletions

diff --git a/tools/cws2fws.c b/tools/cws2fws.c
index 35fce35683..68f7953b56 100644
--- a/tools/cws2fws.c
+++ b/tools/cws2fws.c
@@ -26,46 +26,42 @@ int main(int argc, char *argv[])
     z_stream zstream;
     struct stat statbuf;
 
-    if (argc < 3)
-    {
+    if (argc < 3) {
         printf("Usage: %s <infile.swf> <outfile.swf>\n", argv[0]);
         return 1;
     }
 
     fd_in = open(argv[1], O_RDONLY);
-    if (fd_in < 0)
-    {
+    if (fd_in < 0) {
         perror("Error opening input file");
         return 1;
     }
 
-    fd_out = open(argv[2], O_WRONLY|O_CREAT, 00644);
-    if (fd_out < 0)
-    {
+    fd_out = open(argv[2], O_WRONLY | O_CREAT, 00644);
+    if (fd_out < 0) {
         perror("Error opening output file");
         close(fd_in);
         return 1;
     }
 
-    if (read(fd_in, &buf_in, 8) != 8)
-    {
+    if (read(fd_in, &buf_in, 8) != 8) {
         printf("Header error\n");
         close(fd_in);
         close(fd_out);
         return 1;
     }
 
-    if (buf_in[0] != 'C' || buf_in[1] != 'W' || buf_in[2] != 'S')
-    {
+    if (buf_in[0] != 'C' || buf_in[1] != 'W' || buf_in[2] != 'S') {
         printf("Not a compressed flash file\n");
         return 1;
     }
 
     fstat(fd_in, &statbuf);
-    comp_len = statbuf.st_size;
+    comp_len   = statbuf.st_size;
     uncomp_len = buf_in[4] | (buf_in[5] << 8) | (buf_in[6] << 16) | (buf_in[7] << 24);
 
-    printf("Compressed size: %d Uncompressed size: %d\n", comp_len-4, uncomp_len-4);
+    printf("Compressed size: %d Uncompressed size: %d\n",
+           comp_len - 4, uncomp_len - 4);
 
     // write out modified header
     buf_in[0] = 'F';
@@ -75,36 +71,35 @@ int main(int argc, char *argv[])
     }
 
     zstream.zalloc = NULL;
-    zstream.zfree = NULL;
+    zstream.zfree  = NULL;
     zstream.opaque = NULL;
     inflateInit(&zstream);
 
-    for (i = 0; i < comp_len-8;)
-    {
+    for (i = 0; i < comp_len - 8;) {
         int ret, len = read(fd_in, &buf_in, 1024);
 
         dbgprintf("read %d bytes\n", len);
 
         last_out = zstream.total_out;
 
-        zstream.next_in = &buf_in[0];
-        zstream.avail_in = len;
-        zstream.next_out = &buf_out[0];
+        zstream.next_in   = &buf_in[0];
+        zstream.avail_in  = len;
+        zstream.next_out  = &buf_out[0];
         zstream.avail_out = 65536;
 
         ret = inflate(&zstream, Z_SYNC_FLUSH);
-        if (ret != Z_STREAM_END && ret != Z_OK)
-        {
+        if (ret != Z_STREAM_END && ret != Z_OK) {
             printf("Error while decompressing: %d\n", ret);
             inflateEnd(&zstream);
             return 1;
         }
 
         dbgprintf("a_in: %d t_in: %lu a_out: %d t_out: %lu -- %lu out\n",
-            zstream.avail_in, zstream.total_in, zstream.avail_out, zstream.total_out,
-            zstream.total_out-last_out);
+                  zstream.avail_in, zstream.total_in, zstream.avail_out,
+                  zstream.total_out, zstream.total_out - last_out);
 
-        if (write(fd_out, &buf_out, zstream.total_out - last_out) < zstream.total_out - last_out) {
+        if (write(fd_out, &buf_out, zstream.total_out - last_out) <
+            zstream.total_out - last_out) {
             perror("Error writing output file");
             return 1;
         }
@@ -115,15 +110,14 @@ int main(int argc, char *argv[])
             break;
     }
 
-    if (zstream.total_out != uncomp_len-8)
-    {
+    if (zstream.total_out != uncomp_len - 8) {
         printf("Size mismatch (%lu != %d), updating header...\n",
-            zstream.total_out, uncomp_len-8);
+               zstream.total_out, uncomp_len - 8);
 
-        buf_in[0] = (zstream.total_out+8) & 0xff;
-        buf_in[1] = ((zstream.total_out+8) >> 8) & 0xff;
-        buf_in[2] = ((zstream.total_out+8) >> 16) & 0xff;
-        buf_in[3] = ((zstream.total_out+8) >> 24) & 0xff;
+        buf_in[0] =  (zstream.total_out + 8)        & 0xff;
+        buf_in[1] = ((zstream.total_out + 8) >>  8) & 0xff;
+        buf_in[2] = ((zstream.total_out + 8) >> 16) & 0xff;
+        buf_in[3] = ((zstream.total_out + 8) >> 24) & 0xff;
 
         lseek(fd_out, 4, SEEK_SET);
         if (write(fd_out, &buf_in, 4) < 4) {