aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-245-91/+80
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: wnv1: cosmetics, reformat xan: remove a trivially true if(). ansi: do not depend on get_buffer() initializing the frame. zerocodec: remove an unused variable. zmbv: remove some pointless comments and empty lines Conflicts: libavcodec/xan.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wnv1: cosmetics, reformatAnton Khirnov2012-12-241-20/+22
| |
| * xan: remove a trivially true if().Anton Khirnov2012-12-241-50/+49
| | | | | | | | | | This function used to be shared with the xxan decoder, but that is not true anymore.
| * ansi: do not depend on get_buffer() initializing the frame.Anton Khirnov2012-12-241-0/+5
| | | | | | | | | | The background changes from 128 (used by the default/cmdutils get_buffer()) to 0. This looks more correct.
| * zerocodec: remove an unused variable.Anton Khirnov2012-12-241-4/+0
| |
| * zmbv: remove some pointless comments and empty linesAnton Khirnov2012-12-241-14/+0
| |
* | Merge commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b'Michael Niedermayer2012-12-243-91/+82
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b': yop: simplify/sanitize the decoding loop c93: set palette_has_changed. bmp: cosmetics, reformat hlsenc: Don't duplicate a string constant Conflicts: libavcodec/bmp.c tests/ref/fate/yop Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * yop: simplify/sanitize the decoding loopAnton Khirnov2012-12-241-33/+19
| | | | | | | | | | | | | | Do not overwrite linesize set by get_buffer(). The last frame in the FATE test is not decoded anymore, since the file is cut and a part of it is missing.
| * c93: set palette_has_changed.Anton Khirnov2012-12-241-0/+1
| |
| * bmp: cosmetics, reformatAnton Khirnov2012-12-241-64/+68
| |
* | Merge commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00'Michael Niedermayer2012-12-241-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00': hlsenc: Allocate enough space for the pattern string lavc: Correct the description of pkt_dts avfilter: Compile FIFO filters unconditionally Conflicts: libavcodec/avcodec.h libavfilter/Makefile libavfilter/allfilters.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Correct the description of pkt_dtsMartin Storsjö2012-12-231-1/+1
| | | | | | | | | | | | | | | | | | | | The description as updated in 6e5c44b0f made it sound like it is handled exactly like the pts, which it is not. Clarify that it is the packet that triggered returning the frame instead of just the last avpacket (in case of frame threading, it won't be the dts of the last packet). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a'Michael Niedermayer2012-12-249-11/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a': Return proper error code after av_log_ask_for_sample() configure: cosmetics: Separate hwaccel dependencies from decoders/encoders oggdec: check memory allocation Conflicts: configure libavcodec/pictordec.c libavformat/anm.c libavformat/oggdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Return proper error code after av_log_ask_for_sample()Diego Biurrun2012-12-239-11/+11
| |
* | tiffdec: Fix runend handlingMichael Niedermayer2012-12-241-3/+7
| | | | | | | | | | | | Fixes Ticket1999 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/pthread: do not re-define _GNU_SOURCE if already defined.Clément Bœsch2012-12-241-1/+3
| | | | | | | | | | | | | | | | | | | | This fixes the following warning with GCC: libavcodec/pthread.c:35:0: warning: _GNU_SOURCE redefined [enabled by default] <command-line>::0: note: this is the location of the previous definition The reason of the presence of this flag is: % pkg-config --cflags sdl -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL
* | alsdec: improve warning message when invalid channel position is foundPaul B Mahol2012-12-231-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | x86/ac3dsp_init: try to workaround ICC failure.Michael Niedermayer2012-12-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | The asm code is not valid for older compilers as it uses too many operands, ICC on x86_32 seems affected by this. This patch disables the affected code for ICC on x86_32 and should make it compileable again. A better fix would be to use fewer operands or to change this code to yasm, later is being worked on AFAIK so this is a temporary solution. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-234-144/+144
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: 8bps: cosmetics aasc: cosmetics, reformat ansi: remove an extra return asvdec: cosmetics, reformat aura: cosmetics, reformat Conflicts: libavcodec/aasc.c libavcodec/asvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * 8bps: cosmeticsAnton Khirnov2012-12-231-25/+0
| | | | | | | | Remove some pointless comments and empty lines.
| * aasc: cosmetics, reformatAnton Khirnov2012-12-231-7/+7
| |
| * ansi: remove an extra returnAnton Khirnov2012-12-231-1/+0
| |
| * asvdec: cosmetics, reformatAnton Khirnov2012-12-231-102/+128
| |
| * aura: cosmetics, reformatAnton Khirnov2012-12-231-11/+10
| |
* | Merge commit 'b047c68783aa4042b322af7af043b643d5daf09c'Michael Niedermayer2012-12-237-1509/+1607
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b047c68783aa4042b322af7af043b643d5daf09c': 4xm: don't rely on get_buffer() initializing the frame. huffyuv: split encoder and decoder into separate files. lavc: make pkt_{p,d}ts doxy less confusing Conflicts: libavcodec/Makefile libavcodec/huffyuv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * 4xm: don't rely on get_buffer() initializing the frame.Anton Khirnov2012-12-231-0/+1
| |
| * huffyuv: split encoder and decoder into separate files.Anton Khirnov2012-12-235-1424/+1525
| |
| * lavc: make pkt_{p,d}ts doxy less confusingAnton Khirnov2012-12-231-2/+2
| |
* | Merge commit '418693bdc5edad72b0d055f741931612d797eb05'Michael Niedermayer2012-12-233-26/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '418693bdc5edad72b0d055f741931612d797eb05': lavc: rewrite and extend AVFrame doxy opt: avoid segfault in av_opt_next() if the class does not have an option list ttadec: fix last frame handling when seeking alacdec: do not be too strict about the extradata size Conflicts: libavcodec/alac.c libavcodec/avcodec.h libavcodec/tta.c libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: rewrite and extend AVFrame doxyAnton Khirnov2012-12-231-5/+13
| |
| * ttadec: fix last frame handling when seekingJustin Ruggles2012-12-221-13/+17
| | | | | | | | | | | | | | | | | | Using a frame count, as is done currently, does not work at all with seeking. Instead, when the number of samples in the final frame has been decoded, we check if only the 32-bit CRC is remaining. If so, we assume that it is the final frame. There is no longer a need to keep total_frames in TTAContext.
| * alacdec: do not be too strict about the extradata sizeJustin Ruggles2012-12-221-4/+3
| | | | | | | | | | | | | | Sometimes the extradata has duplicate atoms, but that shouldn't prevent decoding. Just ensure that it is at least 36 bytes as a sanity check. CC: libav-stable@libav.org
* | mpegvideo_enc: fix edge emulation of dimension%16 != 0 for YUV != 420Michael Niedermayer2012-12-231-6/+8
| | | | | | | | | | | | Fixes Ticket2041 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: consider using /usr/include/openjpeg-1.5 when searching for openjpegJohannes Nixdorf2012-12-222-2/+12
| | | | | | | | | | | | | | | | Beginning with version 1.5.1 openjpeg defaults to install its headers to /usr/include/openjpeg-${major}.${minor} instead of /usr/include without providing a compatibility symlink making the old test fail. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: Detect POC inconsistencies and try to handle them reasonablyMichael Niedermayer2012-12-221-1/+7
| | | | | | | | | | | | Improves the file from Ticket2050 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-222-3/+7
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: flac: only set channel layout if not previously set or on channel count change prepare 9_beta3 release Conflicts: RELEASE Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flac: only set channel layout if not previously set or on channel count changeJustin Ruggles2012-12-222-3/+7
| | | | | | | | Fixes Bug 402
* | 4xm: check the correct stream, fix fateMichael Niedermayer2012-12-221-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/4xm: use bytestream2_get_bytes_leftPaul B Mahol2012-12-221-13/+13
| | | | | | | | | | | | | | Also replace relevant bytestream2 functions with unchecked variants due code that already checks for overreads. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | videodsp: Fix project nameMichael Niedermayer2012-12-2210-40/+40
| | | | | | | | | | | | These are all part of splited out dsp utils from FFmpeg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/videodsp_init: Add back lost author attributionMichael Niedermayer2012-12-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code originates from: 910b9f30 libavcodec/dsputil.c (David Conrad 2010-05-27 04:39:27 +0000 334) void ff_emulated_edge_mc(uint8_t *buf, const uint8_t *src, int linesize, int block_w, int block_h, 93a21abd libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 335) int src_x, int src_y, int w, int h){ 93a21abd libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 336) int x, y; 93a21abd libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 337) int start_y, start_x, end_y, end_x; b5a093b3 libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-25 20:22:36 +0000 338) 93a21abd libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 339) if(src_y>= h){ 93a21abd libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 340) src+= (h-1-src_y)*linesize; 93a21abd libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 341) src_y=h-1; 225f9c44 libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-15 00:25:53 +0000 342) }else if(src_y<=-block_h){ 225f9c44 libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-15 00:25:53 +0000 343) src+= (1-block_h-src_y)*linesize; 225f9c44 libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-15 00:25:53 +0000 344) src_y=1-block_h; 93a21abd libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 345) } 93a21abd libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 346) if(src_x>= w){ 93a21abd libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 347) src+= (w-1-src_x); 93a21abd libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 348) src_x=w-1; 225f9c44 libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-15 00:25:53 +0000 349) }else if(src_x<=-block_w){ 225f9c44 libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-15 00:25:53 +0000 350) src+= (1-block_w-src_x); 225f9c44 libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-15 00:25:53 +0000 351) src_x=1-block_w; 93a21abd libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 352) } 93a21abd libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 353) b8a78f41 libavcodec/mpegvideo.c (Michael Niedermayer 2002-11-10 11:46:59 +0000 354) start_y= FFMAX(0, -src_y); b8a78f41 libavcodec/mpegvideo.c (Michael Niedermayer 2002-11-10 11:46:59 +0000 355) start_x= FFMAX(0, -src_x); b8a78f41 libavcodec/mpegvideo.c (Michael Niedermayer 2002-11-10 11:46:59 +0000 356) end_y= FFMIN(block_h, h-src_y); b8a78f41 libavcodec/mpegvideo.c (Michael Niedermayer 2002-11-10 11:46:59 +0000 357) end_x= FFMIN(block_w, w-src_x); Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | videodsp_template.c: fix yearMichael Niedermayer2012-12-221-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: Warn in case the set bitrate is very lowMichael Niedermayer2012-12-211-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "Always write all colours for animated gif files, including ↵Carl Eugen Hoyos2012-12-211-3/+2
| | | | | | | | | | | | | | | | transparent ones." It breaks some opaque samples. This reverts commit d4fdaafdb76a927be6fea15013807641bbcc6bd9.
* | Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'Michael Niedermayer2012-12-2121-23/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '511cf612ac979f536fd65e14603a87ca5ad435f3': miscellaneous typo fixes Conflicts: libavcodec/4xm.c libavcodec/lagarith.c libavcodec/parser.c libavcodec/ratecontrol.c libavcodec/shorten.c libavcodec/vda_h264.c libavformat/dvenc.c libavformat/wtv.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * miscellaneous typo fixesDiego Biurrun2012-12-2128-33/+34
| |
* | Merge commit '6906b19346ae8a330bfaa1c16ce535be10789723'Michael Niedermayer2012-12-2140-939/+1271
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6906b19346ae8a330bfaa1c16ce535be10789723': lavc: add missing files for arm lavc: introduce VideoDSPContext Conflicts: configure libavcodec/arm/dsputil_init_armv5te.c libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/dsputil_template.c libavcodec/h264.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add missing files for armLuca Barbato2012-12-202-0/+59
| | | | | | | | Across the many retouches those did not make the main commit.
| * lavc: introduce VideoDSPContextRonald S. Bultje2012-12-2036-923/+1183
| | | | | | | | | | | | | | | | Move some functions from dsputil. The idea is that videodsp contains functions that are useful for a large and varied set of video decoders. Currently, it contains emulated_edge_mc() and prefetch(). Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | alsdec: cosmetics after previous commitPaul B Mahol2012-12-211-8/+8
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>