summaryrefslogtreecommitdiff
path: root/libavcodec/ivi_common.h
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-31
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-30
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-05
| |
* | 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>
| * Replace custom DEBUG preprocessor trickery by the standard one.Diego Biurrun2011-06-03
| |
| * Remove pointless #ifdefs around function declarations in a header.Diego Biurrun2011-06-03
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Fix Doxygen @param command attribute syntax.Diego Biurrun2010-07-17
| | | | | | 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-30
| | | | 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-11
| | | | 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-08
| | | | | | into uint16_t. Originally committed as revision 23523 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove unused variables.Maxim Poliakovski2010-05-30
| | | | 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-26
| | | | Originally committed as revision 23341 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move indeo5 scan patterns into ivi_common.cMaxim Poliakovski2010-05-26
| | | | | | 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-19
| | | | | | 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-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
* Encapsulate VLC information needed for decoding blocks and macroblocks inKostya Shishkov2010-02-27
| | | | | | | | 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-27
| | | | 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-22
| | | | | | | | 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-15
| | | | | | 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-30
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
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 01:08:22 +0000