1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Commit Graph

47 Commits

Author SHA1 Message Date
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
1da254b849 fraps: do not set avctx->pix_fmt to none in decode_init()
This is required for setting up the filterchain, as it requires the
pixel format to be set, which is usually done when probing the file
with av_find_stream_info().

Fix trac issue #83.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
2011-04-25 23:17:59 +02:00
Reimar Döffinger
67c1a59ad7 Check for malloc failures in fraps decoder. 2011-04-24 18:09:33 +02:00
Reimar Döffinger
80da2dcf05 Use av_fast_malloc instead of av_realloc in fraps decoder. 2011-04-24 18:09:33 +02:00
Michael Niedermayer
9891004ba9 Merge remote branch 'qatar/master'
* qatar/master:
Partially merged:flvdec: Allow parsing keyframes metadata without seeking in most cases
  Error out if vaapi is not found
  avio: undeprecate av_url_read_fseek/fpause under nicer names
  libvo-*: Don't use deprecated sample format names and enum names
DUPLICATE  flvdec: Fix support for flvtool2 "keyframes based" generated index
DUPLICATE  libavcodec: Use "const enum AVSampleFormat[]" in AVCodec initialization
  Fix the conversion of AV_SAMPLE_FMT_FLT and _DBL to AV_SAMPLE_FMT_S32.
  Convert some undefined 1<<31 shifts into 1U<<31.

Conflicts:
	configure
	libavcodec/libvo-aacenc.c
	libavcodec/libvo-amrwbenc.c
	libavformat/flvdec.c

Marged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-13 02:49:22 +02:00
Alex Converse
187a537904 Convert some undefined 1<<31 shifts into 1U<<31.
According to ISO 9899:1999 S 6.5.7/4:

The result of E1 << E2 is E1 left-shifted E2 bit positions; vacated bits
are filled with zeros. If E1 has an unsigned type, the value of the
result is E1× 2^E2, reduced modulo one more than the maximum value
representable in the result type. If E1 has a signed type and
nonnegative value, and E1× 2^E2 is representable in the result type, then
that is the resulting value; otherwise, the behavior is undefined.
2011-04-11 21:47:42 -07: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
Jason Garrett-Glaser
05931ab763 Make FRAPS decoder use PC range instead of TV range
FRAPS appears to output PC range streams.  I can't guarantee this is true of
all versions.

Originally committed as revision 25308 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-02 08:39:34 +00:00
Thilo Borgmann
bd7d08e27e Remove incomplete Doxygen for static decode_frame functions.
These functions are not documented for other decoders and
should be obvious enough even without Doxygen.
patch by Thilo Borgmann, thilo.borgmann googlemail com

Originally committed as revision 24237 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-14 13:12:24 +00:00
Diego Biurrun
9eb42c272b Add back previously removed non-existing function params in doxygen comments.
Originally committed as revision 24131 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-08 22:57:27 +00:00
Diego Biurrun
0baf34d844 Remove angular brackets from Doxygen comments; Doxygen confuses them for HTML.
Originally committed as revision 23991 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 12:48:32 +00:00
Diego Biurrun
09f6a45dc2 Remove non-existing stray arguments from Doxygen function documentation.
Originally committed as revision 23976 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 11:19:29 +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
Kostya Shishkov
1c86db80a9 Remove useless assignment during initialization for some decoders
Originally committed as revision 18680 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-24 14:09:24 +00:00
Vitor Sessak
de5922f179 For every line, copy 3*width bytes instead of linesize[0] to avoid
problems with padding.

Fix issue 959

Originally committed as revision 18512 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-14 21:03:41 +00:00
Stefano Sabatini
9106a698e7 Rename bitstream.h to get_bits.h.
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 16:20:26 +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
Kostya Shishkov
675f71144b Fraps version 3 seems to be the same as Fraps v5
Originally committed as revision 16002 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-04 14:43:42 +00:00
Kostya Shishkov
76c655fb8f Simplify colour conversion in Fraps as suggested by Michael
Originally committed as revision 14690 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-11 05:11:05 +00:00
Kostya Shishkov
af1761915b R and B components are stored as a differences to G component in Fraps v5.
This fixes roundup issue 574.

Originally committed as revision 14684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-10 18:15:38 +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
d5202e4fda Add long names to many AVCodec declarations.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-27 10:52:44 +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
Kostya Shishkov
8c908d7d61 Fraps v5 decoding support
Originally committed as revision 12393 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-09 09:04:35 +00:00
Kostya Shishkov
6a02cb8239 Add step variable (for future v5 decoding)
Originally committed as revision 12392 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-09 09:03:23 +00:00
Aurelien Jacobs
a73cbf9709 huffman: add a zero_count flag and use it in fraps
fixes issue349

Originally committed as revision 12374 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 18:08:16 +00:00
Reimar Döffinger
721052e981 Add casts to avoid warnings:
fraps.c:102: warning: passing argument 1 of ‘s->dsp.bswap_buf’ from incompatible pointer type
fraps.c:102: warning: passing argument 2 of ‘s->dsp.bswap_buf’ from incompatible pointer type

Originally committed as revision 12148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-19 21:42:10 +00:00
Michael Niedermayer
1855abe556 const
Originally committed as revision 11764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 15:28:46 +00:00
Aurelien Jacobs
437c2079b7 moves fraps huffman decoder to its own file, making it more generic
Originally committed as revision 10736 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-14 21:19:40 +00:00
Diego Biurrun
e5a389a1b7 license header consistency cosmetics
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-05 10:40:25 +00:00
Måns Rullgård
859cfdc0e6 correct type of qsort() comparison callback
Originally committed as revision 9338 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-16 15:15:17 +00:00
Nicholas Tung
587d07227e Remove superfluous setting of has_b_frames in codecs without B-frames.
patch by Nicholas Tung, ntung ntung com

Originally committed as revision 8647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 17:37:30 +00:00
Alex Beregszaszi
fead30d444 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
Originally committed as revision 7587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-19 22:12:59 +00:00
Kostya Shishkov
f4e31985da Check for symbol count
Originally committed as revision 6910 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-06 06:13:29 +00:00
Kostya Shishkov
75a71b6c38 Correct support for Fraps v4 (and Huffman tree for < 256 symbols)
Originally committed as revision 6898 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-05 08:18:52 +00:00
Kostya Shishkov
78629a746f Update comment
Originally committed as revision 6897 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-05 04:59:38 +00:00
Kostya Shishkov
08a4c4bfb9 Fraps v2 and v4 support
Originally committed as revision 6896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-05 04:57:14 +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
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
Mike Melanson
4935b1b9eb signature has an 'x'
Originally committed as revision 4265 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-17 23:09:59 +00:00
Mike Melanson
b81f89490f Fraps FPS1 video decoder (v1 & v2), courtesy of Roine Gustafsson <roine
at users sf net>

Originally committed as revision 4264 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-17 22:47:34 +00:00