summaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* flac: don't check the number of channels before setting the channel layoutTim Walker2013-02-072-2/+2
| | | | This is unnecessary, as ff_flac_set_channel_layout can handle any number of channels.
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-061-0/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegvideo: initialize dummy reference frames. Conflicts: libavcodec/mpegvideo.c tests/ref/fate/filter-yadif-mode1 The luma init is left at 0x80 as it was previously, and tested and working since a long time. Its also mandated to be 0x80 by at least one specification. Cases that need different values already had code in place to handle them. Merged-by: Michael Niedermayer <[email protected]>
| * mpegvideo: initialize dummy reference frames.Anton Khirnov2013-02-061-0/+13
| | | | | | | | | | | | | | Do not rely on get_buffer initializing them. Changes yadif tests (off by one in one border pixel), because yadif reads from those uninitialized lines.
* | qtrle: fix 1bit row_ptr commentMichael Niedermayer2013-02-061-1/+1
| | | | | | | | | | Found-by: aballier Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'dff6197dfb9b2d145729885c63f865c5fdd184aa'Michael Niedermayer2013-02-062-2/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dff6197dfb9b2d145729885c63f865c5fdd184aa': nuv: do not rely on get_buffer() initializing the frame. yop: initialize palette to 0 Conflicts: libavcodec/nuv.c tests/ref/fate/nuv-rtjpeg-fh tests/ref/fate/yop Merged-by: Michael Niedermayer <[email protected]>
| * nuv: do not rely on get_buffer() initializing the frame.Anton Khirnov2013-02-061-2/+9
| |
| * yop: initialize palette to 0Anton Khirnov2013-02-061-0/+3
| | | | | | | | | | | | | | | | | | | | The FATE sample contains some pixels with value 0, but the palette stored in the file contains only values from 16 up. Because the default and cmdutils get_buffer() initialize the data to 0x80, they appear as gray dots. After this commit they change to black dots, which is probably still incorrect but less visible and doesn't rely on get_buffer() initializing the data.
* | Merge commit '8136f234445862c94d1c081606b2d1e3d44fccf3'Michael Niedermayer2013-02-061-7/+17
|\| | | | | | | | | | | | | * commit '8136f234445862c94d1c081606b2d1e3d44fccf3': yop: check for input overreads. Merged-by: Michael Niedermayer <[email protected]>
| * yop: check for input overreads.Anton Khirnov2013-02-061-2/+17
| | | | | | | | CC:[email protected]
* | Merge commit '06cf597c352519d2b70f293518c61b8c312f5d4f'Michael Niedermayer2013-02-061-2/+2
|\| | | | | | | | | | | | | | | | | | | * commit '06cf597c352519d2b70f293518c61b8c312f5d4f': yop: check that extradata is large enough. Conflicts: libavcodec/yop.c Merged-by: Michael Niedermayer <[email protected]>
| * yop: check that extradata is large enough.Anton Khirnov2013-02-061-0/+5
| | | | | | | | CC:[email protected]
* | Merge commit '89f11f498b9c15bc71494a11a7ec560f4adf630d'Michael Niedermayer2013-02-061-3/+5
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '89f11f498b9c15bc71494a11a7ec560f4adf630d': qtrle: fix the topmost line for 1bit Conflicts: tests/ref/fate/qtrle-1bit See: 1af91978dbab35ba9fdede187577c00d643ae33b Merged-by: Michael Niedermayer <[email protected]>
| * qtrle: fix the topmost line for 1bitKostya Shishkov2013-02-061-1/+4
| | | | | | | | | | Signed-off-by: Anton Khirnov <[email protected]> CC:[email protected]
* | Merge commit '685e6f2e3939f124b41c7801cc541dad8252af3d'Michael Niedermayer2013-02-061-0/+15
|\| | | | | | | | | | | | | * commit '685e6f2e3939f124b41c7801cc541dad8252af3d': xxan: properly handle odd heights. Merged-by: Michael Niedermayer <[email protected]>
| * xxan: properly handle odd heights.Kostya Shishkov2013-02-061-0/+15
| | | | | | | | | | | | | | Duplicate the last one or two chroma lines. Signed-off-by: Anton Khirnov <[email protected]> CC:[email protected]
* | Merge commit '2cd4068071b9a8908823a3107f97e938211045ce'Michael Niedermayer2013-02-061-6/+4
|\| | | | | | | | | | | | | | | | | | | * commit '2cd4068071b9a8908823a3107f97e938211045ce': fraps: fix off-by one bug for version 1. Conflicts: libavcodec/fraps.c Merged-by: Michael Niedermayer <[email protected]>
| * fraps: fix off-by one bug for version 1.Anton Khirnov2013-02-061-1/+1
| | | | | | | | CC:[email protected]
* | Merge commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177'Michael Niedermayer2013-02-061-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177': aasc: fix output for msrle compression. msrledec: check bounds before constructing a possibly invalid pointer, cmdutils: remove ansi from the list of broken codecs. Conflicts: tests/ref/fate/aasc Also See: e7117f1c1058d41eb759d1613e849c29b15c85b5 Merged-by: Michael Niedermayer <[email protected]>
| * aasc: fix output for msrle compression.Anton Khirnov2013-02-061-1/+1
| | | | | | | | | | | | The bottom line was invalid before. CC:[email protected]
| * msrledec: check bounds before constructing a possibly invalid pointer,Anton Khirnov2013-02-061-2/+2
| | | | | | | | CC:[email protected]
* | Merge commit '238614de679a71970c20d7c3fee08a322967ec40'Michael Niedermayer2013-02-064-9/+6
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '238614de679a71970c20d7c3fee08a322967ec40': cdgraphics: do not rely on get_buffer() initializing the frame. svq1: replace struct svq1_frame_size with an array. vf_yadif: silence a warning. Conflicts: libavcodec/svq1dec.c Merged-by: Michael Niedermayer <[email protected]>
| * cdgraphics: do not rely on get_buffer() initializing the frame.Anton Khirnov2013-02-061-0/+2
| | | | | | | | | | Setting it to zero (instead of 128, as the default get_buffer() does) also produces more correctly-looking output.
| * svq1: replace struct svq1_frame_size with an array.Anton Khirnov2013-02-063-9/+4
| | | | | | | | It is used as an array in svq1enc, so this is more correct.
* | Merge commit '48a4ffa722c0874b251de9d201babed52cef0bcb'Michael Niedermayer2013-02-062-29/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '48a4ffa722c0874b251de9d201babed52cef0bcb': asf: K&R formatting cosmetics vc1dec: use codec_id instead of codec_tag for VC1IMAGE sh4: drop unused functions Conflicts: libavformat/asf.c libavformat/asfdec.c libavformat/asfenc.c Merged-by: Michael Niedermayer <[email protected]>
| * vc1dec: use codec_id instead of codec_tag for VC1IMAGEVladimir Pantelic2013-02-061-1/+1
| | | | | | | | | | | | | | the rest of the code is using codec_id everywhere already Signed-off-by: Vladimir Pantelic <[email protected]> Signed-off-by: Kostya Shishkov <[email protected]>
| * sh4: drop unused functionsLuca Barbato2013-02-051-28/+0
| | | | | | | | {avg,put}_pixels4_c are not used.
* | flac: add channel layout masks for streams with 7 or 8 channelsTim Walker2013-02-062-3/+5
| | | | | | | | | | They were added to the latest FLAC specification: https://git.xiph.org/?p=flac-website.git;a=commit;h=65c199a2
* | lavc/bink: Chech for malloc failureJames Almer2013-02-061-2/+9
| | | | | | | | Signed-off-by: James Almer <[email protected]>
* | Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'Michael Niedermayer2013-02-0653-72/+136
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '620289a20e022b9c16c10d546ef86cc0bb77cc84': sh4: Fix silly type vs. variable name search and replace typo configure: Group all hwaccels together in a separate variable Add av_cold attributes to arch-specific init functions Conflicts: configure libavcodec/arm/mpegvideo_armv5te.c libavcodec/x86/mlpdsp.c libavcodec/x86/motion_est.c libavcodec/x86/mpegvideoenc.c libavcodec/x86/videodsp_init.c Merged-by: Michael Niedermayer <[email protected]>
| * sh4: Fix silly type vs. variable name search and replace typoDiego Biurrun2013-02-051-1/+1
| |
| * Add av_cold attributes to arch-specific init functionsDiego Biurrun2013-02-0553-71/+135
| |
* | dsputil: fixup half a dozen bugs with ptrdiff vs int linesizeMichael Niedermayer2013-02-066-10/+12
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '25841dfe806a13de526ae09c11149ab1f83555a8'Michael Niedermayer2013-02-0617-198/+185
|\| | | | | | | | | | | | | | | | | | | | | * commit '25841dfe806a13de526ae09c11149ab1f83555a8': Use ptrdiff_t instead of int for {avg, put}_pixels line_size parameter. Conflicts: libavcodec/alpha/dsputil_alpha.c libavcodec/dsputil_template.c Merged-by: Michael Niedermayer <[email protected]>
| * Use ptrdiff_t instead of int for {avg, put}_pixels line_size parameter.Diego Biurrun2013-02-0517-194/+181
| | | | | | | | | | This avoids SIMD-optimized functions having to sign-extend their line size argument manually to be able to do pointer arithmetic.
* | vdpau: Rename union, avoid name conflict with vdpauMichael Niedermayer2013-02-061-3/+3
| | | | | | | | | | | | | | Fixes Ticket2203 Reviewed-by: Reimar Döffinger <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | movtextenc: fix pointer messup and out of array accessesMichael Niedermayer2013-02-051-2/+6
| | | | | | | | | | | | Fixes Ticket2187 Signed-off-by: Michael Niedermayer <[email protected]>
* | ljpegenc: allocate needed scratch-bufferMichael Niedermayer2013-02-051-0/+7
| | | | | | | | | | | | | | Fixes null pointer dereference Fixes Ticket2207 Signed-off-by: Michael Niedermayer <[email protected]>
* | libmpcodecs/vf_spp: update to latest version from mplayermultiple authors2013-02-051-0/+1
| | | | | | | | | | | | Please see mplayer svn for authorship and individual commits Signed-off-by: Michael Niedermayer <[email protected]>
* | ffv1: check for malloc failureMichael Niedermayer2013-02-051-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | ffv1enc: check for malloc failureMichael Niedermayer2013-02-051-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | flacdec: silence several "warning: X may be used uninitialized in this function"Michael Niedermayer2013-02-041-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | wmavoice: silence may be used uninitialized warningsMichael Niedermayer2013-02-041-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | vc1dec: Fix 2 "warning: may be used uninitialized in this function"Michael Niedermayer2013-02-041-2/+2
| | | | | | | | | | | | Initialize pointers to NULL for safety Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'mjbshaw/master'Michael Niedermayer2013-02-041-0/+29
|\ \ | | | | | | | | | | | | | | | | | | * mjbshaw/master: libopenjpegenc: make dci compliant j2c Merged-by: Michael Niedermayer <[email protected]>
| * | libopenjpegenc: make dci compliant j2cMichaël Cinquin2013-02-031-0/+29
| | | | | | | | | | | | Signed-off-by: Michael Bradshaw <[email protected]>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-041-4/+4
|\ \ \ | |/ / |/| / | |/ | | | | | | * qatar/master: mpegvideo: simplify REBASE_PICTURE Merged-by: Michael Niedermayer <[email protected]>
| * mpegvideo: simplify REBASE_PICTUREAnton Khirnov2013-02-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | Always evaluate to NULL when the source Picture is not located in the MpegEncContext.picture array. That will only happen for next/last_picture_ptr when updating the thread context during h264 frame threaded decoding, where they will point to elements of ref_list. Since ref_list is not copied during updating the context and is invalid until it is constructed for the current slice, there is no point in doing anything complicated with next/last_picture_ptr, as they will get updated when the ref_list is filled.
* | qdm2: disable superblocktype_2_3==0 codeMichael Niedermayer2013-02-031-1/+2
| | | | | | | | | | | | | | | | The code is untested and contained bugs, we need a sample if any files use this branch. Suggested-by: Roberto Togni Signed-off-by: Michael Niedermayer <[email protected]>
* | qdm2: Fix data type used in multiplication.Michael Niedermayer2013-02-031-1/+1
| | | | | | | | | | | | | | Avoid unintended truncation. Fixes CID700555 Signed-off-by: Michael Niedermayer <[email protected]>
* | put_vp_no_rnd_pixels8_l2_mmx: fix typeMichael Niedermayer2013-02-031-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>