generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
59,794 Commits 24 Branches 241 Tags 173 MiB
7a8318fbb1
Commit Graph

113 Commits

Author SHA1 Message Date
Michael Niedermayer
204c4e953d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ppc: fix build with altivec disabled
  vp3: move idct and loop filter pointers to new vp3dsp context
  build: add CONFIG_VP3DSP, reduce repetition in OBJS lists
  tscc2: do not add/subtract 128 bias during DCT
  tscc2: fix typo in DCT
  configure: clarify external library section of help output
  configure: mark libfdk-aac as nonfree
  configure: cosmetics: drop some unnecessary backslashes
  os_support: K&R formatting cosmetics

Conflicts:
	configure
	libavcodec/vp3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-18 22:34:48 +02:00
Mans Rullgard
28f9ab7029 vp3: move idct and loop filter pointers to new vp3dsp context 
This moves all VP3-specific function pointers from dsputil to a
new vp3dsp context.  There is no reason to ever use the VP3 IDCT
where an MPEG2 IDCT is expected or vice versa.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-07-18 10:32:19 +01:00
Michael Niedermayer
d85b3c4fff vp56dec: avoid freeing the returned frame before returning it. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-24 05:21:39 +01:00
Michael Niedermayer
6cb2085278 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (27 commits)
  ppc: Add ff_ prefix to nonstatic symbols
  sh4: Add ff_ prefix to nonstatic symbols
  mpegvideo: Add ff_ prefix to nonstatic functions
  rtjpeg: Add ff_ prefix to nonstatic symbols
  rv: Add ff_ prefix to nonstatic symbols
  vp56: Add ff_ prefix to nonstatic symbols
  vorbis: Add ff_ prefix to nonstatic symbols
  msmpeg4: Add ff_ prefix to nonstatic symbols
  vc1: Add ff_ prefix to nonstatic symbols
  msmpeg4: Add ff_ prefixes to nonstatic symbols
  snow: Add ff_ prefix to nonstatic symbols
  mpeg12: Add ff_ prefix to nonstatic symbols
  mpeg4: Add ff_ prefixes to nonstatic symbols
  lagarith: Add ff_ prefix to lag_rac_init
  libavcodec: Add ff_ prefix to j_rev_dct*
  dsputil: Add ff_ prefix to inv_zigzag_direct16
  libavcodec: Prefix fdct_ifast, fdct_ifast248
  dsputil: Add ff_ prefix to the dsputil*_init* functions
  libavcodec: Add ff_ prefix to some nonstatic symbols
  vlc/rl: Add ff_ prefix to the nonstatic symbols
  ...

Conflicts:
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/dnxhddec.c
	libavcodec/ffv1.c
	libavcodec/h263.h
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/nuv.c
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/proresdsp.c
	libavcodec/svq3.c
	libavcodec/version.h
	libavformat/dv.h
	libavformat/dvenc.c
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-16 01:34:37 +01:00
Martin Storsjö
d1b357d78b vp56: Add ff_ prefix to nonstatic symbols 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:07:14 +02:00
Martin Storsjö
9cf0841ef3 dsputil: Add ff_ prefix to the dsputil*_init* functions 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:06:34 +02:00
Reimar Döffinger
371e165443 Try to set AVFrame.reference to correct values. 
I am not sure these new values are correct, not am I sure
the semantics are a good idea since we do not seem to make any
use of them but they caused a lot of confusion, but this
seems to make things closer to matching the documentation.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-11-05 23:25:20 +01:00
Laurent Aimar
3d09d0017d vp56: Release old pictures after a resolution changes 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-07 00:27:24 +02:00
Laurent Aimar
066fff755a vp6: Check for huffman tree build errors 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-07 00:27:03 +02:00
Laurent Aimar
0ec6d6e9b6 vp56: Check for missing reference frame data 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-07 00:25:43 +02:00
Laurent Aimar
1aad9cd9d2 vp56:Fix error recovery code on size changes in vp5/6 decoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-24 19:13:37 +02:00
Laurent Aimar
7c249d4fba Check for huffman tree building error in vp6 decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-22 00:42:28 +02:00
Laurent Aimar
dba20b8478 Release old pictures after a resolution change in vp5/6 decoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-22 00:42:28 +02:00
Laurent Aimar
6a0e78929a Check for missing reference in vp5/6 decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-22 00:42:28 +02:00
Michael Niedermayer
042f9d62ca Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: Automatically add more flags required on symbian
  mem.h: switch doxygen parameter order to match function prototype
  doxygen: replace @sa tag by the more readable but equivalent @see
  doxygen: use Doxygen markup for authors and web links where appropriate
  doxygen: do not include license boilerplate in Doxygen documentation
  ac3enc: Mark AVClasses const
  ffserver: Replace two loops with one loop.
  ffmpeg: Fix the check for experimental codecs
  swscale: extend mmx padding.
  swscale: clip unscaled colorspace conversion path.
  doxygen: misc consistency cosmetics
  doc: remove file name from @file directive in Doxygen usage example
  doxygen: consistently place brief description
  doxygen: place empty line between brief description and detailed description
  avformat_open_input(): Add braces to shut up gcc warning.

Conflicts:
	libavcodec/8svx.c
	libavcodec/tiff.c
	libavcodec/tiff.h
	libavcodec/vaapi_h264.c
	libavcodec/vorbis.c
	libavcodec/vorbisdec.c
	libavcodec/vp6.c
	libswscale/swscale_unscaled.c
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-15 17:51:09 +02:00
Diego Biurrun
6168781f70 doxygen: do not include license boilerplate in Doxygen documentation 2011-07-15 00:52:09 +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
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
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
Ronald S. Bultje
d23e3e5fea Move ff_emulated_edge_mc() into DSPContext. 
(cherry picked from commit 2e27959879)
 2011-01-30 03:41:01 +01:00
Ronald S. Bultje
2e27959879 Move ff_emulated_edge_mc() into DSPContext. 2011-01-28 22:13:26 -05:00
Alex Converse
b6356d9726 10l: missed one reindent. 
Originally committed as revision 24563 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-28 05:40:38 +00:00
Alex Converse
d950497083 ff_prefix non static vp56 functions. 
Originally committed as revision 24561 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-28 05:36:33 +00:00
Måns Rullgård
5e1ba34bbb VP56: move vp56_edge_filter to new VP56DSPContext 
Using macro templates allows the vp[56]_adjust functions to be
inlined instead of called through function pointers.  The new
function pointers enable optimised implementations of the filters.

4% faster VP6 decoding on Cortex-A8.

Originally committed as revision 22992 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-30 21:30:22 +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
Aurelien Jacobs
ded2100e48 move vp6 huffman table freeing code, out of common vp56 code 
Originally committed as revision 22186 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 22:29:06 +00:00
Vitor Sessak
0a41faa9a7 Plug some memory leaks in the VP6 decoder 
Originally committed as revision 22172 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 17:24:32 +00:00
Reimar Döffinger
800274f871 Make VP5 and VP6 decoders output a qscale table to allow for more automatic 
post-processing, and add a new FF_QSCALE_TYPE_VP56 for this.

Originally committed as revision 21529 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-29 19:11:47 +00:00
Laurent Aimar
68a4d3498f vp56: check buffer size to fix a potential segfault 
patch by Laurent Aimar  fenrir _at_ videolan _dot_ org

Originally committed as revision 21521 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-28 23:49:46 +00:00
Reimar Döffinger
6242b1c424 Use av_freep intead of av_free to free pointers in vp56 context. 
Originally committed as revision 21395 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-23 13:49:09 +00:00
Aurelien Jacobs
012f930855 fix vp5/vp6 decoding by using new prototype for decode function 
Originally committed as revision 18352 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 18:24:47 +00:00
Aurelien Jacobs
ed76106755 vp56: alpha_offset is uninitialized on purpose 
Originally committed as revision 17108 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-09 22:45:30 +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
Aurelien Jacobs
bf73801bec vp56: don't reset dimensions to 0 in codec init 
Originally committed as revision 16140 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-15 00:00:16 +00:00
Aurelien Jacobs
d887151d8c rename Vp56Model to VP56Model for consistency 
Originally committed as revision 16073 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-12 00:51:53 +00:00
Aurelien Jacobs
76025d91da cosmetics: vertical alignment 
Originally committed as revision 16069 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 23:00:58 +00:00
Aurelien Jacobs
3d52bca6bf avoid POSIX reserved _t suffix 
Originally committed as revision 16068 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 22:56:19 +00:00
Loren Merritt
5fecfb7d58 clear_block mmx 
Originally committed as revision 16045 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-10 21:35:17 +00:00
Carl Eugen Hoyos
738a89b93a Add VP56_FRAME_NONE and use VP56_FRAME_CURRENT. 
Fixes icc warning #188: enumerated type mixed with another type

Originally committed as revision 13145 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-13 15:56:45 +00:00
Aurelien Jacobs
5210529e2d ensure vp56_decode_frame always return unchanged buf_size 
Originally committed as revision 13083 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-08 21:59: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
Michael Niedermayer
7e5cdb5b1b const 
Originally committed as revision 11791 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-01 16:16:40 +00:00
Aurelien Jacobs
7ecae905b6 simplify 
Originally committed as revision 10584 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-25 22:33:31 +00:00
Aurelien Jacobs
d7af6a9de4 rename one variable to be consistent with the rest of the file 
Originally committed as revision 10583 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-25 22:31:00 +00:00
Aurelien Jacobs
442b145abb consistent spelling: plan => plane 
Originally committed as revision 10582 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-25 21:01:34 +00:00
Aurelien Jacobs
d3f9edbafa simplify 
Originally committed as revision 10576 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-25 19:22:47 +00:00
Aurelien Jacobs
f62a2b61f9 cosmetic: indent 
Originally committed as revision 10575 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-25 19:16:38 +00:00
Aurelien Jacobs
91fc2cf150 add a new vp6a codec (add alpha plan support to vp6) 
Originally committed as revision 10574 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-25 19:12:46 +00:00
Aurelien Jacobs
247df384ec move all model related tables into their own struct 
Originally committed as revision 10571 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-24 22:29:11 +00:00
Aurelien Jacobs
a7d70d88df rename vp56_b6to3 to vp56_b2p 
Originally committed as revision 10569 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-24 20:52:11 +00:00
Aurelien Jacobs
1457516f70 some simplifications and uniformisation 
Originally committed as revision 10568 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-24 20:43:47 +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
Aurelien Jacobs
eba0fcad9e cleanup setting of returned data frame 
Originally committed as revision 8125 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-25 16:02:32 +00:00
Aurelien Jacobs
704a2881bc Use pointers to avoid copying AVFrame. 
This ensure get_buffer() won't be confused with an AVFrame pointer
which looks like it wasn't released.

Originally committed as revision 8124 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-25 15:33:38 +00:00
Reimar Döffinger
f66e4f5f9e Add av_ prefix to clip functions 
Originally committed as revision 8122 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-25 10:27:12 +00:00
Aurelien Jacobs
5e5067c73d ensure that data[0] is set to NULL for next frame 
to please avcodec_default_get_buffer()

Originally committed as revision 7846 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-06 00:35:51 +00:00
Aurelien Jacobs
24d3e5a2f2 use coded_width and coded_height instead of width and height 
Originally committed as revision 6769 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-22 18:33: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
Aurelien Jacobs
a8678a3a7a replaces back some C code by dsp.put_pixels_tab[0][0] (revert r6231) 
but this time ensure proper alignment using av_malloc instead of av_realloc

Originally committed as revision 6245 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-13 20:16:33 +00:00
Aurelien Jacobs
0dd5866af7 don't use dsp.put_pixels_tab[0][0] with unaligned ptr (fix artifacts on altivec) 
Originally committed as revision 6231 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-11 23:29:24 +00:00
Aurelien Jacobs
d120e4026d rename vector to vect to avoid clash with Apple gcc 
Originally committed as revision 6217 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-09 22:53:44 +00:00
Aurelien Jacobs
5ce117c37c VP5 and VP6 video decoder 
Originally committed as revision 6213 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-09 17:19:37 +00:00