ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-28 01:00:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,022 Commits 37 Branches 398 Tags 540 MiB
378b7beff5
Commit Graph

20 Commits

Author SHA1 Message Date
Michael Niedermayer
1a6a088f7c Merge remote-tracking branch 'qatar/master' 
* 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>
 2011-12-31 01:16:45 +01:00
Diego Biurrun
cd8d84575b qt-faststart: K&R reformatting; fix comment typos 2011-12-30 21:14:07 +01:00
Michael Niedermayer
00c0465dbc Merge remote-tracking branch 'qatar/master' 
* 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>
 2011-12-30 03:46:24 +01:00
Martin Storsjö
cf4afe0be6 qt-faststart: Fix up indentation 
This restores indentation after 65b875d8fc.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-29 19:15:28 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Baptiste Coudurier
91a4abd8f5 fail if input and output are the same 
Originally committed as revision 23672 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-21 01:05:30 +00:00
Martin Storsjö
86e09922a5 qt-faststart: Abort scanning of the input file if a badly sized atom is 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
 2010-05-13 19:22:56 +00:00
Martin Storsjö
2ef9fd8e9b Cosmetics: Initialize pointers with NULL instead of 0, for consistency 
Originally committed as revision 23127 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-13 19:18:27 +00:00
Martin Storsjö
e3d7269fc8 Cosmetics: reindent 
Originally committed as revision 23126 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-13 19:17:49 +00:00
Martin Storsjö
c937454d89 qt-faststart: Use the error_out cleanup code path for all error returns 
Originally committed as revision 23125 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-13 19:17:15 +00:00
Martin Storsjö
6ad533b7cb qt-faststart: Avoid leaking memory if encountering a file with double ftyp atoms 
Originally committed as revision 23065 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-09 17:46:42 +00:00
Martin Storsjö
d296a658cf qt-faststart: Free ftyp_atom at all exit points 
Originally committed as revision 23008 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-01 21:05:28 +00:00
Martin Storsjö
331cb6c3e8 Reindent after the previous commit 
Originally committed as revision 23007 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-01 21:03:52 +00:00
Martin Storsjö
d50fc2d07b Remove unnecessary checks before calling free 
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
 2010-05-01 21:02:23 +00:00
Frank Barchard
65b875d8fc print atom info during parsing, patch by Frank Barchard, fbarchard at google dot com 
Originally committed as revision 19435 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-15 08:57:27 +00:00
Frank Barchard
31457d7a2e Do not fail if 'uuid' atom is encountered before 'moov'. 
Patch by Frank Barchard, fbarchard at google dot com.

Originally committed as revision 19354 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-06 05:36:14 +00:00
Frank Barchard
06a497afab Use slightly more appropriate format strings for printing decimal values. 
patch by Frank Barchard, fbarchard google com

Originally committed as revision 19315 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-01 13:46:26 +00:00
Frank Barchard
cb28f95454 Use more portable 'PRId64' instead of 'llx' as conversion/length specifier. 
patch by Frank Barchard, fbarchard google com

Originally committed as revision 19309 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-30 15:11:51 +00:00
Mike Melanson
3c16e03dbc correct build documentation for qt-faststart utility 
Originally committed as revision 13199 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-19 04:57:57 +00:00
Måns Rullgård
c07ed8c8a2 create and populate "tools" directory 
Originally committed as revision 9634 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-13 21:33:24 +00:00