• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 3c5fe5b5
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    3c5fe5b5
.gitignore 776 Bytes