aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/vp9: fix "initialize" typo.Clément Bœsch2013-11-151-1/+1
| | | | | | | | | | Originally spotted and fixed by one of these developers: Anton Khirnov <anton@khirnov.net> Diego Biurrun <diego@biurrun.de> Luca Barbato <lu_zero@gentoo.org> Martin Storsjö <martin@martin.st> See 97962b2 / 72ca830
* Merge commit '458446acfa1441d283dacf9e6e545beb083b8bb0'Michael Niedermayer2013-11-1520-172/+226
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '458446acfa1441d283dacf9e6e545beb083b8bb0': lavc: Edge emulation with dst/src linesize Conflicts: libavcodec/cavs.c libavcodec/h264.c libavcodec/hevc.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/rv34.c libavcodec/svq3.c libavcodec/vc1dec.c libavcodec/videodsp.h libavcodec/videodsp_template.c libavcodec/vp3.c libavcodec/vp8.c libavcodec/wmv2.c libavcodec/x86/videodsp.asm libavcodec/x86/videodsp_init.c Changes to the asm are not merged, they are left for volunteers or in their absence for later. The changes this merge introduces are reordering of the function arguments See: face578d56c2d1375e40d5e2a28acc122132bc55 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Edge emulation with dst/src linesizeRonald S. Bultje2013-11-1516-614/+621
| | | | | | | | | | | | Allow supporting files for which the image stride is smaller than the maximum block size + number of subpel mc taps, e.g. a 64x64 VP9 file or a 16x16 VP8 file with -fflags +emu_edge.
* | Merge commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4'Michael Niedermayer2013-11-154-91/+118
|\| | | | | | | | | | | | | | | | | | | * commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4': dv: Split DV data table declarations into their own header Conflicts: libavcodec/dvdata.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dv: Split DV data table declarations into their own headerDiego Biurrun2013-11-154-95/+121
| | | | | | | | | | | | This is necessary to avoid target config settings bleeding into the host compilation process with hardcoded tables and the DV VLC tables no longer present as static tables in a header file.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-141-0/+3
|\| | | | | | | | | | | | | * qatar/master: h264: free the tables and uninitialize the context on flush Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: free the tables and uninitialize the context on flushAnton Khirnov2013-11-141-0/+3
| | | | | | | | | | Prevents referencing empty frames when the first packet after the flush does not contain a frame.
| * mpeg12dec: Remove outdated UV swapping code for VCR2Diego Biurrun2013-11-142-19/+0
| |
* | Merge commit '669fe505952f3d8175b1ad6971033a8e8120523b'Michael Niedermayer2013-11-141-1/+4
|\| | | | | | | | | | | | | | | | | | | | | * commit '669fe505952f3d8175b1ad6971033a8e8120523b': twinvq: consume block_align+1 packets as full ones Conflicts: libavcodec/twinvq.c See: 2e7a1fdd6d51aec59931ce7b278b12faa66f98fd Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * twinvq: consume block_align+1 packets as full onesKostya Shishkov2013-11-141-0/+3
| | | | | | | | | | | | They can be produced by VQF. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4'Michael Niedermayer2013-11-145-61/+123
|\| | | | | | | | | | | | | | | | | | | * commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4': twinvq: support multiple frames per packet Conflicts: libavcodec/twinvq.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * twinvq: support multiple frames per packetKostya Shishkov2013-11-145-61/+123
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'ddb839e9286594ff7a862a956402106fca7055c9'Michael Niedermayer2013-11-142-3/+10245
|\| | | | | | | | | | | | | * commit 'ddb839e9286594ff7a862a956402106fca7055c9': metasound: add missing modes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * metasound: add missing modesKostya Shishkov2013-11-142-3/+10245
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '7b9780e7bf9d86e3e4e9606a971bb2d0d718bac2'Michael Niedermayer2013-11-141-1/+0
|\| | | | | | | | | | | | | * commit '7b9780e7bf9d86e3e4e9606a971bb2d0d718bac2': mpeg12dec: Remove unused swap_uv member from Mpeg1Context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12dec: Remove unused swap_uv member from Mpeg1ContextDiego Biurrun2013-11-141-1/+0
| |
* | Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4'Michael Niedermayer2013-11-143-41/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4': Move av_fast_{m,re}alloc from lavc to lavu. Conflicts: libavcodec/avcodec.h libavcodec/utils.c libavutil/mem.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Move av_fast_{m,re}alloc from lavc to lavu.Anton Khirnov2013-11-143-47/+13
| |
* | avcodec/mpegvideo_enc: Fix possibly exploitable security issue with -bfMichael Niedermayer2013-11-141-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'aa241229891173b0357eee04e6ca78f806cc9c0c'Michael Niedermayer2013-11-145-2/+16
|\| | | | | | | | | | | | | | | | | | | * commit 'aa241229891173b0357eee04e6ca78f806cc9c0c': lavc: deprecate FF_MAX_B_FRAMES Conflicts: libavcodec/options_table.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate FF_MAX_B_FRAMESAnton Khirnov2013-11-145-2/+16
| | | | | | | | | | | | We should not arbitrarily decide the maximum B-frame number for all encoders supported by Libav, each encoder should be able to set its own limits.
* | Merge commit 'b6094811f9fca66cdf853420696e96fdc3e4987a'Michael Niedermayer2013-11-143-0/+29
|\| | | | | | | | | | | | | * commit 'b6094811f9fca66cdf853420696e96fdc3e4987a': lavc: move MB_TYPE_* macros from avcodec.h to mpegvideo.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: move MB_TYPE_* macros from avcodec.h to mpegvideo.hAnton Khirnov2013-11-143-0/+29
| | | | | | | | They are mpegvideo-specific and not supposed to be used by callers.
* | Merge commit 'b45c87083de67969c1598cfef41e7c947b137922'Michael Niedermayer2013-11-142-0/+5
|\| | | | | | | | | | | | | * commit 'b45c87083de67969c1598cfef41e7c947b137922': lavc: schedule unused FF_QSCALE_TYPE_* for removal on next bump Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: schedule unused FF_QSCALE_TYPE_* for removal on next bumpAnton Khirnov2013-11-142-0/+5
| |
* | Merge commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65'Michael Niedermayer2013-11-145-7/+25
|\| | | | | | | | | | | | | | | | | | | | | * commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65': lavc: make error_rate a private option of mpegvideo encoders Conflicts: libavcodec/options_table.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make error_rate a private option of mpegvideo encodersAnton Khirnov2013-11-145-7/+25
| |
* | Merge commit '728c4658563dc82115ade0f1679679eddb7be5ff'Michael Niedermayer2013-11-142-1/+17
|\| | | | | | | | | | | | | | | | | | | * commit '728c4658563dc82115ade0f1679679eddb7be5ff': vdpau: add a constructor for AVVDPAUContext. Conflicts: libavcodec/vdpau.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: add a constructor for AVVDPAUContext.Anton Khirnov2013-11-142-0/+16
| | | | | | | | | | We will likely want to add new fields to it in the future, so this is needed to avoid breaking ABI.
* | Merge commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118'Michael Niedermayer2013-11-143-2/+60
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118': vdpau: add a convenience function for getting a decoder profile. Conflicts: doc/APIchanges libavcodec/vdpau.c libavcodec/vdpau.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: add a convenience function for getting a decoder profile.Anton Khirnov2013-11-143-1/+58
| | | | | | | | Based on the code by Rémi Denis-Courmont <remi@remlab.net> from VLC.
* | avcodec/vdpau: try to fix version macro useMichael Niedermayer2013-11-141-7/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: Do not treat the initial frame special in handling of frame gapsMichael Niedermayer2013-11-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | The not handling of frame gaps has lead to the lack of a dummy reference frame, which has lead to the failure of decode_slice_header() which has lead to one SEI recovery message being skiped which had introduced a slightly suboptimal recovery point for at least 1 h264 file compared to JM. Found-by: Carl & BugMaster Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpeg12dec: Remove incomplete and wrong UV swapping code for VCR2Diego Biurrun2013-11-141-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegvideo: Fix swapping of UV planes for VCR2Kostya Shishkov2013-11-141-0/+13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-1413-17/+113
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Deprecate obsolete XvMC hardware decoding support Conflicts: libavcodec/mpeg12.c libavcodec/mpeg12dec.c libavcodec/mpegvideo.c libavcodec/options_table.h libavutil/pixdesc.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Deprecate obsolete XvMC hardware decoding supportDiego Biurrun2013-11-1313-44/+141
| | | | | | | | | | | | | | XvMC has long ago been superseded by newer acceleration APIs, such as VDPAU, and few downstreams still support it. Furthermore XvMC is not implemented within the hwaccel framework, but requires its own specific code in the MPEG-1/2 decoder, which is a maintenance burden.
* | Merge commit 'c7f7bfc9e3a3150ba72bc34366c13fb2210c66ac'Michael Niedermayer2013-11-145-10/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c7f7bfc9e3a3150ba72bc34366c13fb2210c66ac': Remove all Alpha architecture optimizations Conflicts: libavcodec/alpha/asm.h libavcodec/alpha/dsputil_alpha.c libavcodec/alpha/dsputil_alpha.h libavcodec/alpha/dsputil_alpha_asm.S libavcodec/alpha/hpeldsp_alpha.c libavcodec/alpha/hpeldsp_alpha.h libavcodec/alpha/hpeldsp_alpha_asm.S libavcodec/alpha/motion_est_alpha.c libavcodec/alpha/motion_est_mvi_asm.S libavcodec/alpha/mpegvideo_alpha.c libavcodec/alpha/regdef.h libavcodec/alpha/simple_idct_alpha.c We have a qemu based fate alpha client. And various failures on alpha have previously pointed to issues in generic C code. Thus IMHO it makes sense to keep alpha code as long as someone is willing to do the little bit of maintaince it needs Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove all Alpha architecture optimizationsDiego Biurrun2013-11-1324-1966/+8
| | | | | | | | Alpha has been end-of-lifed and no more test machines are available.
* | lavc/elbg: rename ff_ symbols to avpriv_, so they can be used in shared libsStefano Sabatini2013-11-136-19/+19
| | | | | | | | | | In particular, allows the use of elbg in other FFmpeg libraries, required by the pending elbg filter.
* | vorbis: handle special packets in the middle of a streamBen Boeckel2013-11-132-2/+42
| | | | | | | | | | | | | | | | | | | | | | This allows for updating metadata from new metadata packets in the middle of a stream (e.g., MPD streams). There still needs to be a signal that there *is* new metadata, but this is at least gets the data into a data structure. Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vp9: use av_freep() for above_partition_ctxPaul B Mahol2013-11-121-1/+1
| | | | | | | | | | | | Fixes use after free if memory allocation fails. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/mpegvideo_motion: Handle edge emulation even without unrestricted_mvMichael Niedermayer2013-11-121-1/+1
| | | | | | | | | | | | | | Fixes out of array reads Fixes part of: MSVR 440 (the other issues seem to have been fixed already) Found-by: Jeremy Brown (jerbrown) of ReSP Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec/xsubenc.c: set coded_bits_per_sampleErik Olofsson2013-11-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | Explicitly set the number of bits per sample to stop the avi muxer from guessing at 24 bits. The result is that bits per pixel in the avi stream header matches what other XSUB muxers produce, such as AVIAddXSubs.exe Signed-off-by: Erik Olofsson <eaj.olofsson@gmail.com> Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec/xsubenc.c: Fix bounding box coordinatesErik Olofsson2013-11-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix coordinates of the lower right corner of the text area. Note that the coordinates are redundant as the size and position of the text area are known. Many decoders (including Sony Playstation 3, VLC and FFmpeg) ignore the redundant coordinates. Some hardware decoders need them for correct playback. Verified on Philips DVD player models HTS7201 and DVP3380. Fixes ticket #3031 Signed-off-by: Erik Olofsson <eaj.olofsson@gmail.com> Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2013-11-114-138/+284
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cus/stable: libzvbi-teletextdec: propagate errors generated in page handler libzvbi-teletextdec: dont ignore memory allocation error silently libzvbi-teletextdec: output ass subtitles instead of plain text ass: move text_event_to_ass from textdec.c to ass.c and export it ass: fix error handling in ff_ass_add_subrect ass: factor out ff_ass_bprint_dialog libzvbi-teletextdec: use AVBPrint for whitespace cleanup libzvbi-teletextdec: use option constants instead of strings libzvbi-teletextdec: fix indentation after last commit libzvbi-teletextdec: support multiple teletext pages in a single packet Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | libzvbi-teletextdec: propagate errors generated in page handlerMarton Balint2013-11-101-4/+17
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | libzvbi-teletextdec: dont ignore memory allocation error silentlyMarton Balint2013-11-101-1/+4
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | libzvbi-teletextdec: output ass subtitles instead of plain textMarton Balint2013-11-101-8/+44
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ass: move text_event_to_ass from textdec.c to ass.c and export itMarton Balint2013-11-103-42/+54
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 11:20:10 +0000