generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
50,679 Commits 24 Branches 241 Tags 173 MiB
f9fd6f983b
Commit Graph

75 Commits

Author SHA1 Message Date
Michael Niedermayer
40c27504a5 Merge commit '57ed8debb9b9cc565cc6e9f98c5b5cbb9f69097c' 
* commit '57ed8debb9b9cc565cc6e9f98c5b5cbb9f69097c':
  wmv2: Propagate the wmv2 idct permutation type to the dsputils context
  rtp: Make sure priv_data is set before reading it

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 14:15:40 +01:00
Martin Storsjö
57ed8debb9 wmv2: Propagate the wmv2 idct permutation type to the dsputils context 
This fixes encoding where the idct setting originally was set to
FF_IDCT_AUTO and dsputil chose a default idct with a non-null
permutation - even if the permutation tables were updated,
dct_quantize in x86/mpegvideoenc_template.c also checked the
value of this type variable.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-01-24 00:32:35 +02:00
Michael Niedermayer
ac8987591f Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' 
* commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f':
  Drop DCTELEM typedef

Conflicts:
	libavcodec/alpha/dsputil_alpha.h
	libavcodec/alpha/motion_est_alpha.c
	libavcodec/arm/dsputil_init_armv6.c
	libavcodec/bfin/dsputil_bfin.h
	libavcodec/bfin/pixels_bfin.S
	libavcodec/cavs.c
	libavcodec/cavsdec.c
	libavcodec/dct-test.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/dsputil_template.c
	libavcodec/eamad.c
	libavcodec/h264_cavlc.c
	libavcodec/h264idct_template.c
	libavcodec/mpeg12.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	libavcodec/ppc/dsputil_altivec.c
	libavcodec/proresdsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-23 17:44:56 +01:00
Diego Biurrun
88bd7fdc82 Drop DCTELEM typedef 
It does not help as an abstraction and adds dsputil dependencies.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2013-01-22 18:32:56 -08:00
Michael Niedermayer
db23d5de27 Merge commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0' 
* commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0':
  wmv2: move IDCT to its own DSP context.

Conflicts:
	libavcodec/dsputil.h
	tests/ref/seek/vsynth2-wmv2
	tests/ref/vsynth/vsynth1-wmv2
	tests/ref/vsynth/vsynth2-wmv2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-21 16:07:21 +01:00
Ronald S. Bultje
e6bc38fd49 wmv2: move IDCT to its own DSP context. 
This allows us to remove FF_IDCT_WMV2, which serves no practical purpose
other than to be able to select the WMV2 IDCT for MPEG (or vice versa)
and get corrupt output.

Fate tests for all wmv2-related tests change, because (for some obscure
reason) they forced use of the MPEG IDCT. You would get the same changes
previously by not using -idct simple in the fate test (or replacing it
with -idct auto).
 2013-01-20 22:12:35 -08:00
Michael Niedermayer
a41bf09d9c Merge commit '6906b19346ae8a330bfaa1c16ce535be10789723' 
* commit '6906b19346ae8a330bfaa1c16ce535be10789723':
  lavc: add missing files for arm
  lavc: introduce VideoDSPContext

Conflicts:
	configure
	libavcodec/arm/dsputil_init_armv5te.c
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/dsputil_template.c
	libavcodec/h264.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-21 17:18:43 +01:00
Ronald S. Bultje
8c53d39e7f lavc: introduce VideoDSPContext 
Move some functions from dsputil. The idea is that videodsp contains
functions that are useful for a large and varied set of video decoders.
Currently, it contains emulated_edge_mc() and prefetch().

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-12-20 13:40:45 +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ö
1fec055066 msmpeg4: Add ff_ prefixes to nonstatic symbols 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:07:01 +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
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
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
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
59e6f60a99 add ff_ prefix to all simple_idct symbols 
Originally committed as revision 11192 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-08 21:21:11 +00:00
Aurelien Jacobs
4d4f59d750 split wmv2 encoder and decoder in their own files 
Originally committed as revision 11091 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-25 16:23:42 +00:00
Michael Niedermayer
9abc7e0fdc intrax8 decoder patch by "someone" 
Originally committed as revision 10971 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-09 21:37:48 +00:00
Aurelien Jacobs
cc6de104f8 split wmv2 in its own file 
Originally committed as revision 10951 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-07 23:41:39 +00:00
Aurelien Jacobs
85f601ee7b rename some msmpeg4 symbols and make them non-static 
so that they can be used in standalone wmv2.c

Originally committed as revision 10949 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-07 23:23:35 +00:00
Alex Beregszaszi
5fc32c275e use get_bits1(..) instead get_bits(.., 1) 
Originally committed as revision 9999 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 00:13:31 +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
Ivan Kalvachev
a8ff69ce2b Identify the loop_filter flag as such and remove the unused variables in the context. 
Originally committed as revision 9447 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-27 14:27:47 +00:00
Denis Fortin
c68a173ef3 static (inline) X => ff_X 
patch by Denis Fortin: \fortin nerim net/
original thread: [FFmpeg-devel] [PATCH] wmv3 encoder : msmpeg4.c changes
date: 06/19/2007 09:54 PM

Originally committed as revision 9381 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-21 07:53:48 +00:00
Diego Biurrun
755bfeabcc misc spelling fixes 
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-12 09:29:25 +00:00
Denis Fortin
f0edfda578 Rename code012() to ff_code012(), and remove static qualifier: paves the way 
to vc1 encoder, as this function would be useful there.
patch by Denis Fortin % fortin A nerim P net %
Original thread:
date: Jun 4, 2007 9:23 PM
subject: Re: [FFmpeg-devel] [RFC] move wmv2.c to its own file

Originally committed as revision 9222 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-05 07:18:29 +00:00
Diego Biurrun
686dcc1167 Replace general CONFIG_ENCODERS by more fine-grained CONFIG_WMV2_ENCODER. 
Originally committed as revision 8952 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-09 18:23:20 +00:00
Diego Biurrun
4a815a7f64 Allow conditional compilation of H.263-related decoders. 
Originally committed as revision 8949 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-09 09:26:06 +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
Michael Niedermayer
bc9a459780 maybe fixing a segfault 
Originally committed as revision 7407 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-03 11:32:02 +00:00
Diego Biurrun
c26abfa541 Rename ABS macro to FFABS. 
Originally committed as revision 6666 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-11 23:17:58 +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
Michael Niedermayer
98bf484309 1000l copy and paste typo 
Originally committed as revision 6305 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-21 01:08:05 +00:00
Michael Niedermayer
c3e462a8ca set supported pixel formats for a few encoders (fixes crashes with grayscale) 
Originally committed as revision 6303 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-20 21:17:37 +00:00
Michael Niedermayer
a7702890bd remove STATS code (probably hasnt been used for years ..., and its not completely clear what it was good for anyway) 
Originally committed as revision 5689 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-09 10:33:49 +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
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
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting 
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-22 01:10:11 +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
804b0dac58 segfault fix 
Originally committed as revision 4491 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-08-04 22:46:27 +00:00
Diego Biurrun
51fd379af2 Reduce verbosity. 
Originally committed as revision 4478 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-07-27 07:29:20 +00:00
Michael Niedermayer
1c02a9732a fix block corruption caused by clear_blocks() optimization 
Originally committed as revision 4202 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-08 13:04:46 +00:00
Michael Niedermayer
c0df9d75bd switch to native time bases 
Originally committed as revision 4168 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-30 21:43:59 +00:00
Michael Niedermayer
dee6dde669 avoid unneeded clear_blocks() 
Originally committed as revision 4157 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-25 00:57:48 +00:00
Mike Melanson
160d679c07 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped") 
Originally committed as revision 4153 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-24 17:21:11 +00:00
Måns Rullgård
88730be651 kill warnings patch by (Måns Rullgård <mru inprovide com>) 
Originally committed as revision 3977 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-24 19:08:50 +00:00
anonymous
0d33db8a4d In that patch: 
- avctx and gb elements were removed from VC9Context, hence a larger diff
- some code was added to h263dec.c regarding CODEC_ID_WMV3 (should apply to CODEC_ID_VC9 too)
- VLC tables and other related tables were made global whenever this seemed necessary; appropriate changes were therefore made to other parts of the code using those tables
- the change for the bitplane management to a struct (some of them should eventually be mapped to MpegEncContext arrays) wasn't associated with the proper frees; should be fixed now
patch by anonymous

better names for globalized tables by me

Originally committed as revision 3905 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-30 16:34:57 +00:00
Michael Niedermayer
4df8ca9df2 warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>) 
Originally committed as revision 3156 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-25 18:07:25 +00:00
Michael Niedermayer
e96682e6f4 some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>) 
Originally committed as revision 3140 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-18 17:09:46 +00:00