summaryrefslogtreecommitdiff
path: root/libavcodec/indeo5.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-051-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (46 commits) mtv: Make sure audio_subsegments is not 0 v4l2: use V4L2_FMT_FLAG_EMULATED only if it is defined avconv: add symbolic names for -vsync parameters flvdec: Fix compiler warning for uninitialized variables rtsp: Fix compiler warning for uninitialized variable ulti: convert to new bytestream API. swscale: Use standard multiple inclusion guards in ppc/ header files. Place some START_TIMER invocations in separate blocks. v4l2: list available formats v4l2: set the proper codec_tag v4l2: refactor device_open v4l2: simplify away io_method v4l2: cosmetics v4l2: uniform and format options v4l2: do not force interlaced mode avio: exit early in fill_buffer without read_packet vc1dec: fix invalid memory access for small video dimensions rv34: fix invalid memory access for small video dimensions rv34: joint coefficient decoding and dequantization avplay: Don't call avio_set_interrupt_cb(NULL) ... Conflicts: Changelog avconv.c doc/APIchanges doc/indevs.texi libavcodec/adxenc.c libavcodec/dnxhdenc.c libavcodec/h264.c libavdevice/v4l2.c libavformat/flvdec.c libavformat/mtv.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Place some START_TIMER invocations in separate blocks.Diego Biurrun2012-01-041-2/+2
| | | | | | | | | | | | This fixes compilation failures related to START_TIMER/STOP_TIMER macros and -Werror=declaration-after-statement. START_TIMER declares variables and thus may not be placed after statements outside of a new block.
* | indeo5: Fix null pointer dereferences of ref_mbMichael Niedermayer2011-12-291-3/+3
| | | | | | | | | | Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | indeo5: Fix crash due to partially initialized gop vars.Michael Niedermayer2011-12-281-3/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-231-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: build: fix standalone compilation of OMA muxer build: fix standalone compilation of Microsoft XMV demuxer build: fix standalone compilation of Core Audio Format demuxer kvmc: fix invalid reads 4xm: Add a check in decode_i_frame to prevent buffer overreads adpcm: fix IMA SMJPEG decoding options: set minimum for "threads" to zero bsd: use number of logical CPUs as automatic thread count windows: use number of CPUs as automatic thread count linux: use number of CPUs as automatic thread count pthreads: reset active_thread_type when slice thread_init returrns early v410dec: include correct headers Drop ALT_ prefix from BITSTREAM_READER_LE name. lavfi: always build vsrc_buffer. ra144enc: zero the reflection coeffs if the filter is unstable sws: readd PAL8 to isPacked() mov: Don't stick the QuickTime field ordering atom in extradata. truespeech: fix invalid reads in truespeech_apply_twopoint_filter() Conflicts: configure libavcodec/4xm.c libavcodec/avcodec.h libavfilter/Makefile libavfilter/allfilters.c libavformat/Makefile libswscale/swscale_internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Drop ALT_ prefix from BITSTREAM_READER_LE name.Diego Biurrun2011-12-221-1/+1
| | | | | | | | | | The prefix is a historic remnant that probably meant "alternative". Now that the A32 bitstream reader has been dropped it makes no sense anymore.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-031-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Replace custom DEBUG preprocessor trickery by the standard one.Diego Biurrun2011-06-031-1/+1
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | 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-261-1/+1
| | | | | | | | | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | lavc: set defaults in internal codec framesStefano Sabatini2011-05-071-0/+2
| | | | | | | | | | | | | | | | | | 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.
* | Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-281-1/+1
|/ | | | | | | | 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)
* Fix Doxygen @param command attribute syntax.Diego Biurrun2010-07-171-16/+16
| | | | | | The [in] and [out] attributes have to be appended to the @param command. Originally committed as revision 24283 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix grammar errors in documentationMåns Rullgård2010-06-301-9/+9
| | | | Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move indeo5-specific quant table selection to decode_gop_hdr.Maxim Poliakovski2010-06-111-16/+20
| | | | Originally committed as revision 23581 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove unused parameter.Maxim Poliakovski2010-06-101-3/+2
| | | | Originally committed as revision 23563 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add the forgotten ff_ prefix to the shareable scan patterns.Maxim Poliakovski2010-05-261-4/+4
| | | | Originally committed as revision 23341 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move indeo5 scan patterns into ivi_common.cMaxim Poliakovski2010-05-261-4/+4
| | | | | | so those can be shared by indeo4. Originally committed as revision 23335 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-201-1/+1
| | | | | | | | 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-301-1/+1
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Correct reference buffer switching in Indeo 5 decoder.Maxim Poliakovski2010-03-171-39/+27
| | | | | | Patch by Maxim ($indeo5decauthor) Originally committed as revision 22580 to svn://svn.ffmpeg.org/ffmpeg/trunk
* document two variables in Indeo5 decoding contextKostya Shishkov2010-03-171-2/+2
| | | | Originally committed as revision 22579 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make Indeo 5 decoder more robust on bitstream errors.Maxim Poliakovski2010-03-081-4/+8
| | | | | | Patch by Maxim ($indeo5dec_author) Originally committed as revision 22319 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Band quant tables should not be assigned inside band tile loop,Maxim Poliakovski2010-03-071-12/+12
| | | | | | | one time is enough. Patch by Maxim (max_pole, gmx de) Originally committed as revision 22279 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Encapsulate VLC information needed for decoding blocks and macroblocks inKostya Shishkov2010-02-271-59/+12
| | | | | | | | Indeo 5 into single structure IVIHuffTab and factorize code using it. Based on patch by Maxim (max_pole at German GMX) Originally committed as revision 22092 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 10l trocadero: Indeo 5 decoder did not free custom VLCs for macroblock andKostya Shishkov2010-02-231-0/+3
| | | | | | block decoding at exit, so prevent that memory leak now. Originally committed as revision 21983 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Macroblock and block Huffman code sets are to be used by both Indeo 4 andKostya Shishkov2010-02-221-14/+6
| | | | | | | | Indeo 5, so make them global and move their initialization to the common place as well. And fix static VLC initialization, as ff_ivi_create_huff_from_desc() used old way to do so. Originally committed as revision 21962 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove ivi5_scans8x8[0], it duplicates ff_zigzag_directStefan Gehrer2010-02-191-4/+5
| | | | Originally committed as revision 21897 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move 'chksum' declaration to the only block where that variable is usedKostya Shishkov2010-02-111-2/+1
| | | | Originally committed as revision 21753 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move band checksum verifying into preprocessor condition, so compiler won'tKostya Shishkov2010-02-111-1/+3
| | | | | | complain about missing function prototype. Originally committed as revision 21752 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Indeo 5 decoderKostya Shishkov2010-02-091-0/+885
Originally committed as revision 21695 to svn://svn.ffmpeg.org/ffmpeg/trunk