summaryrefslogtreecommitdiff
path: root/tools/qt-faststart.c
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * tools: K&R reformatting cosmeticsDiego Biurrun2012-01-25
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: whitespace cosmetics fate: split off video codec FATE tests into their own file fate: split off audio codec FATE tests into their own file fate: split off Electronic Arts codec FATE tests into their own file fate: split off QuickTime codec FATE tests into their own file fate: split off voice codec FATE tests into their own file fate: split off demuxer FATE tests into their own file cosmetics: Drop unnecessary parentheses around return values. fate: drop pointless _audio and _video suffixes from xan tests qt-faststart: K&R reformatting; fix comment typos FATE: Add test for H.264 MP4->annex.B bitstream filter. Conflicts: ffplay.c tests/fate.mak tests/fate/h264.mak tests/fate/image.mak tests/fate/lossless-audio.mak tests/fate/lossless-video.mak tests/fate/qtrle.mak tests/fate/real.mak tests/fate/screen.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qt-faststart: K&R reformatting; fix comment typosDiego Biurrun2011-12-30
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: split off DPCM codec FATE tests into their own file fate: split off PCM codec FATE tests into their own file libvorbis: K&R reformatting cosmetics libmp3lame: K&R formatting cosmetics fate: Add a video test for xxan decoder mpegvideo_enc: K&R cosmetics (line 1000-2000). avconv: K&R cosmetics qt-faststart: Fix up indentation indeo4: remove two unused variables doxygen: cleanup style to support older doxy fate: add more tests for VC-1 decoder applehttpproto: Apply the same reload interval changes as for the demuxer applehttp: Use half the target duration as interval if the playlist didn't update applehttp: Use the last segment duration as reload interval lagarith: add decode support for arith rgb24 mode Conflicts: avconv.c libavcodec/libmp3lame.c libavcodec/mpegvideo_enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qt-faststart: Fix up indentationMartin Storsjö2011-12-29
| | | | | | | | | | | | This restores indentation after 65b875d8fcc. Signed-off-by: Martin Storsjö <martin@martin.st>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* fail if input and output are the sameBaptiste Coudurier2010-06-21
| | | | Originally committed as revision 23672 to svn://svn.ffmpeg.org/ffmpeg/trunk
* qt-faststart: Abort scanning of the input file if a badly sized atom is ↵Martin Storsjö2010-05-13
| | | | | | | | | encountered If the atom size is 0, qt-faststart currently hangs forever while scanning the file. Originally committed as revision 23129 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics: Initialize pointers with NULL instead of 0, for consistencyMartin Storsjö2010-05-13
| | | | Originally committed as revision 23127 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics: reindentMartin Storsjö2010-05-13
| | | | Originally committed as revision 23126 to svn://svn.ffmpeg.org/ffmpeg/trunk
* qt-faststart: Use the error_out cleanup code path for all error returnsMartin Storsjö2010-05-13
| | | | Originally committed as revision 23125 to svn://svn.ffmpeg.org/ffmpeg/trunk
* qt-faststart: Avoid leaking memory if encountering a file with double ftyp atomsMartin Storsjö2010-05-09
| | | | Originally committed as revision 23065 to svn://svn.ffmpeg.org/ffmpeg/trunk
* qt-faststart: Free ftyp_atom at all exit pointsMartin Storsjö2010-05-01
| | | | Originally committed as revision 23008 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reindent after the previous commitMartin Storsjö2010-05-01
| | | | Originally committed as revision 23007 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove unnecessary checks before calling freeMartin Storsjö2010-05-01
| | | | | | | Feel free to revert if you can specify a concrete case where this actually is necessary. Originally committed as revision 23006 to svn://svn.ffmpeg.org/ffmpeg/trunk
* print atom info during parsing, patch by Frank Barchard, fbarchard at google ↵Frank Barchard2009-07-15
| | | | | | dot com Originally committed as revision 19435 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not fail if 'uuid' atom is encountered before 'moov'.Frank Barchard2009-07-06
| | | | | | Patch by Frank Barchard, fbarchard at google dot com. Originally committed as revision 19354 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use slightly more appropriate format strings for printing decimal values.Frank Barchard2009-07-01
| | | | | | patch by Frank Barchard, fbarchard google com Originally committed as revision 19315 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use more portable 'PRId64' instead of 'llx' as conversion/length specifier.Frank Barchard2009-06-30
| | | | | | patch by Frank Barchard, fbarchard google com Originally committed as revision 19309 to svn://svn.ffmpeg.org/ffmpeg/trunk
* correct build documentation for qt-faststart utilityMike Melanson2008-05-19
| | | | Originally committed as revision 13199 to svn://svn.ffmpeg.org/ffmpeg/trunk
* create and populate "tools" directoryMåns Rullgård2007-07-13
Originally committed as revision 9634 to svn://svn.ffmpeg.org/ffmpeg/trunk