summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg4video.h
Commit message (Collapse)AuthorAge
...
* | Merge commit '1a89025793ca73d9685a8ce8e3194efa64dd6844'Michael Niedermayer2013-11-29
|\| | | | | | | | | | | | | * commit '1a89025793ca73d9685a8ce8e3194efa64dd6844': mpeg4videodec: move MpegEncContext.vol_sprite_usage to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move MpegEncContext.vol_sprite_usage to Mpeg4DecContextAnton Khirnov2013-11-29
| |
* | Merge commit 'e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4'Michael Niedermayer2013-11-29
|\| | | | | | | | | | | | | | | | | | | * commit 'e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4': mpeg4videodec: move MpegEncContext.time_increment_bits to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move MpegEncContext.time_increment_bits to Mpeg4DecContextAnton Khirnov2013-11-29
| | | | | | | | The field remains in MpegEncContext for use in the encoder.
* | Merge commit 'ee8af2dd99dcb7a01a667deedec81d1aa2a00d72'Michael Niedermayer2013-11-29
|\| | | | | | | | | | | | | | | | | | | | | * commit 'ee8af2dd99dcb7a01a667deedec81d1aa2a00d72': mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContext Conflicts: libavcodec/h263dec.c libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContextAnton Khirnov2013-11-29
| |
* | Merge commit '35e0833d410e31d9fd35695ad798c5d13de2af58'Michael Niedermayer2013-11-29
|\| | | | | | | | | | | | | | | | | | | | | * commit '35e0833d410e31d9fd35695ad798c5d13de2af58': mpeg4videodec: add a mpeg4-specific private context. Conflicts: libavcodec/mpeg4video_parser.c libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: add a mpeg4-specific private context.Anton Khirnov2013-11-29
| |
* | Merge commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0'Michael Niedermayer2013-11-02
|\| | | | | | | | | | | | | | | | | | | * commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0': mpeg4video: K&R formatting cosmetics Conflicts: libavcodec/mpeg4video.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4video: K&R formatting cosmeticsVittorio Giovara2013-11-01
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'c591d4575a6f97fbbe6145304b1ea960e8e81e14'Michael Niedermayer2013-08-16
|\| | | | | | | | | | | | | * commit 'c591d4575a6f97fbbe6145304b1ea960e8e81e14': avcodec: Replace local extern declarations for tables with header #includes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: Replace local extern declarations for tables with header #includesDiego Biurrun2013-08-15
| |
* | Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-22
| | | | | | | | | | | | It does not help as an abstraction and adds dsputil dependencies. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | ff_mpeg4videodec_static_init: fix return typeMichael Niedermayer2012-11-17
| | | | | | | | | | Fixes CID743439 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpeg4videodec: split static decoder table init outMichael Niedermayer2012-11-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * mpeg4: Add ff_ prefixes to nonstatic symbolsMartin Storsjö2012-02-15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | mpeg4dec: restore error concealment functionality after mergeMichael Niedermayer2011-12-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doxygen: misc consistency, spelling and wording fixes vcr1: drop unnecessary emms_c() calls without MMX code Replace all uses of av_close_input_file() with avformat_close_input(). lavf: add avformat_close_input(). lavf: deprecate av_close_input_stream(). lavf doxy: add some basic demuxing documentation. lavf doxy: add some general lavf information. lavf doxy: add misc utility functions to a group. lavf doxy: add av_guess_codec/format to the encoding group. lavf doxy: add core functions to a doxy group. Add basic libavdevice documentation. lavc: convert error_recognition to err_recognition. avconv: update -map option help text x86: Require 7 registers for the cabac asm x86: bswap: remove test for bswap instruction bswap: make generic implementation more compiler-friendly h264: remove useless cast proresdec: fix decode_slice() prototype Conflicts: configure doc/APIchanges ffprobe.c libavcodec/avcodec.h libavcodec/celp_math.h libavcodec/h264.c libavfilter/src_movie.c libavformat/anm.c libavformat/avformat.h libavformat/version.h libavutil/avstring.h libavutil/bswap.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxygen: misc consistency, spelling and wording fixesDiego Biurrun2011-12-12
| |
| * lavc: convert error_recognition to err_recognition.Dustin Brody2011-12-12
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ffmpeg: get rid of the -vglobal option. dct32: Add AVX implementation of 32-point DCT dct32: Change pass 6 permutation to allow for AVX implementation dct32: port SSE 32-point DCT to YASM multiple inclusion guard cleanup avio: document buffer must created with av_malloc() and friends avio: check AVIOContext malloc failure swscale: point out an alternative to sws_getContext svq3: Do initialization after parsing the extradata add changelog entries for 0.7_beta2 mp3lame: add #include required for AV_RB32 macro. Conflicts: Changelog libavcodec/svq3.c libavcodec/x86/dct32_sse.c libavfilter/vsrc_buffer.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * multiple inclusion guard cleanupDiego Biurrun2011-05-21
| | | | | | | | | | Add missing multiple inclusion guards; clean up #endif comments; add missing library prefixes; keep guard names consistent.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Make inter_rvlc and intra_rvlc static tables.Diego Elio Pettenò2011-02-06
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Make inter_rvlc and intra_rvlc static tables.Diego Elio Pettenò2011-02-06
|/ | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 84ae8936f642042fe7ad3466ce3a26dec77016f1)
* Add lots of missing includesMåns Rullgård2010-03-08
| | | | Originally committed as revision 22337 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make some tables static again, i mistakely thought they would be used in severalMichael Niedermayer2010-01-09
| | | | | | places. Originally committed as revision 21111 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move 3 direct MV related functions that i left out from h263.c to mpeg4video.c.Michael Niedermayer2010-01-08
| | | | Originally committed as revision 21104 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename mpeg4 intra vlc tables so they contain "mpeg4", this improves readabilityMichael Niedermayer2010-01-08
| | | | | | of msmpeg4 code (one now knows where that table comes from). Originally committed as revision 21097 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename DCtab_*, its a global variable and it helps understanding if mpeg4Michael Niedermayer2010-01-08
| | | | | | is in its name. Originally committed as revision 21096 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove useless line.Michael Niedermayer2010-01-08
| | | | Originally committed as revision 21092 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Split the mpeg4 encoder and decoder off h263.cMichael Niedermayer2010-01-07
Originally committed as revision 21079 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-12 23:03:39 +0000