virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
29,520 Commits 37 Branches 400 Tags 460 MiB
ce62b35c31
Commit Graph

44 Commits

Author SHA1 Message Date
Michael Niedermayer
be315a3232 Merge remote branch 'qatar/master' 
* qatar/master:
Duplicate  AMV: disable DR1 and don't override EMU_EDGE
Duplicate  lavf: inspect more frames for fps when container time base is coarse
Wrong and we have correct fix: Fix races in default av_log handler
  vorbis: Replace sized int_fast integer types with plain int/unsigned.
  Remove disabled non-optimized code variants.
NO  bswap.h: Remove disabled code.
  Remove some disabled printf debug cruft.
  Replace more disabled printf() calls by av_dlog().
NO  tests: Remove disabled code.
NO  Replace some commented-out debug printf() / av_log() messages with av_dlog().
  vorbisdec: Replace some sizeof(type) by sizeof(*variable).
NO  vf_fieldorder: Replace FFmpeg by Libav in license boilerplate.

Conflicts:
	libavcodec/h264.c
	libavcodec/vorbisdec.c
	libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-30 01:58:26 +02:00
Diego Biurrun
a734fa575f Remove disabled non-optimized code variants. 2011-04-29 20:01:13 +02:00
Michael Niedermayer
d7e5aebae7 Merge remote branch 'qatar/master' 
* qatar/master: (23 commits)
  ac3enc: correct the flipped sign in the ac3_fixed encoder
  Eliminate pointless '#if 1' statements without matching '#else'.
  Add AVX FFT implementation.
  Increase alignment of av_malloc() as needed by AVX ASM.
  Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
  mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
  documentation: extend documentation for ffmpeg -aspect option
  APIChanges: update commit hashes for recent additions.
  lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
  aac: add headers needed for log2f()
  lavc: remove FF_API_MB_Q cruft
  lavc: remove FF_API_RATE_EMU cruft
  lavc: remove FF_API_HURRY_UP cruft
  pad: make the filter parametric
  vsrc_movie: add key_frame and pict_type.
  vsrc_movie: fix leak in request_frame()
  lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
  vsrc_buffer: add sample_aspect_ratio fields to arguments.
  lavfi: add fieldorder filter
  scale: make the filter parametric
  ...

Conflicts:
	Changelog
	doc/filters.texi
	ffmpeg.c
	libavcodec/ac3dec.h
	libavcodec/dsputil.c
	libavfilter/avfilter.h
	libavfilter/vf_scale.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-27 03:51:04 +02:00
Diego Biurrun
e6ff064845 Eliminate pointless '#if 1' statements without matching '#else'. 2011-04-26 20:18:27 +02:00
Oskar Arvidsson
8dbe585641 Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder. 
This patch lets e.g. dsputil_init chose dsp functions with respect to
the bit depth to decode. The naming scheme of bit depth dependent
functions is <base name>_<bit depth>[_<prefix>] (i.e. the old
clear_blocks_c is now named clear_blocks_8_c).

Note: Some of the functions for high bit depth is not dependent on the
bit depth, but only on the pixel size. This leaves some room for
optimizing binary size.

Preparatory patch for high bit depth h264 decoding support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-10 22:33:42 +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
Janne Grunau
2c3589bfda consolidate .gitignore patters into a single file 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-18 21:32:05 +01:00
Janne Grunau
348b8218f7 convert svn:ignore properties to .gitignore files 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-17 15:50:14 +01:00
Måns Rullgård
3bd74e9243 Simplify arch-specific object file lists 
Originally committed as revision 22570 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-16 21:23:03 +00:00
Måns Rullgård
43f60eba19 Move arch-specific makefile parts into $arch/Makefile 
Originally committed as revision 22569 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-16 21:22:59 +00:00
Måns Rullgård
dd14a04e4a Add missing includes in bfin and sh4 files 
Originally committed as revision 22342 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 20:17:51 +00:00
Måns Rullgård
b903fe9137 sh4: move dsputil prototypes to header file 
Originally committed as revision 22312 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 02:36:22 +00:00
Måns Rullgård
67e19a9e4b sh4: fix about 1000 warnings 
Originally committed as revision 22311 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 02:36:16 +00:00
Måns Rullgård
6dde9f8c20 SH4: fix typo in asm constraint 
Originally committed as revision 16503 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-09 03:05:11 +00:00
Diego Biurrun
9686df2be5 Delete unnecessary 'extern' keywords. 
Originally committed as revision 15990 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-03 15:23:30 +00:00
Måns Rullgård
516566a8ec SH4: fix IDCT 
Originally committed as revision 15897 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-20 22:57:57 +00:00
Måns Rullgård
c260b59603 SH4: fix memzero_align8() 
Originally committed as revision 15888 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-20 09:21:52 +00:00
Måns Rullgård
1a9e9a2fbd SH4: add macros for setting and restoring FPSCR.PR bit 
Originally committed as revision 15887 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-20 09:21:50 +00:00
Måns Rullgård
6f14b19e48 SH4: remove some commented out blocks of code 
Originally committed as revision 15886 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-20 09:21:46 +00:00
Måns Rullgård
df69be0c13 SH4: fix IDCT 
Originally committed as revision 15882 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-19 00:37:30 +00:00
Måns Rullgård
6f15dd8d14 SH4: do not mix code and declarations 
Originally committed as revision 15881 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-19 00:37:28 +00:00
Måns Rullgård
c136ece9b3 SH4: fix compilation of memzero_align8() 
Originally committed as revision 15880 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-19 00:37:24 +00:00
Måns Rullgård
b42019c130 SH4: remove unused functions 
Originally committed as revision 15879 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-19 00:37:21 +00:00
Måns Rullgård
d7e0f8dda6 SH4: replace missed rnd_avg2 -> rnd_avg32 
Originally committed as revision 15878 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-19 00:37:17 +00:00
Måns Rullgård
23e05e69a8 SH4: rename functions with conflicting names 
Originally committed as revision 15877 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-19 00:37:14 +00:00
Diego Pettenò
be449fca79 Convert asm keyword into __asm__. 
Neither the asm() nor the __asm__() keyword is part of the C99
standard, but while GCC accepts the former in C89 syntax, it is not
accepted in C99 unless GNU extensions are turned on (with -fasm). The
latter form is accepted in any syntax as an extension (without
requiring further command-line options).

Sun Studio C99 compiler also does not accept asm() while accepting
__asm__(), albeit reporting warnings that it's not valid C99 syntax.

Originally committed as revision 15627 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-16 13:34:09 +00:00
Diego Biurrun
245976da2a Use full path for #includes from another directory. 
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-09 11:56:36 +00:00
Diego Biurrun
c88c253d8b cosmetics: __asm__ __volatile__ --> asm volatile 
Originally committed as revision 12885 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-17 21:57:52 +00:00
Roman Shaposhnik
905694d96e * renaming (ST|LD)(16|32|64) -> AV_(R|W)N(16|32|64) 
Originally committed as revision 10023 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 17:01:15 +00:00
Ronald S. Bultje
b550bfaa61 Add libavcodec to compiler include flags in order to simplify header 
include paths in the source files.
mostly from a patch by Ronald S. Bultje, rbultje ronald.bitfreak net

Originally committed as revision 9034 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-16 09:51:45 +00:00
Reimar Döffinger
a1ce61108b Fix parts missed in clip -> av_clip rename 
Originally committed as revision 8760 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-19 16:12:06 +00:00
Brian Foley
49cef7443a Move copy_block* functions to dsp dsputil.h 
Patch by Brian Foley % bfoley A compsoc P nuigalway P ie %
Original thread:
Date: Nov 26, 2006 6:44 PM
Subject: Re: [Ffmpeg-devel] [PATCH] put_mpeg4_qpel16_h_lowpass altivec, take 2

Originally committed as revision 7172 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-26 18:25:07 +00:00
Måns Rullgård
55fde95e3b rename cropTbl -> ff_cropTbl 
Originally committed as revision 6992 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-12 20:08:09 +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
Diego Biurrun
ed4e20ac7f Fix some "'static' is not at beginning of declaration" warnings. 
Originally committed as revision 5956 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-08 10:24:26 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address. 
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-12 22:43:26 +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
Michael Niedermayer
4fb518c392 the return of the idct with 16bit output by ("Ivan Kalvachev" <ivan at cacad dot com>) 
Originally committed as revision 1983 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-06-21 01:11:31 +00:00
Michael Niedermayer
d8085ea727 cleanup 
Originally committed as revision 1882 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-05-14 23:08:01 +00:00
BERO
41fda91d09 aligned dsputil (for sh4) patch by (BERO <bero at geocities dot co dot jp>) 
Originally committed as revision 1880 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-05-14 17:46:55 +00:00
Michael Niedermayer
b82cdc7278 make sh4 IDCT optional, so the user can choose 
Originally committed as revision 1878 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-05-14 12:32:17 +00:00
BERO
0c6bd2ea0a sh4 optimized idct & bswap patch by (BERO <bero at geocities dot co dot jp>) 
Originally committed as revision 1877 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-05-14 12:18:49 +00:00