RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
44,925 Commits 37 Branches 400 Tags 271 MiB
Commit Graph

21 Commits

Author SHA1 Message Date
Michael Niedermayer 1e19927f12 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vc1: use an enum for Frame Coding Mode
  doc: cleanup filter section
  indeo3: error out if no motion vector is set.
  x86inc: Flag shufps as an floating-point instruction for the AVX emulation code.
  mpegaudio: do not use init_static_data() for initializing tables.
  musepack: fix signed shift overflow in mpc_read_packet()
  mov: Make format string match variable type.
  wmavoice: Make format string match variable type.
  vc1: select interlaced scan table by FCM element
  Generalize RIFF INFO tag support; support reading INFO tag in wav
  pthread: track thread existence in a separate variable.

Conflicts:
	doc/filters.texi
	libavcodec/pthread.c
	libavformat/avi.c
	libavformat/riff.c
	libavformat/riff.h
	libavformat/wav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-28 01:07:11 +01:00
Victor Vasiliev 12bc20502a Generalize RIFF INFO tag support; support reading INFO tag in wav 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-11-26 17:14:13 -08: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
longstone 4c262dc140 avienc: fix AVI stream index for files with >10 streams 
Fixes issue 2563.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 4acc94e97a)
 2011-02-23 18:22:03 +01:00
longstone 4acc94e97a avienc: fix AVI stream index for files with >10 streams 
Fixes issue 2563.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-23 10:44:26 -05:00
Anton Khirnov 04d2540c4b Add AVI metadata conversion table. 
Patch by Anton Khirnov (gmail{wyskas}).

Originally committed as revision 21653 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-06 12:32:44 +00:00
Stefano Sabatini 987903826b Globally rename the header inclusion guard names. 
Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".

Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 07:39:47 +00:00
Aurelien Jacobs abf2dc9c9a avi.h does not use anything from avcodec.h. 
Originally committed as revision 12305 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-03 22:56:07 +00:00
Diego Biurrun b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library' 
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-07 15:30:46 +00:00
Diego Biurrun 04d7f60143 Add official LGPL license headers to the files that were missing them. 
Originally committed as revision 6219 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-10 14:02:42 +00:00
Måns Rullgård 9d9f4119bd move common stuff from avienc.c and wav.c to new file riff.c 
Originally committed as revision 5720 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-12 00:09:34 +00:00
Diego Biurrun bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting 
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-22 01:10:11 +00:00
Diego Biurrun 115329f160 COSMETICS: Remove all trailing whitespace. 
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-17 18:14:38 +00:00
Fabrice Bellard 155e9ee909 initial seek support 
Originally committed as revision 2502 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-10 18:48:33 +00:00
Fabrice Bellard 4358d5def3 removed ctype.h header 
Originally committed as revision 2225 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-09-08 20:04:44 +00:00
Zdenek Kabelac 546031ee86 * keeping compiler happy and quiet 
Originally committed as revision 1817 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-23 18:38:34 +00:00
Zdenek Kabelac 5d23497493 * more strict types 
Originally committed as revision 1815 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-23 08:56:14 +00:00
Roman Shaposhnik e738cee9c4 Complete support for OpenDML AVIs and AVIs > 2Gb. 
Originally committed as revision 1814 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-23 02:04:40 +00:00
Roman Shaposhnik ce9fce63c5 AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>) 
Originally committed as revision 1741 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-08 09:51:15 +00:00
Roman Shaposhnik 2e7973bbe7 correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>) 
Originally committed as revision 1664 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-12 01:35:47 +00:00
Fabrice Bellard abac617591 renamed libav to libavformat 
Originally committed as revision 1276 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-11-25 19:07:40 +00:00