summaryrefslogtreecommitdiffstats
path: root/libavcodec/interplayvideo.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-031-16/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 output functions by av_dlog().Diego Biurrun2011-06-031-16/+8
| |
* | lavc: set defaults in internal codec framesStefano Sabatini2011-05-071-0/+3
| | | | | | | | | | | | | | | | | | 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.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-171-11/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ac3dec: fix processing of delta bit allocation information. vc1: fix fate-vc1 after previous commit. wmv3dec: fix playback of complex WMV3 files using simple_idct. make av_dup_packet() more cautious on allocation failures make containers pass palette change in AVPacket introduce side information for AVPacket Politic commits that have not been pulled: Update regtest checksums after revision 6001dad. Replace more FFmpeg references by Libav. Replace references to ffmpeg-devel with libav-devel; fix roundup URL. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * make containers pass palette change in AVPacketKostya Shishkov2011-04-151-11/+10
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * 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>
* | 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)
* Check for invalid decode op-codes, fixes issue 2522.Daniel Kang2011-01-101-0/+4
| | | | | | Patch by Daniel Kang, daniel.d.kang at gmail Originally committed as revision 26295 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
* 16-bit Interplay video does not need palette controlKostya Shishkov2009-12-271-3/+3
| | | | Originally committed as revision 20936 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add missing opcodes for 16-bit Interplay Video decoding and finally enable itKostya Shishkov2009-12-271-4/+369
| | | | Originally committed as revision 20934 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 16-bit Interplay Video stores motion vector data at the end of frame,Kostya Shishkov2009-12-271-6/+27
| | | | | | | so initialize data pointers for 16-bit variant and read motion vectors as supposed in corresponding opcodes. Originally committed as revision 20933 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 10l trocadero: forgot one case where picture linesize should be usedKostya Shishkov2009-12-271-1/+1
| | | | Originally committed as revision 20932 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: reindent and break long lines after last commitsKostya Shishkov2009-12-271-13/+15
| | | | Originally committed as revision 20931 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add 16-bit image data handling (but not decoding yet) to Interplay VideoKostya Shishkov2009-12-271-4/+13
| | | | Originally committed as revision 20930 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use frame linesize in Interplay Video block copying functionKostya Shishkov2009-12-271-2/+2
| | | | Originally committed as revision 20929 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make CHECK_STREAM_PTR macro in Interplay Video decoder usable withKostya Shishkov2009-12-271-24/+24
| | | | | | | non-default pointers, it will be useful for checking motion values data in 16-bit variant of this codec. Originally committed as revision 20928 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Recognize 16-bit Interplay Video variantKostya Shishkov2009-12-271-1/+7
| | | | Originally committed as revision 20927 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change main loop in Interplay Video decoder, so variables x and y really meanKostya Shishkov2009-12-271-5/+6
| | | | | | coordinates, not offsets. Originally committed as revision 20926 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: reindentKostya Shishkov2009-12-251-8/+8
| | | | Originally committed as revision 20919 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove useless #include <unistd.h> from many filesMåns Rullgård2009-07-221-1/+0
| | | | Originally committed as revision 19499 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Simplify ipvideo_decode_opcodes by using get_bits, this might be slowerReimar Döffinger2009-04-171-8/+5
| | | | | | but is not performance-critical anyway. Originally committed as revision 18593 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove unused code_counts array from interplavideo.c.Reimar Döffinger2009-04-171-2/+0
| | | | Originally committed as revision 18592 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes anThilo Borgmann2009-04-071-1/+3
| | | | | | | | | | | AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows passing of packet-specific flags from demuxer to decoder, such as the keyframe flag, which appears necessary to playback corePNG P-frames. Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread "Google Summer of Code participation" on the mailinglist. Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix ipvideo_decode_block_opcode_0xD again.Reimar Döffinger2009-03-311-7/+8
| | | | Originally committed as revision 18289 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics: remove some pointless {}Reimar Döffinger2009-03-311-13/+6
| | | | Originally committed as revision 18284 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Slightly simplify ipvideo_decode_block_opcode_0xDReimar Döffinger2009-03-311-13/+7
| | | | Originally committed as revision 18283 to svn://svn.ffmpeg.org/ffmpeg/trunk
* One more simplification for ipvideo_decode_block_opcode_0xAReimar Döffinger2009-03-311-49/+22
| | | | Originally committed as revision 18282 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Slightly simplify first part of ipvideo_decode_block_opcode_0xA,Reimar Döffinger2009-03-311-21/+14
| | | | | | hopefully allows for further simplifications in the future. Originally committed as revision 18280 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make ipvideo_decode_block_opcode_0x8 a lot simpler by decoding the pixelsReimar Döffinger2009-03-311-73/+22
| | | | | | in a more natural order. Originally committed as revision 18277 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix a too small CHECK_STREAM_PTR value in interplayvideo.cReimar Döffinger2009-03-311-2/+1
| | | | Originally committed as revision 18276 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Avoid the last two uses of bitmasks in interplayvideoReimar Döffinger2009-03-311-8/+6
| | | | Originally committed as revision 18272 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 100l, fix FATE test broken by r18264Reimar Döffinger2009-03-311-1/+1
| | | | Originally committed as revision 18271 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ReindentReimar Döffinger2009-03-311-33/+33
| | | | Originally committed as revision 18270 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Deduplicate code by moving it outside the if/elseReimar Döffinger2009-03-311-8/+2
| | | | Originally committed as revision 18269 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rearrange how the different cases are checked to reduce the number ofReimar Döffinger2009-03-311-5/+8
| | | | | | comparisons and allow further simplifications. Originally committed as revision 18268 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Avoid "reloading" code by using a 64 bit type for the flags and loading all ↵Reimar Döffinger2009-03-311-10/+6
| | | | | | at once. Originally committed as revision 18266 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove now pointless temporary pix variables.Reimar Döffinger2009-03-311-10/+4
| | | | Originally committed as revision 18265 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Slightly simplify part of ipvideo_decode_block_opcode_0x8Reimar Döffinger2009-03-311-13/+11
| | | | Originally committed as revision 18264 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix indentationReimar Döffinger2009-03-311-4/+4
| | | | Originally committed as revision 18263 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Avoid code duplication by using ?: and array indexing instead of if..elseReimar Döffinger2009-03-311-38/+14
| | | | Originally committed as revision 18262 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Prettify some assignmentsReimar Döffinger2009-03-311-20/+20
| | | | Originally committed as revision 18261 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Get rid of some pointless bitmask/shifter variables in interplayvideo.cReimar Döffinger2009-03-311-32/+21
| | | | Originally committed as revision 18260 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Merge the 3 COPY_FROM_* macros with lots of duplicated code into a singleReimar Döffinger2009-03-291-88/+21
| | | | | | copy_from function. Originally committed as revision 18225 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change CHECK_STREAM_PTR macro to correctly handle the (extremely unlikely)Reimar Döffinger2009-03-291-1/+1
| | | | | | overflow case. Originally committed as revision 18224 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Simplify check for leftover bytes after decoding for interplayvideo.Reimar Döffinger2009-03-291-2/+1
| | | | Originally committed as revision 18223 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Get rid of pointless "B" array in interplayvideo decoder.Reimar Döffinger2009-03-291-4/+1
| | | | Originally committed as revision 18222 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace many tiny loops in the interplayvideo decoder by memset, memcpyReimar Döffinger2009-03-291-39/+30
| | | | | | or initializers. Originally committed as revision 18221 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud