virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Code Issues Releases Activity
35,991 Commits 37 Branches 400 Tags 462 MiB
4d475f7eb3
Commit Graph

24 Commits

Author SHA1 Message Date
Michael Niedermayer
8bc7fe4daf Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doxygen: misc consistency, spelling and wording fixes
  vcr1: drop unnecessary emms_c() calls without MMX code
  Replace all uses of av_close_input_file() with avformat_close_input().
  lavf: add avformat_close_input().
  lavf: deprecate av_close_input_stream().
  lavf doxy: add some basic demuxing documentation.
  lavf doxy: add some general lavf information.
  lavf doxy: add misc utility functions to a group.
  lavf doxy: add av_guess_codec/format to the encoding group.
  lavf doxy: add core functions to a doxy group.
  Add basic libavdevice documentation.
  lavc: convert error_recognition to err_recognition.
  avconv: update -map option help text
  x86: Require 7 registers for the cabac asm
  x86: bswap: remove test for bswap instruction
  bswap: make generic implementation more compiler-friendly
  h264: remove useless cast
  proresdec: fix decode_slice() prototype

Conflicts:
	configure
	doc/APIchanges
	ffprobe.c
	libavcodec/avcodec.h
	libavcodec/celp_math.h
	libavcodec/h264.c
	libavfilter/src_movie.c
	libavformat/anm.c
	libavformat/avformat.h
	libavformat/version.h
	libavutil/avstring.h
	libavutil/bswap.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 00:39:48 +01:00
Diego Biurrun
58c42af722 doxygen: misc consistency, spelling and wording fixes 2011-12-12 23:06:23 +01:00
Michael Niedermayer
612122b187 Merge remote branch 'qatar/master' 
* qatar/master: (32 commits)
  10-bit H.264 x86 chroma v loopfilter asm
  Port SMPTE S302M audio decoder from FFmbc 0.3. [Copyright headers corrected]
  Fix crash of interlaced MPEG2 decoding
  h264pred: fix one more aliasing violation.
  doc/APIchanges: fill in missing hashes and dates.
  flacenc: use proper initializers for AVOption default values.
  lavc: deprecate named constants for deprecated antialias_algo.
  aac: workaround for compilation on cygwin
  swscale: extend YUV422p support to 10bits depth
  tiff: add support for inverted FillOrder for uncompressed data
  Remove unused softfloat implementation.
  h264pred: fix aliasing violations.
  rotozoom: Eliminate French variable name.
  rotozoom: Check return value of fread().
  rotozoom: Return an error value instead of calling exit().
  rotozoom: Make init_demo() return int and check for errors on invocation.
  rotozoom: Drop silly UINT8 typedef.
  rotozoom: Drop some unnecessary parentheses.
  rotozoom: K&R coding style cosmetics
  rtsp: Only do keepalive using GET_PARAMETER if the server supports it
  ...

Conflicts:
	Changelog
	cmdutils.c
	doc/APIchanges
	doc/general.texi
	ffmpeg.c
	ffplay.c
	libavcodec/h264pred_template.c
	libavcodec/resample.c
	libavutil/pixfmt.h
	libavutil/softfloat.c
	libavutil/softfloat.h
	tests/rotozoom.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-12 04:51:24 +02:00
Diego Biurrun
e1e0ca70eb rotozoom: Eliminate French variable name. 2011-05-11 11:54:58 +02:00
Diego Biurrun
cbb0930f0e rotozoom: Check return value of fread(). 
This fixes the warnings:
tests/rotozoom.c:252: warning: ignoring return value of ‘fread’, declared with attribute warn_unused_result
tests/rotozoom.c:254: warning: ignoring return value of ‘fread’, declared with attribute warn_unused_result
 2011-05-11 11:54:57 +02:00
Diego Biurrun
771339ca20 rotozoom: Return an error value instead of calling exit(). 2011-05-11 11:54:57 +02:00
Diego Biurrun
2131e8590c rotozoom: Make init_demo() return int and check for errors on invocation. 2011-05-11 11:54:57 +02:00
Diego Biurrun
5a37c12c82 rotozoom: Drop silly UINT8 typedef. 2011-05-11 11:54:57 +02:00
Diego Biurrun
e9c10459a3 rotozoom: Drop some unnecessary parentheses. 2011-05-11 11:54:57 +02:00
Diego Biurrun
f628559d9a rotozoom: K&R coding style cosmetics 2011-05-11 11:54:56 +02:00
Diego Biurrun
03acaa4a43 tests: Remove disabled code. 2011-04-29 18:08:46 +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
Carl Eugen Hoyos
6c2a778d38 Remove unused global variable. 
Originally committed as revision 19483 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-22 08:28:58 +00:00
Carl Eugen Hoyos
9276b8f0cc Calculate gradient from parameter instead of using a global variable. 
Originally committed as revision 19482 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-22 08:26:17 +00:00
Diego Biurrun
6f2162b471 Mark functions only used within the test programs as static. 
Originally committed as revision 17454 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-19 10:09:46 +00:00
Diego Biurrun
01d193aaec Relicense to LGPL and add standard license header. 
Approved by the author, Sebastien Bechet, over email.

Originally committed as revision 8188 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-02 10:15:07 +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
Sam Hocevar
528bbdde7f Add a leading zero to the sequence files generated by the testsuite 
so they always appear in proper order.
patch by Sam Hocevar < sam -- at -- zoy -- dot -- org >

Originally committed as revision 4606 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-09-21 00:09:02 +00:00
Michael Niedermayer
6feb1de50f r/w -> rb/wb 
Originally committed as revision 3774 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-24 12:34:11 +00:00
Fabrice Bellard
67f7f31697 use explicit image name 
Originally committed as revision 1930 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-06-05 12:36:34 +00:00
Michael Niedermayer
2add6b5db7 use bilinear interpolation for the rotozoom 
Originally committed as revision 1759 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-12 02:32:33 +00:00
Michael Niedermayer
6afd3b92b4 finished integrating rotozoom test in ffmpeg 
replaced float by integer to avoid rounding differenes between platforms

Originally committed as revision 1755 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-11 13:43:17 +00:00
Michael Niedermayer
6696163608 alternative test video generator by (Sebastien Bechet <s dot bechet at av7 dot net>) 
Originally committed as revision 1754 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-11 10:07:57 +00:00