summaryrefslogtreecommitdiff
path: root/libavcodec/wmv2.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '57ed8debb9b9cc565cc6e9f98c5b5cbb9f69097c'Michael Niedermayer2013-01-241-0/+1
|\ | | | | | | | | | | | | | | * 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>
| * wmv2: Propagate the wmv2 idct permutation type to the dsputils contextMartin Storsjö2013-01-241-0/+1
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'Michael Niedermayer2013-01-231-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Drop DCTELEM typedefDiego Biurrun2013-01-221-2/+2
| | | | | | | | | | | | It does not help as an abstraction and adds dsputil dependencies. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Merge commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0'Michael Niedermayer2013-01-211-3/+19
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * 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>
| * wmv2: move IDCT to its own DSP context.Ronald S. Bultje2013-01-201-3/+19
| | | | | | | | | | | | | | | | | | | | | | 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).
* | Merge commit '6906b19346ae8a330bfaa1c16ce535be10789723'Michael Niedermayer2012-12-211-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavc: introduce VideoDSPContextRonald S. Bultje2012-12-201-3/+3
| | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-161-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * msmpeg4: Add ff_ prefixes to nonstatic symbolsMartin Storsjö2012-02-151-2/+2
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-5/+5
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Move ff_emulated_edge_mc() into DSPContext.Ronald S. Bultje2011-01-281-3/+3
| |
* | Move ff_emulated_edge_mc() into DSPContext.Ronald S. Bultje2011-01-301-3/+3
|/ | | | (cherry picked from commit 2e279598793133ee9c57fd0026d672f076fde4bf)
* cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun2009-01-191-1/+1
| | | | Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* clear_block mmxLoren Merritt2008-12-101-2/+2
| | | | Originally committed as revision 16045 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Apply 'cold' attribute to init/uninit functions in libavcodecZuxy Meng2008-03-211-1/+1
| | | | Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add ff_ prefix to all simple_idct symbolsAurelien Jacobs2007-12-081-4/+4
| | | | Originally committed as revision 11192 to svn://svn.ffmpeg.org/ffmpeg/trunk
* split wmv2 encoder and decoder in their own filesAurelien Jacobs2007-11-251-714/+2
| | | | Originally committed as revision 11091 to svn://svn.ffmpeg.org/ffmpeg/trunk
* intrax8 decoder patch by "someone"Michael Niedermayer2007-11-091-5/+10
| | | | Originally committed as revision 10971 to svn://svn.ffmpeg.org/ffmpeg/trunk
* split wmv2 in its own fileAurelien Jacobs2007-11-071-0/+5
| | | | Originally committed as revision 10951 to svn://svn.ffmpeg.org/ffmpeg/trunk
* rename some msmpeg4 symbols and make them non-staticAurelien Jacobs2007-11-071-17/+17
| | | | | | so that they can be used in standalone wmv2.c Originally committed as revision 10949 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use get_bits1(..) instead get_bits(.., 1)Alex Beregszaszi2007-08-091-1/+1
| | | | Originally committed as revision 9999 to svn://svn.ffmpeg.org/ffmpeg/trunk
* license header consistency cosmeticsDiego Biurrun2007-07-051-1/+0
| | | | Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Identify the loop_filter flag as such and remove the unused variables in the ↵Ivan Kalvachev2007-06-271-6/+4
| | | | | | context. Originally committed as revision 9447 to svn://svn.ffmpeg.org/ffmpeg/trunk
* static (inline) X => ff_XDenis Fortin2007-06-211-1/+1
| | | | | | | | 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
* misc spelling fixesDiego Biurrun2007-06-121-2/+3
| | | | Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename code012() to ff_code012(), and remove static qualifier: paves the wayDenis Fortin2007-06-051-5/+5
| | | | | | | | | | 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
* Replace general CONFIG_ENCODERS by more fine-grained CONFIG_WMV2_ENCODER.Diego Biurrun2007-05-091-3/+3
| | | | Originally committed as revision 8952 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Allow conditional compilation of H.263-related decoders.Diego Biurrun2007-05-091-0/+2
| | | | Originally committed as revision 8949 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add av_ prefix to clip functionsReimar Döffinger2007-02-251-4/+4
| | | | Originally committed as revision 8122 to svn://svn.ffmpeg.org/ffmpeg/trunk
* maybe fixing a segfaultMichael Niedermayer2007-01-031-0/+6
| | | | Originally committed as revision 7407 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename ABS macro to FFABS.Diego Biurrun2006-10-111-1/+1
| | | | Originally committed as revision 6666 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change license headers to say 'FFmpeg' instead of 'this program/this library'Diego Biurrun2006-10-071-4/+6
| | | | | | and fix GPL/LGPL version mismatches. Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 1000l copy and paste typoMichael Niedermayer2006-09-211-1/+1
| | | | Originally committed as revision 6305 to svn://svn.ffmpeg.org/ffmpeg/trunk
* set supported pixel formats for a few encoders (fixes crashes with grayscale)Michael Niedermayer2006-09-201-0/+1
| | | | Originally committed as revision 6303 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove STATS code (probably hasnt been used for years ..., and its not ↵Michael Niedermayer2006-07-091-3/+0
| | | | | | completely clear what it was good for anyway) Originally committed as revision 5689 to svn://svn.ffmpeg.org/ffmpeg/trunk
* MSVC-compatible __align8/__align16 declarationSteve L'Homme2006-02-051-1/+1
| | | | | | patch by Steve Lhomme, steve .dot. lhomme .at. free .dot. fr Originally committed as revision 4942 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Update licensing information: The FSF changed postal address.Diego Biurrun2006-01-121-1/+1
| | | | Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
* COSMETICS: tabs --> spaces, some prettyprintingDiego Biurrun2005-12-221-29/+29
| | | | Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
* COSMETICS: Remove all trailing whitespace.Diego Biurrun2005-12-171-76/+76
| | | | Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
* segfault fixMichael Niedermayer2005-08-041-2/+5
| | | | Originally committed as revision 4491 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reduce verbosity.Diego Biurrun2005-07-271-1/+1
| | | | Originally committed as revision 4478 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fix block corruption caused by clear_blocks() optimizationMichael Niedermayer2005-05-081-3/+3
| | | | Originally committed as revision 4202 to svn://svn.ffmpeg.org/ffmpeg/trunk
* switch to native time basesMichael Niedermayer2005-04-301-1/+1
| | | | Originally committed as revision 4168 to svn://svn.ffmpeg.org/ffmpeg/trunk
* avoid unneeded clear_blocks()Michael Niedermayer2005-04-251-0/+2
| | | | Originally committed as revision 4157 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Ministry of English Composition, reporting for duty (and the word is ↵Mike Melanson2005-04-241-2/+2
| | | | | | "skipped", not "skiped"; "skiped" would rhyme with "hyped") Originally committed as revision 4153 to svn://svn.ffmpeg.org/ffmpeg/trunk
* kill warnings patch by (Måns Rullgård <mru inprovide com>)Måns Rullgård2005-02-241-0/+2
| | | | Originally committed as revision 3977 to svn://svn.ffmpeg.org/ffmpeg/trunk
* In that patch:anonymous2005-01-301-2/+2
| | | | | | | | | | | | - 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
* warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)Michael Niedermayer2004-05-251-3/+0
| | | | Originally committed as revision 3156 to svn://svn.ffmpeg.org/ffmpeg/trunk
* some of the warning fixes by (Michael Roitzsch <mroi at users dot ↵Michael Niedermayer2004-05-181-1/+2
| | | | | | sourceforge dot net>) Originally committed as revision 3140 to svn://svn.ffmpeg.org/ffmpeg/trunk
View Lorry Controller Status