summaryrefslogtreecommitdiffstats
path: root/libavcodec/ivi_common.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd'Michael Niedermayer2012-12-141-74/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd': ivi_common: use proper logging context in ivi_decode_blocks(). ivi_common: make some functions and tables static. asyncts: ignore min_delta only if first_pts is set Conflicts: libavcodec/ivi_common.c libavcodec/ivi_common.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ivi_common: make some functions and tables static.Anton Khirnov2012-12-141-74/+0
| |
* | Merge commit 'df9b9567518f2840d79a4a96b447ebe1aa326408'Michael Niedermayer2012-12-051-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'df9b9567518f2840d79a4a96b447ebe1aa326408': lavc: fix decode_frame() third parameter semantics for video decoders Conflicts: libavcodec/cscd.c libavcodec/eamad.c libavcodec/ffv1dec.c libavcodec/gifdec.c libavcodec/h264.c libavcodec/iff.c libavcodec/mjpegdec.c libavcodec/pcx.c libavcodec/vp56.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: fix decode_frame() third parameter semantics for video decodersAnton Khirnov2012-12-041-1/+1
| | | | | | | | It's got_frame, not data size
* | indeo4: more complete check for the scan vs block sizes.Michael Niedermayer2012-11-121-0/+1
| | | | | | | | | | | | | | Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-061-8/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: yuv4mpeg: return proper error codes. Give all anonymously typedeffed structs in headers a name fate: Add parseutils test parseutils-test: Drop random colors from parsing test vf_pad/scale: use double precision for aspect ratios. build: error on variable-length arrays ppc: swscale: rework yuv2planeX_altivec() ppc: fmtconvert: kill VLA in float_to_int16_interleave_altivec() x86: dsputil: kill VLA in gmc_mmx() libspeexenc: Updated commentary to reflect recent changes libspeexenc: Add an option for enabling DTX doc/APIchanges: fill in missing dates and hashes. lavr: bump major to 1 and declare it stable. lavr: change the type of the data buffers to uint8_t**. lavc: deprecate the audio resampling API. Conflicts: cmdutils.h configure doc/APIchanges ffplay.c libavcodec/dwt.h libavcodec/libspeexenc.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavformat/asf.h tests/fate/libavutil.mak tests/ref/fate/parseutils Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Give all anonymously typedeffed structs in headers a nameDiego Biurrun2012-10-061-8/+8
| | | | | | | | Anonymous structs cannot be forward declared and have no benefit.
* | Merge commit 'd05f72c75445969cd7bdb1d860635c9880c67fb6'Michael Niedermayer2012-09-301-12/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd05f72c75445969cd7bdb1d860635c9880c67fb6': dfa: improve boundary checks in decode_dds1() wmalosslessdec: Fix reading too many bits in decode_channel_residues() wmalosslessdec: fix a get_bits(0) in decode_ac_filter wmalosslessdec: make MCLMS arrays big enough for what is written into them. indeo4/5: check empty tile size in decode_mb_info(). ivi_common: make ff_ivi_process_empty_tile() static. indeo5: check tile size in decode_mb_info(). indeo3: fix out of cell write. Conflicts: libavcodec/dfa.c libavcodec/indeo3.c libavcodec/indeo5.c libavcodec/ivi_common.c libavcodec/wmalosslessdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ivi_common: make ff_ivi_process_empty_tile() static.Anton Khirnov2012-09-291-12/+0
| | | | | | | | It's not used outside of ivi_common.c
| * indeo5dec: Make sure we have had a valid gop header.Michael Niedermayer2012-09-291-0/+2
| | | | | | | | | | | | | | | | | | This prevents decoding happening on a half initialized context. Fixes CVE-2012-2779 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-201-9/+64
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: indeo: Make ivi_calc_band_checksum() static, it is only used in one file. indeo: Drop unused debug function ivi_check_band(). avcodec/utils: cast a function argument to shut up a compiler warning truemotion1: remove disabled code fix typo in comment fate: fix dependencies for non-SAMPLES avconv tests indeo: check for invalid motion vectors indeo: check that band output buffer exists indeo: clear allocated band buffers indeo: track tile macroblock size indeo: check custom Huffman tables for errors factor out common decoding code for Indeo 4 and Indeo 5 mp3: fix start band index for block type 2 in 8kHz audio lavf: change some (de)muxer names to lowercase lavf: make output format matching case insensitive Conflicts: libavcodec/indeo4.c libavcodec/indeo5.c libavcodec/ivi_common.c libavcodec/utils.c tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: Make ivi_calc_band_checksum() static, it is only used in one file.Diego Biurrun2012-05-201-5/+0
| |
| * indeo: Drop unused debug function ivi_check_band().Diego Biurrun2012-05-201-5/+0
| |
| * indeo: check for invalid motion vectorsKostya Shishkov2012-05-201-0/+1
| |
| * indeo: track tile macroblock sizeKostya Shishkov2012-05-201-0/+1
| |
| * factor out common decoding code for Indeo 4 and Indeo 5Kostya Shishkov2012-05-201-0/+60
| |
* | indeo4: check transform size.Michael Niedermayer2012-04-151-0/+1
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-311-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: whitespace cosmetics fate: split off video codec FATE tests into their own file fate: split off audio codec FATE tests into their own file fate: split off Electronic Arts codec FATE tests into their own file fate: split off QuickTime codec FATE tests into their own file fate: split off voice codec FATE tests into their own file fate: split off demuxer FATE tests into their own file cosmetics: Drop unnecessary parentheses around return values. fate: drop pointless _audio and _video suffixes from xan tests qt-faststart: K&R reformatting; fix comment typos FATE: Add test for H.264 MP4->annex.B bitstream filter. Conflicts: ffplay.c tests/fate.mak tests/fate/h264.mak tests/fate/image.mak tests/fate/lossless-audio.mak tests/fate/lossless-video.mak tests/fate/qtrle.mak tests/fate/real.mak tests/fate/screen.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Drop unnecessary parentheses around return values.Diego Biurrun2011-12-301-4/+4
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-061-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mov: Don't av_malloc(0). avconv: only allocate 1 AVFrame per input stream avconv: fix memleaks due to not freeing the AVFrame for audio h264-fate: remove -strict 1 except where necessary (mr4/5-tandberg). misc Doxygen markup improvements doxygen: eliminate Qt-style doxygen syntax g722: Add a regression test for muxing/demuxing in wav g722: Change bits per sample to 4 g722dec: Signal skipping the lower bits via AVOptions instead of bits_per_coded_sample api-example: update to use avcodec_decode_audio4() avplay: use avcodec_decode_audio4() avplay: use a separate buffer for playing silence avformat: use avcodec_decode_audio4() in avformat_find_stream_info() avconv: use avcodec_decode_audio4() instead of avcodec_decode_audio3() mov: Allow empty stts atom. doc: document preferred Doxygen syntax and make patcheck detect it Conflicts: avconv.c ffplay.c libavcodec/mlpdec.c libavcodec/version.h libavformat/mov.c tests/codec-regression.sh tests/fate/h264.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxygen: eliminate Qt-style doxygen syntaxDiego Biurrun2011-12-051-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-031-4/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-2/+0
| |
| * Remove pointless #ifdefs around function declarations in a header.Diego Biurrun2011-06-031-2/+0
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-5/+5
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Fix Doxygen @param command attribute syntax.Diego Biurrun2010-07-171-29/+29
| | | | | | 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-20/+20
| | | | Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move transform declarations out of IVIBandDesc so indeo4 can use them as well.Maxim Poliakovski2010-06-111-2/+9
| | | | Originally committed as revision 23577 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Prepare Indeo4 (step 1): upscale indeo5 base tables by 2 and convert those ↵Maxim Poliakovski2010-06-081-2/+2
| | | | | | into uint16_t. Originally committed as revision 23523 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove unused variables.Maxim Poliakovski2010-05-301-2/+0
| | | | Originally committed as revision 23389 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add the forgotten ff_ prefix to the shareable scan patterns.Maxim Poliakovski2010-05-261-3/+3
| | | | Originally committed as revision 23341 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move indeo5 scan patterns into ivi_common.cMaxim Poliakovski2010-05-261-0/+8
| | | | | | so those can be shared by indeo4. Originally committed as revision 23335 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix signedness of q_delta field of the IVIMbInfo.Maxim Poliakovski2010-05-191-1/+1
| | | | | | Patch by Maxim max_pole () gmx * de Originally committed as revision 23170 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
* Encapsulate VLC information needed for decoding blocks and macroblocks inKostya Shishkov2010-02-271-10/+29
| | | | | | | | 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
* Make it clear that ff_ivi_init_static_vlc() does not need argumentsKostya Shishkov2010-02-271-1/+1
| | | | Originally committed as revision 22091 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-2/+7
| | | | | | | | 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 outdated comment.Maxim Poliakovski2010-02-151-1/+0
| | | | | | Patch by Maxim, max_pole gmx de Originally committed as revision 21837 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Indeo Video Interactive 4 and 5 common code and DSP functions.Kostya Shishkov2010-01-301-0/+319
Reviewed and corrected by myself because there were no other volunteers in the last weeks. Originally committed as revision 21531 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud