summaryrefslogtreecommitdiff
path: root/libavcodec/msmpeg4.c
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-14
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: APIchanges: fill in missing hashes and dates. Add an APIChanges entry and bump minor versions for recent changes. ffmpeg: print the low bitrate warning after the codec is openend. doxygen: Move function documentation into the macro generating the function. doxygen: Make sure parameter names match between .c and .h files. h264: move fill_decode_neighbors()/fill_decode_caches() to h264_mvpred.h H.264: Add more x86 assembly for 10-bit H.264 predict functions lavf: fix invalid reads in avformat_find_stream_info() cmdutils: replace opt_default with opt_default2() and remove set_context_opts ffmpeg: use new avcodec_open2 and avformat_find_stream_info API. ffplay: use new avcodec_open2 and avformat_find_stream_info API. cmdutils: store all codec options in one dict instead of video/audio/sub ffmpeg: check experimental flag after codec is opened. ffmpeg: do not set GLOBAL_HEADER flag in the options context Conflicts: cmdutils.c doc/APIchanges ffmpeg.c ffplay.c libavcodec/version.h libavformat/version.h libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: changelog: misc typo and wording fixes H.264: add filter_mb_fast support for >8-bit decoding doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support. lls: use av_lfg instead of rand() in test program build: remove unnecessary dependency on libs from 'all' target H.264: avoid redundant alpha/beta calculations in loopfilter H.264: optimize intra/inter loopfilter decision mpegts: fix Continuity Counter error detection build: remove unnecessary FFLDFLAGS variable vp8/mt: flush worker thread, not application thread context, on seek. mt: proper locking around release_buffer calls. DxVA2: unbreak build after [657ccb5ac75ce34e62bd67f228d9bd36db72189e] hwaccel: unbreak build Eliminate FF_COMMON_FRAME macro. Conflicts: Changelog Makefile doc/developer.texi libavcodec/avcodec.h libavcodec/h264.c libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Eliminate FF_COMMON_FRAME macro.Diego Biurrun2011-07-11
| | | | | | | | | | FF_COMMON_FRAME holds the contents of the AVFrame structure and is also copied to struct Picture. Replace by an embedded AVFrame structure in struct Picture.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (25 commits) Replace custom DEBUG preprocessor trickery by the standard one. vorbis: Remove non-compiling debug statement. vorbis: Remove pointless DEBUG #ifdef around debug output macros. cook: Remove non-compiling debug output. Remove pointless #ifdefs around function declarations in a header. Replace #ifdef + av_log() combinations by av_dlog(). Replace custom debug output functions by av_dlog(). cook: Remove unused debug functions. Remove stray extra arguments from av_dlog() invocations. targa: fix big-endian build v4l2: remove one forgotten use of AVFormatParameters.pix_fmt. vfwcap: add a framerate private option. v4l2: add a framerate private option. libdc1394: add a framerate private option. fbdev: add a framerate private option. bktr: add a framerate private option. oma: check avio_read() return value nutdec: remove unused variable Remove unused variables swscale: allocate larger buffer to handle altivec overreads. ... Conflicts: ffmpeg.c libavcodec/dca.c libavcodec/dirac.c libavcodec/error_resilience.c libavcodec/h264.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pthread.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/shorten.c libavcodec/truemotion2.c libavcodec/utils.c libavdevice/dv1394.c libavdevice/fbdev.c libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/4xm.c libavformat/apetag.c libavformat/asfdec.c libavformat/avidec.c libavformat/mmf.c libavformat/mpeg.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/oggdec.c libavformat/oggparseogm.c libavformat/rl2.c libavformat/rmdec.c libavformat/rpl.c libavformat/rtpdec_latm.c libavformat/sauce.c libavformat/sol.c libswscale/utils.c tests/ref/vsynth1/error tests/ref/vsynth2/error Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove unused variablesMans Rullgard2011-06-02
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) configure: enable memalign_hack automatically when needed swscale: unbreak the build on non-x86 systems. swscale: remove if(bitexact) branch from functions. swscale: remove if(canMMX2BeUsed) conditional. swscale: remove swScale_{c,MMX,MMX2} duplication. swscale: use emms_c(). Move emms_c() from libavcodec to libavutil. tiff: set palette in the context when specified in TIFF_PAL tag rtsp: use strtoul to parse rtptime and seq values. pgssubdec: fix incorrect colors. dvdsubdec: fix incorrect colors. ape: Allow demuxing of files with metadata tags. swscale: remove dead macro WRITEBGR24OLD. swscale: remove AMD3DNOW "optimizations". swscale: remove duplicate code in ppc/ subdirectory. swscale: remove duplicated x86/ functions. swscale: force --enable-runtime-cpudetect and remove SWS_CPU_CAPS_*. vsrc_buffer.h: add file doxy vsrc_buffer: tweak error message in init() msmpeg4: reindent. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * msmpeg4: reindent.Anton Khirnov2011-05-24
| |
| * lavc: remove msmpeg4v1 encoder.Anton Khirnov2011-05-24
| | | | | | | | | | | | The encoder has never produced files that could be decoded with any software and there should be no reason to create such files anyway.
| * Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.Stefano Sabatini2011-05-02
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*Stefano Sabatini2011-05-02
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Duplicate AMV: disable DR1 and don't override EMU_EDGE Duplicate lavf: inspect more frames for fps when container time base is coarse Wrong and we have correct fix: Fix races in default av_log handler vorbis: Replace sized int_fast integer types with plain int/unsigned. Remove disabled non-optimized code variants. NO bswap.h: Remove disabled code. Remove some disabled printf debug cruft. Replace more disabled printf() calls by av_dlog(). NO tests: Remove disabled code. NO Replace some commented-out debug printf() / av_log() messages with av_dlog(). vorbisdec: Replace some sizeof(type) by sizeof(*variable). NO vf_fieldorder: Replace FFmpeg by Libav in license boilerplate. Conflicts: libavcodec/h264.c libavcodec/vorbisdec.c libavutil/log.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove some disabled printf debug cruft.Diego Biurrun2011-04-29
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) ac3enc: correct the flipped sign in the ac3_fixed encoder Eliminate pointless '#if 1' statements without matching '#else'. Add AVX FFT implementation. Increase alignment of av_malloc() as needed by AVX ASM. Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX. mjpeg: Detect overreads in mjpeg_decode_scan() and error out. documentation: extend documentation for ffmpeg -aspect option APIChanges: update commit hashes for recent additions. lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums aac: add headers needed for log2f() lavc: remove FF_API_MB_Q cruft lavc: remove FF_API_RATE_EMU cruft lavc: remove FF_API_HURRY_UP cruft pad: make the filter parametric vsrc_movie: add key_frame and pict_type. vsrc_movie: fix leak in request_frame() lavfi: add key_frame and pict_type to AVFilterBufferRefVideo. vsrc_buffer: add sample_aspect_ratio fields to arguments. lavfi: add fieldorder filter scale: make the filter parametric ... Conflicts: Changelog doc/filters.texi ffmpeg.c libavcodec/ac3dec.h libavcodec/dsputil.c libavfilter/avfilter.h libavfilter/vf_scale.c libavfilter/vf_yadif.c libavfilter/vsrc_buffer.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Eliminate pointless '#if 1' statements without matching '#else'.Diego Biurrun2011-04-26
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (32 commits) libopencore-amr, libvo-amrwbenc: Allow enabling DTX via private AVOptions libopencore-amr, libvo-amrwbenc: Only check the bitrate when changed libopencore-amr, libvo-amrwbenc: Find the closest matching bitrate libvo-*: Fix up the long codec names libavcodec: Mark AVCodec->priv_class const swscale: Factorize FAST_BGR2YV12 definition. libvo-aacenc: Only produce extradata if the global header flag is set lavf: postpone removal of public metadata conversion API lavc: postpone removal of request_channels lavc: postpone removal of audioconvert and sample_fmt wrappers lavf: postpone removal of deprecated avio functions libopencore-amr: Cosmetics: Rewrap and align libopencore-amr, libvo-amrbwenc: Rename variables and functions libopencore-amr: Convert commented out debug logging into av_dlog libopencore-amr: Remove an unused state variable libvo-amrwbenc: Don't explicitly store bitrate modes in the bitrate table libopencore-amr: Remove a useless local variable libopencore-amr, libvo-amrwbenc: Make the bitrate/mode mapping array static const libopencore-amr, libvo-amrwbenc: Return proper error codes in most places libopencore-amr: Don't print carriage returns in log messages ... Conflicts: doc/developer.texi libavcodec/avcodec.h libavcodec/libvo-aacenc.c libavcodec/libvo-amrwbenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Check for successful h263 init in msmpeg4 initAlberto Delmas2011-04-12
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-26
| | | | | | | | | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Remove redundant checks against MIN_CACHE_BITSMans Rullgard2011-01-23
| | | | | | | | | | | | | | With the removal of the libmpeg2 bitstream reader, MIN_CACHE_BITS is always >= 25, so tests against smaller values can be removed. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Mark MS-MPEG4v1 encoder as experimental.Carl Eugen Hoyos2011-02-25
| | | | | | | | | | The encoder has never produced files that could be decoded with any software.
* | Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-28
| | | | | | | | | | | | | | | | 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 d36beb3f6902b1217beda576aa18abf7eb72b03c)
* | Remove redundant checks against MIN_CACHE_BITSMans Rullgard2011-01-23
|/ | | | | | | | With the removal of the libmpeg2 bitstream reader, MIN_CACHE_BITS is always >= 25, so tests against smaller values can be removed. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit f162e988aa0dc8df93079b5ebf452ec281ab8793)
* msmpeg4v1: fix undefined behaviour in msmpeg4_decode_picture_header()Måns Rullgård2010-08-24
| | | | | | | | | | Because the order of evaluation of subexpressions is undefined, two get_bits() calls may not be part of the same expression. In this specific case, using get_bits_long() is simpler. This fixes msmpeg4v1 decoding with armcc. Originally committed as revision 24902 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add new decoder property max_lowres and do not init decoder if requested ↵Carl Eugen Hoyos2010-07-07
| | | | | | value is higher. Originally committed as revision 24098 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-20
| | | | | | | | 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
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-30
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement cool new vlc code.Michael Niedermayer2010-02-04
| | | | | | Fixes issue1637 Originally committed as revision 21635 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move AVCodecs from h263dec.c to msmpeg4.c and disentangle init decode init.Michael Niedermayer2010-01-08
| | | | Originally committed as revision 21102 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use h263 tables in msmpeg4v1 dont duplicate them halfway.Michael Niedermayer2010-01-08
| | | | Originally committed as revision 21101 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename most non static h263 tables so their name contains h263.Michael Niedermayer2010-01-08
| | | | Originally committed as revision 21098 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
* Split the mpeg4 encoder and decoder off h263.cMichael Niedermayer2010-01-07
| | | | Originally committed as revision 21079 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove unused function msmpeg4_memsetw().Diego Biurrun2009-12-31
| | | | | | It is an exact duplicate of memsetw() in h263.c. Originally committed as revision 20986 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Reorder functions to avoid forward declarations.Diego Biurrun2009-12-30
| | | | Originally committed as revision 20977 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove unnecessary forward declaration for msmpeg4_memsetw().Diego Biurrun2009-12-30
| | | | Originally committed as revision 20976 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use get_bits_left() instead of size_in_bits - get_bits_count().Ronald S. Bultje2009-11-16
| | | | Originally committed as revision 20543 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace #ifdef PIC checks with the more appropriate ↵Reimar Döffinger2009-08-21
| | | | | | HAVE_EBX_AVAILABLE/HAVE_7REGS. Originally committed as revision 19676 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove unused debug av_log() calls.Diego Biurrun2009-07-30
| | | | Originally committed as revision 19549 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove unused variable intra_count.Diego Biurrun2009-07-30
| | | | Originally committed as revision 19537 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not check for both CONFIG_VC1_DECODER and CONFIG_WMV3_DECODER,Diego Biurrun2009-07-29
| | | | | | the former depends upon the latter. Originally committed as revision 19533 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Get rid of an unused variable, found by the clang static analyzer.Michael Niedermayer2009-04-17
| | | | Originally committed as revision 18544 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Get rid of INIT_VLC_USE_STATIC in msmpeg4Michael Niedermayer2009-04-11
| | | | Originally committed as revision 18433 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use INIT_VLC_USE_STATIC and not its value "1".Carl Eugen Hoyos2009-04-11
| | | | Originally committed as revision 18430 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add missing av_cold in static init/close functions.Daniel Verkamp2009-02-22
| | | | | | Patch by Daniel Verkamp daniel at drv dot nu. Originally committed as revision 17526 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix: libavcodec/msmpeg4.c:1612: warning: ‘dc_pred_dir’ may be used ↵Michael Niedermayer2009-02-09
| | | | | | uninitialized in this function Originally committed as revision 17106 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full internal pathname in doxygen @file directives.Diego Biurrun2009-02-01
| | | | | | | 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
* cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun2009-01-19
| | | | Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_Aurelien Jacobs2009-01-14
| | | | | | and remove all ENABLE_ definitions. Originally committed as revision 16600 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change semantic of CONFIG_*, HAVE_* and ARCH_*.Aurelien Jacobs2009-01-13
| | | | | | They are now always defined to either 0 or 1. Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Convert asm keyword into __asm__.Diego Pettenò2008-10-16
| | | | | | | | | | | | | Neither the asm() nor the __asm__() keyword is part of the C99 standard, but while GCC accepts the former in C89 syntax, it is not accepted in C99 unless GNU extensions are turned on (with -fasm). The latter form is accepted in any syntax as an extension (without requiring further command-line options). Sun Studio C99 compiler also does not accept asm() while accepting __asm__(), albeit reporting warnings that it's not valid C99 syntax. Originally committed as revision 15627 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-20 11:47:52 +0000