generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
33,020 Commits 24 Branches 241 Tags 173 MiB
61930119cb
Commit Graph

74 Commits

Author SHA1 Message Date
Michael Niedermayer
cac9877ed5 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  sws: implement MMX/SSE2/SSSE3/SSE4 versions for horizontal scaling.
  include stdint.h in adpcm_data.h
  mpeg12: reorder functions to avoid ugly forward declarations
  Fixed off by one packet size allocation in the smacker demuxer.
  Check for invalid packet size in the smacker demuxer.
  ape demuxer: fix segfault on memory allocation failure.
  xan: Add some buffer checks
  xan: Remove extra trailing newline
  Fixed size given to init_get_bits() in xan decoder.

Conflicts:
	libavcodec/mpeg12.c
	libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-13 23:44:12 +02:00
Alex Converse
0872bb23b4 xan: Add some buffer checks 2011-09-12 11:18:57 -07:00
Alex Converse
350f57bd7b xan: Remove extra trailing newline 2011-09-12 11:18:57 -07:00
Laurent Aimar
393d5031c6 Fixed size given to init_get_bits() in xan decoder. 2011-09-12 11:18:57 -07:00
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
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
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
Kostya
fff6c21295 Remove Xan WC4 cruft from xan.c 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 90e8a9c34f)
 2011-02-09 03:31:18 +01:00
Kostya
90e8a9c34f Remove Xan WC4 cruft from xan.c 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-07 08:06:16 -05: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
Reimar Döffinger
782f69e8a5 Fix memleak: free palette data on close. 
Originally committed as revision 25816 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 20:42:03 +00:00
Reimar Döffinger
18d761a1b1 Fix indentation. 
Originally committed as revision 25780 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-21 10:38:08 +00:00
Reimar Döffinger
3354b05187 Add explanation and alternative implementation for strange xan 
gamma correction.

Originally committed as revision 25779 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-21 10:37:26 +00:00
Reimar Döffinger
24ae353dfb WC3/xan: move palette handling to decoder, avoiding need for 
PaletteControl.
This also fixes playback of some files with ffplay (images were
corrupted for a short time after a palette change).

Originally committed as revision 25778 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-21 10:32:23 +00:00
Stefano Sabatini
f2f8fb1035 Remove redundant text in the log. 
Originally committed as revision 25517 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-18 13:19:59 +00:00
Stefano Sabatini
082a857522 Make XAN decoder return meaningful error codes. 
Originally committed as revision 25516 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-18 13:19:53 +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
Diego Biurrun
cb39768960 Add long_name for Xxan codec. 
Originally committed as revision 20900 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-19 18:41:03 +00:00
Kostya Shishkov
0080402d36 Improve handling allocated buffers in Xan decoder 
Originally committed as revision 20899 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-19 17:04:30 +00:00
Kostya Shishkov
2628f515fe cosmetics: reindent a bit 
Originally committed as revision 20898 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-19 16:39:21 +00:00
Reimar Döffinger
4a49ab77c6 Remove unnecessary calls to avcodec_check_dimensions, the check is already 
done at a higher level.

Originally committed as revision 20229 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-13 20:13:28 +00:00
Reimar Döffinger
5333450ce6 Use memcpy to copy till end of line in one go instead of copying pixel by pixel 
in xan_wc3_output_pixel_run and xan_wc3_copy_pixel_run

Originally committed as revision 19774 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-05 19:35:59 +00:00
Reimar Döffinger
64b8e620cb Slightly simplify detection of end of compressed data in xan_unpack 
Originally committed as revision 19772 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-05 19:14:44 +00:00
Måns Rullgård
3aab27b459 Remove useless #include <unistd.h> from many files 
Originally committed as revision 19499 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-22 23:37:53 +00:00
Reimar Döffinger
f63f689e10 Avoid code duplication in xan_unpack for the final memcpy. 
Originally committed as revision 18608 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-18 17:26:00 +00:00
Reimar Döffinger
d7670f2827 Use sign_extend function instead of reimplementing it. 
Originally committed as revision 18599 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 20:05:27 +00:00
Reimar Döffinger
e62f622193 Remove a useless "& 0xF" 
Originally committed as revision 18598 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 20:01:45 +00:00
Reimar Döffinger
977d813447 Use / and % operators instead of reimplementing them with a loop. 
Originally committed as revision 18597 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 19:56:50 +00:00
Reimar Döffinger
b1e309865f Change buffer check to avoid an unlikely pointer arithmetic overflow. 
Originally committed as revision 18596 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 19:49:55 +00:00
Reimar Döffinger
be50938073 Simplify xan_huffman_decode by using get_bits 
Originally committed as revision 18595 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 19:48:54 +00:00
Reimar Döffinger
e5986d0427 Cosmetics to improve xan_unpack readability 
Originally committed as revision 18590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 19:14:11 +00:00
Reimar Döffinger
16cc5a738c Fix buffer size check for xan_unpack which was broken by r18586 
Originally committed as revision 18589 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 19:07:16 +00:00
Reimar Döffinger
c644665f42 Some more simplifications of xan_unpack 
Originally committed as revision 18588 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 19:03:43 +00:00
Reimar Döffinger
455fdd2f8c Reindent xan_unpack code 
Originally committed as revision 18587 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 18:56:47 +00:00
Reimar Döffinger
948f60fa24 Avoid some code duplication in xan_unpack 
Originally committed as revision 18586 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 18:54:17 +00:00
Reimar Döffinger
59bd7f23e8 Increase buffer padding to avoid most space checks in xan_unpack 
Originally committed as revision 18584 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 18:26:24 +00:00
Reimar Döffinger
4b96f43fe1 Change buffer size checks to avoid the very unlikely overflow case. 
Originally committed as revision 18576 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 18:03:00 +00:00
Reimar Döffinger
5e12701c5c Remove a pointless right-shift in xan decoder. 
Originally committed as revision 18574 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 17:54:55 +00:00
Reimar Döffinger
9126aea528 Replace bytecopy with the equivalent but faster av_memcpy_backptr. 
Ca. 10% faster xan_unpack on x86_64 decoding of SC_32-part.MVE

Originally committed as revision 18572 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 17:46:10 +00:00
Reimar Döffinger
44c9efcb57 Use memcpy instead of the very inefficient bytecopy where both are correct 
(i.e. no overlap of src and dst is possible).

Originally committed as revision 18569 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 17:20:48 +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
6a5d31ac25 Fix build: Add intreadwrite.h and bswap.h #includes where necessary. 
Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 22:19:48 +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
162d4fc99d Add long names to AVCodec declarations. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13009 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-27 22:39:51 +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
Mike Melanson
282ee4e766 fix the WC3 Xan decoder by correcting the frame accounting logic 
Originally committed as revision 12326 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-05 06:58:20 +00:00