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
77,833 Commits 37 Branches 400 Tags 462 MiB
92465a2347
Commit Graph

111 Commits

Author SHA1 Message Date
Michael Niedermayer
faba79e080 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
  H.264: tweak some other x86 asm for Atom
  probe: Fix insane flow control.
  mpegts: remove invalid error check
  s302m: use nondeprecated audio sample format API
  lavc: use designated initialisers for all codecs.
  x86: cabac: add operand size suffixes missing from 6c32576

Conflicts:
	libavcodec/ac3enc_float.c
	libavcodec/flacenc.c
	libavcodec/frwu.c
	libavcodec/pictordec.c
	libavcodec/qtrleenc.c
	libavcodec/v210enc.c
	libavcodec/wmv2dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-30 06:46:08 +02:00
Anton Khirnov
ec6402b7c5 lavc: use designated initialisers for all codecs. 
It's more readable and less prone to breakage.
 2011-07-29 08:42:34 +02:00
Michael Niedermayer
75a37b57a5 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  APIchanges: fill in date and commit for request_sample_fmt
  Add floating-point sample format support to the ac3, eac3, dca, aac, and vorbis decoders.
  Add support for request_sample_format in ffmpeg and ffplay.
  Add APIchanges entry for request_sample_fmt.
  Add request_sample_fmt field to AVCodecContext.
  Add float_interleave() to FmtConvertContext with x86-optimized versions.
  Remove unused make variable SEEK_REFFILE
  fate: remove redundant aref and vref references
  fate: remove do_ffmpeg_nocheck function
  fate: do not collect -benchmark output
  mpegaudiodec: remove decode_end() function
  fate: run aref and vref as regular tests
  mpegaudio: sanitise compute_antialias_* names
  mpeg12: add slice-threading checks to slice-threading initializers.
  h264: copy pixel_shift between slice threading contexts.
  mdec: enable frame-level multithreading.
  mdec.c: fix overread.

Conflicts:
	libavcodec/aacdec.c
	libavcodec/ac3dec.c
	libavcodec/avcodec.h
	libavcodec/dca.c
	libavcodec/h264.c
	libavcodec/mdec.c
	libavcodec/mpeg12.c
	libavcodec/options.c
	libavcodec/version.h
	libavcodec/vorbisdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-19 06:00:31 +02:00
Alexander Strange
a64c58a240 mdec: enable frame-level multithreading. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-05-18 06:54:15 -04:00
Ronald S. Bultje
32ac63ee10 mdec.c: fix overread. 2011-05-18 06:54:15 -04:00
Stefano Sabatini
01042d4123 lavc: set defaults in internal codec frames 
This is required specifically for setting frame->format to -1,
otherwise it will be set to 0 = PIX_FMT_YUV420P and code reading
the format from the output decoded frame will get misled.

In particular fix regressions occurring with the pending vsrc_buffer
patch.
 2011-05-07 12:03:59 +02:00
Stefano Sabatini
ce5e49b0c2 replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_* 2011-05-02 16:41:41 +02:00
Stefano Sabatini
975a1447f7 Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-05-02 12:18:44 +02:00
Michael Niedermayer
55ce3c67bb Merge remote-tracking branch 'ffmpeg-mt/master' 
* ffmpeg-mt/master:
  Update todo. More items appeared...
  Fix mdec
Duplicate:  id3v1: change filesize to int64_t.
Duplicate:  id3v1: Seek back to old position after reading.

Conflicts:
    libavcodec/mpegvideo.c
    libavcodec/snow.c
    libavformat/id3v1.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-30 02:58:38 +02:00
Michael Niedermayer
d375c10400 Fake-Merge remote-tracking branch 'ffmpeg-mt/master' 2011-03-22 22:36:57 +01: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
Diego Elio Pettenò
e7e2df27f8 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f69)
 2011-01-28 03:15:34 +01:00
Diego Elio Pettenò
d36beb3f69 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-26 16:08:45 +00:00
Vitor Sessak
e3e3c82555 Make PSX MDEC decoder output YUVJ420 and always use IDCT_SIMPLE. This 
makes the output much closer to original Playstation hardware.

Originally committed as revision 26196 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 11:16:21 +00:00
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands. 
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 14:45:34 +00:00
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00
Måns Rullgård
84dc2d8afa Remove DECLARE_ALIGNED_{8,16} macros 
These macros are redundant.  All uses are replaced with the generic
DECLARE_ALIGNED macro instead.

Originally committed as revision 22233 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-06 14:24:59 +00:00
Reimar Döffinger
6231d0983b Release buffer when the codec is closed. 
Originally committed as revision 21405 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-23 18:04:09 +00:00
Reimar Döffinger
b9e3f85dbc Use qstride = 0 and allocate only a single line for qscale_table since 
for this codecs all quants are the same for a single frame.

Originally committed as revision 21404 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-23 18:01:38 +00:00
Måns Rullgård
c67278098d Move array specifiers outside DECLARE_ALIGNED() invocations 
Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-22 03:25:11 +00:00
Måns Rullgård
a13e687034 mdec: remove unused members from struct MDECContext 
Originally committed as revision 19705 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-25 23:28:33 +00:00
Reimar Döffinger
238ef6dadd Add a av_fast_malloc function and replace several uses of av_fast_realloc, 
thus avoiding potential memleaks and pointless memcpys.

Originally committed as revision 18470 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-12 13:17:37 +00:00
Thilo Borgmann
7a00bbad21 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an 
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows
passing of packet-specific flags from demuxer to decoder, such as the keyframe
flag, which appears necessary to playback corePNG P-frames.

Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread
"Google Summer of Code participation" on the mailinglist.

Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 15:59:50 +00:00
Diego Biurrun
bad5537e2c Use full internal pathname in doxygen @file directives. 
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 02:00:19 +00:00
Diego Biurrun
071083b4a5 Rename ff_init_vlcs function to the more descriptive name ff_mpeg12_init_vlcs. 
Now that it is exported, this should avoid confusion and name clashes.

Originally committed as revision 14867 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-20 17:05:14 +00:00
Diego Biurrun
054480a57b cosmetics: comment spelling/grammar fixes 
Originally committed as revision 14866 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-20 16:59:26 +00:00
Diego Biurrun
0da49fca79 Untangle mpeg12.c and mdec.c so that mdec.c can be compiled separately. 
Originally committed as revision 14851 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-19 20:52:26 +00:00
Alexander Strange
b6a66897b6 Remove pointless AVFrame* casting. 
Originally committed as revision 14011 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-27 18:53:41 +00:00
Alexander Strange
39047aecac Remove duplicate emms. 
Originally committed as revision 14010 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-27 18:52:02 +00:00
Alexander Strange
8b9bda1c37 Remove commented-out code. 
Originally committed as revision 14009 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-27 18:51:01 +00:00
Alexander Strange
2f3b1b801a Export qscale so that postprocessing works. 
Originally committed as revision 14008 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-27 18:50:06 +00:00
Alexander Strange
de7bdf58f4 Remove unused PutBitContext. 
Originally committed as revision 14007 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-27 18:47:01 +00:00
Stefano Sabatini
fe4bf37455 Make AVCodec long_names definition conditional depending on CONFIG_SMALL. 
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-12 21:50:13 +00:00
Stefano Sabatini
7c55e71d51 Add codec long name, patch by Stefano Sabatini, stefano.sabatini-lala poste it. 
Originally committed as revision 13154 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-14 16:30:37 +00:00
Alexander Strange
8e5f465f4c Increase alignment for DCT block arrays from 8 to 16 
Patch by Alexander Strange ( astrange ithinksw com )

Originally committed as revision 12767 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-08 01:09:33 +00:00
Zuxy Meng
98a6fff98c Apply 'cold' attribute to init/uninit functions in libavcodec 
Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-21 03:11:20 +00:00
Aurelien Jacobs
9701840bb5 add FF_ prefix to all (frame)_TYPE usage 
Originally committed as revision 12399 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-09 23:31:02 +00:00
Michael Niedermayer
e68c7a4abe const 
Originally committed as revision 11710 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-01 03:34:43 +00:00
Alexander Strange
bc2bc41bb8 Fix missing chroma in version 3 STR. 
Closes issue 290
Patch by Alexander Strange: astrange ithinksw com

Originally committed as revision 11170 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-05 13:11:18 +00:00
Diego Biurrun
7b94177e37 Group all copyright and author notices together. 
Originally committed as revision 9483 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-05 10:37:29 +00:00
Aurelien Jacobs
eaa7557c73 add proper ff_ prefix to new extern symbols 
Originally committed as revision 9479 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-05 09:21:55 +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
Steve L'Homme
68b51e58ce MSVC-compatible __align8/__align16 declaration 
patch by Steve Lhomme, steve .dot. lhomme .at. free .dot. fr

Originally committed as revision 4942 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-05 13:35:17 +00:00
Diego Biurrun
f038fe8b4a warning fixes by Luca Abeni, lucabe72 ##@## email ##.## it 
Originally committed as revision 4898 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-25 22:10:13 +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
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
2eca4a44b1 set pix_fmt 
Originally committed as revision 4518 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-08-13 21:34:24 +00:00
Michael Niedermayer
e91f4bf160 avoid UPDATE_CACHE() in GET_RL_VLC() if not needed 
Originally committed as revision 4137 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-18 20:07:48 +00:00
Michael Niedermayer
934982c4ac avoid buf_size == 0 checks in every decoder 
Originally committed as revision 3872 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-23 18:09:06 +00:00
Michael Niedermayer
21adafec2a lowres width/height cleanup 3rd try 
Originally committed as revision 3522 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-27 11:50:56 +00:00
Michael Niedermayer
e8733cc4d9 more data_size=0 cleanup 
Originally committed as revision 3147 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-21 14:40:35 +00:00
Michael Niedermayer
eea8c08fa8 cleanup & memleak fix 
Originally committed as revision 3095 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-30 17:42:58 +00:00
Michel Bardiaux
9b87956678 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>) 
Originally committed as revision 2469 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-03 13:26:22 +00:00
Mike Melanson
e986b6e2c7 quiet 
Originally committed as revision 2382 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-15 02:59:03 +00:00
Michael Niedermayer
77ee78bcdb 100l 
Originally committed as revision 2193 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-09-01 17:42:07 +00:00
Michael Niedermayer
67b04c1aef more fixes 
Originally committed as revision 2192 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-09-01 17:05:28 +00:00
Michael Niedermayer
bf5d0505c6 some fixes (still buggy though) 
Originally committed as revision 2191 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-09-01 16:40:25 +00:00
Mike Melanson
421e085903 skip preamble bytes 
Originally committed as revision 2189 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-09-01 15:53:01 +00:00
Michael Niedermayer
dc98fc8d17 10l (big vs. little endian) 
Originally committed as revision 2184 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-08-30 19:31:49 +00:00
Fabrice Bellard
802f454e5b removed unused variable 
Originally committed as revision 2162 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-08-24 22:28:41 +00:00
Michael Niedermayer
c3bf0288c9 PSX MDEC decoder, based upon some code from Sebastian Jedruszkiewicz <elf at frogger dot rules dot pl> 
note: completly untested, no demuxer yet

Originally committed as revision 2134 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-08-22 14:59:04 +00:00