summaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '040c565e51985477a8fa5e42d2ddfb26ebde6608'Michael Niedermayer2013-02-2411-29/+26
|\ | | | | | | | | | | | | | | | | | | | | * commit '040c565e51985477a8fa5e42d2ddfb26ebde6608': doc: developer: Allow tabs in the vim configuration for Automake files Remove pointless av_cold attributes in header files Conflicts: libavcodec/h264.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove pointless av_cold attributes in header filesDiego Biurrun2013-02-2311-29/+26
| | | | | | | | | | | | The init functions marked as av_cold have to be executed in any case, so there is no gain from trying to mark paths leading to such functions as unlikely.
* | pnm: use av_pix_fmt_desc_get()Michael Niedermayer2013-02-242-2/+2
| | | | | | | | | | | | Using the table directly may cause problems on some platforms like msvc Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b5f536d24b5ae360503935c34d5d59fa5181b94d'Michael Niedermayer2013-02-243-4/+65
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'b5f536d24b5ae360503935c34d5d59fa5181b94d': pnm: add high-bitdepth PGMYUV support for both encoder and decoder Conflicts: libavcodec/pnm.c libavcodec/pnmdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pnm: add high-bitdepth PGMYUV support for both encoder and decoderKostya Shishkov2013-02-233-4/+65
| |
* | Merge commit '2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2'Michael Niedermayer2013-02-242-2/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2': libx264: change i_qfactor to use x264cli's default qtrle: use AV_LOG_ERROR in an error message. Conflicts: libavcodec/libx264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx264: change i_qfactor to use x264cli's defaultJohn Van Sickle2013-02-231-1/+3
| | | | | | | | | | | | | | | | This also allows libx264 to modify its i_qfactor value when using the "-tune" setting. Previously it had a static value of 1.25 Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * qtrle: use AV_LOG_ERROR in an error message.Anton Khirnov2013-02-231-1/+1
| |
* | Merge commit '7b4f91155bd4ef5a8d4e9af65c48b42bfa5b52c6'Michael Niedermayer2013-02-241-6/+6
|\ \ | |/ | | | | | | | | | | * commit '7b4f91155bd4ef5a8d4e9af65c48b42bfa5b52c6': qtrle: cosmetics, reformat CHECK_PIXEL_PTR() macro Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qtrle: cosmetics, reformat CHECK_PIXEL_PTR() macroAnton Khirnov2013-02-231-6/+6
| |
* | Merge commit 'e10659244782b26061e7d52c06437de32a43a7af'Michael Niedermayer2013-02-241-5/+5
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'e10659244782b26061e7d52c06437de32a43a7af': qtrle: add more checks against pixel_ptr being negative. Conflicts: libavcodec/qtrle.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qtrle: add more checks against pixel_ptr being negative.Anton Khirnov2013-02-231-0/+5
| | | | | | | | CC:libav-stable@libav.org
* | Merge commit '4f3b058c84f570e261d743c7c22f865617fd28ac'Michael Niedermayer2013-02-241-0/+5
|\ \ | |/ | | | | | | | | | | | | * commit '4f3b058c84f570e261d743c7c22f865617fd28ac': cavs: initialize various context tables to 0 mlpdec: do not try to allocate a zero-sized output buffer. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cavs: initialize various context tables to 0Anton Khirnov2013-02-231-9/+9
| | | | | | | | | | | | Avoids crashes with corrupted files. CC:libav-stable@libav.org
| * mlpdec: do not try to allocate a zero-sized output buffer.Anton Khirnov2013-02-231-0/+5
| | | | | | | | CC:libav-stable@libav.org
* | Merge commit '56daf10e0313c5e36f43e773f457d2a99ff0df10'Michael Niedermayer2013-02-241-0/+5
|\ \ | |/ | | | | | | | | | | | | * commit '56daf10e0313c5e36f43e773f457d2a99ff0df10': mov: use the format context for logging. flicvideo: avoid an infinite loop in byte run compression Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flicvideo: avoid an infinite loop in byte run compressionAnton Khirnov2013-02-231-0/+5
| | | | | | | | | | | | | | When byte_run is 0, pixel_countdown is not touched and the loop will run forever. CC:libav-stable@libav.org
* | loco: check the last plane tooMichael Niedermayer2013-02-241-1/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '067432c1c95882c7221e694f33d9f3bdbe46de7f'Michael Niedermayer2013-02-242-3/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '067432c1c95882c7221e694f33d9f3bdbe46de7f': loco: check that there is data left after decoding a plane. lagarith: avoid infinite loop in lag_rac_refill() Conflicts: libavcodec/loco.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * loco: check that there is data left after decoding a plane.Anton Khirnov2013-02-231-0/+30
| | | | | | | | CC:libav-stable@libav.org
| * lagarith: avoid infinite loop in lag_rac_refill()Anton Khirnov2013-02-231-0/+3
| | | | | | | | | | | | range == 0 happens with corrupted files CC:libav-stable@libav.org
* | Merge commit 'f935aca44c674d30e3ed940ef73bbad1228a5855'Michael Niedermayer2013-02-241-2/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'f935aca44c674d30e3ed940ef73bbad1228a5855': av_memcpy_backptr: avoid an infinite loop for back = 0 4xm: check the return value of read_huffman_tables(). Conflicts: libavcodec/4xm.c libavutil/mem.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * 4xm: check the return value of read_huffman_tables().Anton Khirnov2013-02-231-0/+4
| | | | | | | | CC:libav-stable@libav.org
| * x86: h264: Don't use redzone in AVX h264_deblock on Win64Matt Wolenetz2013-02-211-0/+8
| | | | | | | | | | | | | | This fixes crashes in chromium on win64 on machines with AVX (crashes that apparently aren't triggered by fate). Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavc: check return values consistency when decoding subtitles.Nicolas George2013-02-241-0/+2
| |
* | h264: Silence warning: comparison of distinct pointer types lacks a castMichael Niedermayer2013-02-231-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | bmp: Fix warning X may be used uninitialized in this functionMichael Niedermayer2013-02-231-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacdec: Fix warning: initialization from incompatible pointer typeMichael Niedermayer2013-02-231-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Improve QTRLE encoding performance, no change to output file size/content.Malcolm Bechard2013-02-221-21/+61
| | | | | | | | | | | | | | Avoid searching for the lowest bulk cost for each pixel that isn't a repeat/skip. Instead store the lowest cost as we go along each pixel, and use it as needed. Signed-off-by: Malcolm Bechard <malcolm.bechard@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | exr: shorter channel buffer namesPaul B Mahol2013-02-221-21/+21
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | exr: remove superfluous checkPaul B Mahol2013-02-221-2/+0
| | | | | | | | | | | | | | get_header_variable_length() already check for out of array read and returns 0 in such case. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | exr: cosmetics: reindentPaul B Mahol2013-02-221-89/+89
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | exr: check if line offset table is complete only once per framePaul B Mahol2013-02-221-2/+5
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | exr: support more line ordersPaul B Mahol2013-02-221-5/+11
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | exr: fix overflow check in lineoffset processingPaul B Mahol2013-02-221-21/+22
| | | | | | | | | | | | | | | | | | | | | | Also read data size for raw compressions too and make sure its value is sane. Remove code that fills missing blocks with zeroes. It is marginally useful and make implementation of actually useful features harder. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | exr: merge multiple if () blocksPaul B Mahol2013-02-221-20/+5
| | | | | | | | | | | | Remove useless comments. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | exr: check version tooPaul B Mahol2013-02-221-3/+9
| | | | | | | | | | | | Separate version from flags. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | aac: reconfigure output on popMichael Niedermayer2013-02-221-0/+6
| | | | | | | | | | | | Fixes Ticket1918 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacdec: dont pop random configurationsMichael Niedermayer2013-02-221-1/+0
| | | | | | | | | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dxva2: move _WIN32_WINNT handling to public headerMichael Niedermayer2013-02-222-8/+7
| | | | | | | | | | | | | | This removes duplicate code Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec/mips/aacsbr_mips: fix ;;Michael Niedermayer2013-02-211-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mips: optimization for float aac decoder (ps module)Mirjana Vulin2013-02-214-1/+464
| | | | | | | | | | Signed-off-by: Mirjana Vulin <mvulin@mips.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mips: optimization for float aac decoder (sbr module)Mirjana Vulin2013-02-2110-9/+2111
| | | | | | | | | | Signed-off-by: Mirjana Vulin <mvulin@mips.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix Win64 AVX h264_deblock by not using redzone on Win64Matt Wolenetz2013-02-211-0/+8
| | | | | | | | | | Thanks-to: "Ronald S. Bultje" <rsbultje@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: ensure that get_format() is called when changing format but not otherwise.Michael Niedermayer2013-02-211-5/+5
| | | | | | | | | | | | | | Fixes Ticket2288 Tested-by: Stefano Pigozzi <stefano.pigozzi@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec_decode_audio4: check got_frame_ptr before handling initial skipMichael Niedermayer2013-02-211-1/+1
| | | | | | | | | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: move next/last picture init to decode_slice_headerMichael Niedermayer2013-02-211-2/+5
| | | | | | | | | | | | | | | | This is a regression introduced from the h264/mpegvideo split Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ec: check that reference pictures have matching parameters before using them.Michael Niedermayer2013-02-211-0/+16
| | | | | | | | | | | | | | Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: check that luma and chroma depth matchMichael Niedermayer2013-02-211-1/+1
| | | | | | | | | | | | | | Fixes out of array access Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | exr: constify s in rle_uncompress()Paul B Mahol2013-02-211-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
OpenPOWER on IntegriCloud