summaryrefslogtreecommitdiff
path: root/libavcodec/ivi_common.c
Commit message (Collapse)AuthorAge
* Merge commit '5ec6d152e26c570c0a16ec72c1f354db95708179'Michael Niedermayer2014-06-27
|\ | | | | | | | | | | | | | | | | | | * commit '5ec6d152e26c570c0a16ec72c1f354db95708179': indeo4: B-frames decoding Conflicts: libavcodec/ivi_common.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo4: B-frames decodingDirk Ausserhaus2014-06-26
| | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
* | Merge commit 'e121ac634ba324a318f4a97f978dcfb48da6b735'Michael Niedermayer2014-06-23
|\| | | | | | | | | | | | | * commit 'e121ac634ba324a318f4a97f978dcfb48da6b735': indeo45: use is_indeo4 context flag instead of checking codec ID Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo45: use is_indeo4 context flag instead of checking codec IDDirk Ausserhaus2014-06-23
| | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * Decode both parts of Indeo4 IP framesDirk Ausserhaus2014-06-01
| | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * Move Indeo4 frametypes into common header.Dirk Ausserhaus2014-06-01
| | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
* | avcodec/indeo4: Decode both parts of IP framesDirk Ausserhaus2014-05-30
| | | | | | | | | | | | | | | | Fixes part of Ticket845 av_frame_move_ref() idea by Anton Khirnov Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/indeo4: Move frametypes into common header.Dirk Ausserhaus2014-05-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ivi_common: Use av_mallocz_array()Michael Niedermayer2014-04-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198'Michael Niedermayer2014-03-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cc8163e1a3601a56f722a4720516e860bf1c6198': avcodec: more correct printf specifiers Conflicts: libavcodec/4xm.c libavcodec/alsdec.c libavcodec/dfa.c libavcodec/h264_ps.c libavcodec/jpeg2000dec.c libavcodec/lagarith.c libavcodec/mpeg12dec.c libavcodec/rv10.c libavcodec/svq3.c libavcodec/wmaprodec.c libavcodec/xwddec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: more correct printf specifiersDiego Biurrun2014-03-22
| |
* | Merge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec'Michael Niedermayer2014-01-26
|\| | | | | | | | | | | | | | | | | | | | | * commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec': avutil: remove timer.h include from internal.h Conflicts: libavcodec/ffv1dec.c libavutil/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil: remove timer.h include from internal.hJanne Grunau2014-01-25
| | | | | | | | Added libavutil/timer.h include to all files with {START,STOP}_TIMER.
* | avcodec/ivi_common: use av_mallocz() to allocate mbs arrayMichael Niedermayer2013-12-26
| | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f1dffa1c016_8245_sasha.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '967cd6fafbf2fdec9cbe011296ad34a70212427e'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '967cd6fafbf2fdec9cbe011296ad34a70212427e': libopenjpegdec: stop using deprecated avcodec_set_dimensions kgv1dec: stop using deprecated avcodec_set_dimensions ivi_common: stop using deprecated avcodec_set_dimensions indeo3: stop using deprecated avcodec_set_dimensions Conflicts: libavcodec/ivi_common.c libavcodec/kgv1dec.c libavcodec/libopenjpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ivi_common: stop using deprecated avcodec_set_dimensionsAnton Khirnov2013-10-31
| |
* | avcodec/ivi_common: make while get_bits loop more robust by checking bits leftMichael Niedermayer2013-10-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a92538b7c0defc86c55fb91f55dfa36aad192673'Michael Niedermayer2013-09-17
|\| | | | | | | | | | | | | * commit 'a92538b7c0defc86c55fb91f55dfa36aad192673': ivi_common: Make sure color planes have been initialized Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ivi_common: Make sure color planes have been initializedMartin Storsjö2013-09-17
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '060ce0c697e261ca2792a7df30dfd1bae6900a4f'Michael Niedermayer2013-08-16
|\| | | | | | | | | | | | | * commit '060ce0c697e261ca2792a7df30dfd1bae6900a4f': ivi_common: Make some tables only used within the file static Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ivi_common: Make some tables only used within the file staticDiego Biurrun2013-08-15
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-15
|\| | | | | | | | | | | | | | | | | | | * qatar/master: indeo: Reject impossible FRAMETYPE_NULL Conflicts: libavcodec/ivi_common.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: Reject impossible FRAMETYPE_NULLLuca Barbato2013-07-15
| | | | | | | | | | | | | | | | A frame marked FRAMETYPE_NULL cannot be scalable and requires a previous frame successfully decoded. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit 'f9e5261cab067be7278f73d515bc9b601eb56202'Michael Niedermayer2013-07-15
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f9e5261cab067be7278f73d515bc9b601eb56202': indeo: Do not reference mismatched tiles Conflicts: libavcodec/ivi_common.c See: dab70c62d20081bcf879b7b6bc3ffabc2e331542 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: Do not reference mismatched tilesLuca Barbato2013-07-15
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '28dda8a691f1c723a4a9365ab85f9625f1330096'Michael Niedermayer2013-07-15
|\| | | | | | | | | | | | | * commit '28dda8a691f1c723a4a9365ab85f9625f1330096': indeo: Sanitize ff_ivi_init_planes fail paths Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: Sanitize ff_ivi_init_planes fail pathsLuca Barbato2013-07-15
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '25a6666f6c07c6ac8449a63d7fbce0dfd29c54cd'Michael Niedermayer2013-07-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '25a6666f6c07c6ac8449a63d7fbce0dfd29c54cd': indeo: Bound-check before applying motion compensation The added checks and one previously added check are replaced by asserts, the conditions can only be true when vectors are invalid or there are worse inconsistencies. We are checking the vectors validity and there should be no inconsistencies, thus the checks should not be needed. Also no files are known to cause any anomalies in ffmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: Bound-check before applying motion compensationLuca Barbato2013-07-15
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: indeo: Bound-check before applying transform Conflicts: libavcodec/indeo4.c libavcodec/indeo5.c libavcodec/ivi_common.c See: af388237093ed6df6f5118b34ef938a2ca2ffbda, 0846719dd11ab3f7a7caee13e7af71f71d913389 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: Bound-check before applying transformLuca Barbato2013-07-13
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '6a10142faa1cca8ba2bfe51b970754f62d60f320'Michael Niedermayer2013-07-05
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '6a10142faa1cca8ba2bfe51b970754f62d60f320': indeo: reject negative array indexes Conflicts: libavcodec/ivi_common.c See: 93927eb334dce961603645dd4ed9772bb2400cc4, a93c7ca6ef625188c9ec088c2e75f731b78c9923 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: reject negative array indexesLuca Barbato2013-07-04
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '6dfacd7ab126aea1392949d1aa10fdc3d3eeb911'Michael Niedermayer2013-07-05
|\| | | | | | | | | | | | | * commit '6dfacd7ab126aea1392949d1aa10fdc3d3eeb911': indeo: Cosmetic formatting Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: Cosmetic formattingLuca Barbato2013-07-04
| | | | | | | | Trim some overly long lines.
* | Merge commit '62256010e9bc8879e2bf7f3b94af8ff85e239082'Michael Niedermayer2013-07-05
|\| | | | | | | | | | | | | | | | | | | * commit '62256010e9bc8879e2bf7f3b94af8ff85e239082': indeo: Refactor ff_ivi_init_tiles and ivi_decode_blocks Conflicts: libavcodec/ivi_common.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: Refactor ff_ivi_init_tiles and ivi_decode_blocksLuca Barbato2013-07-04
| | | | | | | | | | Spin large and mostly self contained blocks into stand alone functions.
* | Merge commit 'f6f36ca8ca1b2526d3abff7d7c627322d3bce912'Michael Niedermayer2013-07-05
|\| | | | | | | | | | | | | | | | | | | * commit 'f6f36ca8ca1b2526d3abff7d7c627322d3bce912': indeo: Refactor ff_ivi_dec_huff_desc Conflicts: libavcodec/ivi_common.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: Refactor ff_ivi_dec_huff_descLuca Barbato2013-07-04
| | | | | | | | Spare an indentation level.
* | Merge commit 'e6d8acf6a8fba4743eb56eabe72a741d1bbee3cb'Michael Niedermayer2013-07-05
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'e6d8acf6a8fba4743eb56eabe72a741d1bbee3cb': indeo: use a typedef for the mc function pointer cabac: x86 version of get_cabac_bypass aic: use chroma scan tables while decoding luma component in progressive mode Conflicts: libavcodec/aic.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: use a typedef for the mc function pointerLuca Barbato2013-07-04
| |
| * indeo: check for reference when inheriting mvsLuca Barbato2013-07-01
| | | | | | | | | | | | | | The same is done already for qdelta. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit 'dd3754a48854cd570d38db72394491aab0f36570'Michael Niedermayer2013-07-01
|\| | | | | | | | | | | | | * commit 'dd3754a48854cd570d38db72394491aab0f36570': indeo: use proper error code Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: use proper error codeLuca Barbato2013-07-01
| |
* | Merge commit '7388c0c58601477db076e2e74e8b11f8a644384a'Michael Niedermayer2013-07-01
|\| | | | | | | | | | | | | * commit '7388c0c58601477db076e2e74e8b11f8a644384a': indeo: Properly forward the error codes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo: Properly forward the error codesLuca Barbato2013-07-01
| | | | | | | | | | | | | | | | If the tile data size does not match the buffer size it did not return an AVERROR_INVALIDDATA causing futher corruption later. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-06-01
|\| | | | | | | | | | | | | | | * qatar/master: indeo4: expand allowed quantiser range configure: icl: Merge -Qdiag-error parameters Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo4: expand allowed quantiser rangeKostya Shishkov2013-06-01
| | | | | | | | | | | | | | | | Indeo 4 has quantiser range 0-31 instead of 0-23 for Indeo 5, and clipping quantiser leads to incorrect quantisation and DC prediction on low-quality videos. This fixes bug 259.
* | Merge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487'Michael Niedermayer2013-05-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487': avcodec: Add av_cold attributes to init functions missing them Conflicts: libavcodec/aacpsy.c libavcodec/atrac3.c libavcodec/dvdsubdec.c libavcodec/ffv1.c libavcodec/ffv1enc.c libavcodec/h261enc.c libavcodec/h264_parser.c libavcodec/h264dsp.c libavcodec/h264pred.c libavcodec/libschroedingerenc.c libavcodec/libxvid_rc.c libavcodec/mpeg12.c libavcodec/mpeg12enc.c libavcodec/proresdsp.c libavcodec/rangecoder.c libavcodec/videodsp.c libavcodec/x86/proresdsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: Add av_cold attributes to init functions missing themDiego Biurrun2013-05-04
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-25 08:55:35 +0000