Commit Graph

52 Commits

Author SHA1 Message Date
Michael Niedermayer
c40798441f Merge remote branch 'qatar/master'
* qatar/master:
  ac3dec: fix processing of delta bit allocation information.
  vc1: fix fate-vc1 after previous commit.
  wmv3dec: fix playback of complex WMV3 files using simple_idct.
  make av_dup_packet() more cautious on allocation failures
  make containers pass palette change in AVPacket
  introduce side information for AVPacket

Politic commits that have not been pulled:
  Update regtest checksums after revision 6001dad.
  Replace more FFmpeg references by Libav.
  Replace references to ffmpeg-devel with libav-devel; fix roundup URL.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-17 23:43:54 +02:00
Kostya Shishkov
2d8591c27e make containers pass palette change in AVPacket
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-04-15 18:02:05 +02:00
Michael Niedermayer
24009f3601 Make find_pix_fmt() non static
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-03 16:40:12 +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
Reinhard Tartler
7ffe76e540 Merge libavcore into libavutil
Done to keep ABI compatible. Otherwise this is just silly
2011-02-16 23:00:30 +01:00
Reinhard Tartler
737eb5976f Merge libavcore into libavutil
It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-02-15 16:18:21 +01:00
Stefano Sabatini
e86c78836b In the rawvideo decoder, set pkt_pts in the output frame.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 3c802cabba)
2011-01-30 03:40:59 +01:00
Stefano Sabatini
3c802cabba In the rawvideo decoder, set pkt_pts in the output frame.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-28 17:27:54 +01: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
Stefano Sabatini
ed5d30d91c Move internal function ff_set_systematic_pal() to libavcore, and
rename it ff_set_systematic_pal2().

Originally committed as revision 25712 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-09 22:22:36 +00:00
Alexander Strange
1bb56bdb41 rawdec: Properly pass reordered_opaque through the decoder
Originally committed as revision 25261 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 15:43:37 +00:00
Reimar Döffinger
b641982b23 rawdec: ensure that there is always a valid palette for formats that
should have one like gray8 etc.

Originally committed as revision 25190 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-25 08:44:35 +00:00
Reimar Döffinger
2efcde73fc rawdec: only allocate a full-frame size buffer if it actually will
be used, place palette buffer in the context to simplify this.

Originally committed as revision 25163 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-23 20:23:15 +00:00
Tomas Härdin
c1bdc9300b avcodec.h: Clarify AVCodecContext::pix_fmt documentation since its value may be set by the demuxer
rawdec.c: Only perform bits_per_coded_sample -> pix_fmt guesswork if pix_fmt hasn't been set

Originally committed as revision 23561 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-10 08:39:05 +00:00
Michael Niedermayer
de51f22d85 fix rgb444 support in avi.
Originally committed as revision 23503 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-06 11:00:30 +00:00
Stefano Sabatini
6a2c9b8bcb Rename pixelFormatBpsAVI to pix_fmt_bps_avi and pixelFormatBpsMOV to
pix_fmt_bps_mov.

The new names are consistent with the predominant FFmpeg style.

Originally committed as revision 23244 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-21 23:19:50 +00:00
Stefano Sabatini
1beff414a2 Rename findPixelFormat() to find_pix_fmt().
Less ugly and more consistent with the FFmpeg predominant style.

Originally committed as revision 23243 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-21 23:19:45 +00:00
Stefano Sabatini
6531b5c9f4 Rename ff_raw_pixelFormatTags symbol to ff_raw_pix_fmt_tags.
The new name is shorter and consistent with the FFmpeg style.

Originally committed as revision 23206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-20 23:09:11 +00:00
Michael Niedermayer
19a00c5eb2 avi bgr24 padding fix.
Fixes issue1901

Originally committed as revision 22997 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-30 22:09:42 +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
Carl Eugen Hoyos
36cbdc9539 Fix r21223: AVup samples (issue 1685) need a buf offset like AV1x (issue 1684).
Originally committed as revision 21617 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-02 22:57:56 +00:00
Carl Eugen Hoyos
864a074213 Correctly decode some Avid AV1x samples, fixes issue 1684.
Originally committed as revision 21241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-16 10:46:45 +00:00
Carl Eugen Hoyos
c78dfcdaf4 Do not assign codec_tag to pix_fmt in rawdec.c, but in raw.c
Originally committed as revision 21218 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-15 00:45:47 +00:00
Carl Eugen Hoyos
0941ee0fa6 Support uncompressed ("Resolution 1:1") Avid AVI Codec, (partially) fixes issue 1474.
Originally committed as revision 21154 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-12 00:29:26 +00:00
Carl Eugen Hoyos
6698d13998 Cosmetics: Fix indentation and comment after r21027.
Originally committed as revision 21028 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-05 01:14:38 +00:00
Carl Eugen Hoyos
4235c98e57 Support decoding raw 2bpp in mov, fixes issue 1528.
Originally committed as revision 21027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-05 01:11:45 +00:00
Carl Eugen Hoyos
0a1e15109a Improve readability of 4bpp raw decoder and prepare for supporting 2bpp.
Originally committed as revision 21026 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-05 00:41:29 +00:00
Carl Eugen Hoyos
f27fd36231 Fix colourspace for 16 bit raw video in mov, fixes issue 1527 on big-endian.
Originally committed as revision 20985 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-31 01:08:10 +00:00
Carl Eugen Hoyos
e1bd945b1d Support raw black&white in mov, fixes issue 1654.
Originally committed as revision 20984 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-30 22:58:49 +00:00
Carl Eugen Hoyos
484d146416 Use correct pixfmt for 32 bit raw in mov also on big-endian, fixes issue 1630.
Originally committed as revision 20962 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-29 11:53:51 +00:00
Reimar Döffinger
c522b4e94e Simplify: use FFSWAP
Originally committed as revision 20222 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-13 08:23:00 +00:00
Jason Garrett-Glaser
fc3fc0293d Add new FOURCC (0x0003) for raw DIB video, set flip flag accordingly.
Fixes a few AVI files from what is probably a mobile phone video camera.

Originally committed as revision 19172 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 17:39:56 +00:00
Michael Niedermayer
71b0654cc6 Support YVU9 AVI 4cc.
Fixes issue1068.

Originally committed as revision 18952 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-26 03:51:00 +00:00
Baptiste Coudurier
7574dc4c37 update comment for rgb 16 bit in .mov
Originally committed as revision 18777 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-10 00:53:02 +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
Jai Menon
3dd2f87e61 Map MOV fourcc YUV2 correctly to PIX_FMT_YUYV422.
Patch by Jai Menon

Originally committed as revision 18316 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-02 12:15:04 +00:00
Michael Niedermayer
e641f320bd indent
Originally committed as revision 17481 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-21 17:17:09 +00:00
Michael Niedermayer
31f2616db8 Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php.
partially fixes issue862.

Originally committed as revision 17475 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-21 15:32:56 +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
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences.
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
Carl Eugen Hoyos
95240bf3e3 Fix some icc warnings by using enum PixelFormat instead of int where appropriate.
Originally committed as revision 15611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-13 07:42:11 +00:00
Luca Abeni
dd1c8f3e6e Bump Major version, this commit is almost just renaming bits_per_sample to
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!

Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 14:24:59 +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
Baptiste Coudurier
48026fbef6 1000l parenthesis
Originally committed as revision 12274 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-28 16:11:56 +00:00
Baptiste Coudurier
83f02883df code is ok for 4bpp in mov too, fix 16grey.mov
Originally committed as revision 12273 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-28 16:08:52 +00:00
Michael Niedermayer
da2036c54e const
Originally committed as revision 11738 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 14:03:56 +00:00