summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * dsputil: x86: Convert h263 loop filter to yasmDaniel Kang2013-02-06
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '12b54a1f39fee22fa0399825ae47a43e60bad4c5'Michael Niedermayer2013-02-07
|\| | | | | | | | | | | | | * commit '12b54a1f39fee22fa0399825ae47a43e60bad4c5': mpegvideo: remove an unused function parameter Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: remove an unused function parameterAnton Khirnov2013-02-06
| |
* | Merge commit '605b047bcc48482dc8a356f56629da259fbddbf1'Michael Niedermayer2013-02-07
|\| | | | | | | | | | | | | * commit '605b047bcc48482dc8a356f56629da259fbddbf1': rv10: improve buffer size check. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rv10: improve buffer size check.Anton Khirnov2013-02-06
| | | | | | | | | | Check slice count and input buffer size before constructing a possibly invalid pointer, not after.
* | error_resilience: assert that unsupported B frame interpolation isnt used ↵Michael Niedermayer2013-02-07
| | | | | | | | | | | | with h264 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c5fcdb440237f06f6c954185ab60970cabf786a2'Michael Niedermayer2013-02-07
|\| | | | | | | | | | | | | | | * commit 'c5fcdb440237f06f6c954185ab60970cabf786a2': error_resilience: remove a useless if() and FIXME h264: remove silly macros Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * error_resilience: remove a useless if() and FIXMEAnton Khirnov2013-02-06
| | | | | | | | pp_time is never set for h264
| * h264: remove silly macrosAnton Khirnov2013-02-06
| | | | | | | | | | They serve no useful purpose and wreak all kind of havoc when h264.h is included elsewhere.
* | Merge commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0'Michael Niedermayer2013-02-07
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0': h263: remove an unused parameter from ff_h263_decode_init_vlc flac: add channel layout masks for streams with 7 or 8 channels. flac: don't check the number of channels before setting the channel layout. Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263: remove an unused parameter from ff_h263_decode_init_vlcAnton Khirnov2013-02-06
| |
| * flac: add channel layout masks for streams with 7 or 8 channels.Tim Walker2013-02-06
| | | | | | | | | | | | | | They were added to the latest FLAC specification: https://git.xiph.org/?p=flac-website.git;a=commit;h=65c199a2 Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * flac: don't check the number of channels before setting the channel layout.Tim Walker2013-02-06
| | | | | | | | | | | | This is unnecessary, as ff_flac_set_channel_layout can handle any number of channels. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc'Michael Niedermayer2013-02-07
|\| | | | | | | | | | | | | | | | | | | | | * commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc': h264chroma: x86: Fix building with yasm disabled rv34: Drop now unnecessary dsputil dependencies Conflicts: libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264chroma: x86: Fix building with yasm disabledMartin Storsjö2013-02-06
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rv34: Drop now unnecessary dsputil dependenciesDiego Biurrun2013-02-06
| |
* | Merge commit '79dad2a932534d1155079f937649e099f9e5cc27'Michael Niedermayer2013-02-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '79dad2a932534d1155079f937649e099f9e5cc27': dsputil: Separate h264chroma Conflicts: libavcodec/dsputil_template.c libavcodec/ppc/dsputil_ppc.c libavcodec/vc1dec.c libavcodec/vc1dsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Separate h264chromaDiego Biurrun2013-02-06
| |
* | lavfi: fix missing space in error message.Nicolas George2013-02-07
| |
* | lavfi: remove disabled code.Nicolas George2013-02-07
| |
* | mov: remove unused functionMichael Niedermayer2013-02-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | flac: don't check the number of channels before setting the channel layoutTim Walker2013-02-07
| | | | | | | | This is unnecessary, as ff_flac_set_channel_layout can handle any number of channels.
* | doc: replace '×' symbol with 'x'Stefano Sabatini2013-02-06
| | | | | | | | | | | | | | | | Non-ascii chars are not correctly rendered in both MAN and HTML output or may even cause compilation failure. Thus avoid to use them until we find a satisfying way to deal with them. Fix trac ticket #2243.
* | lavf/segment: fix DTS inconsistencies with -reset_timestampsStefano Sabatini2013-02-06
| | | | | | | | | | | | | | | | | | | | | | The DTS needs to be resynched against the segment start PTS, or the resulting DTS may result < PTS. Reported-by: Owen Jones <riots6@gmail.com> See thread: Subject: [FFmpeg-user] pts/dts error using reset_timestamps while splitting a DVD Date: Sat, 19 Jan 2013 08:58:27 +0000
* | lavf/mov: skip version and flags attributes in mov_read_chan functionMatthieu Bouron2013-02-06
| | | | | | | | | | | | Fixes ticket #1764. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'rdp/combined2'Michael Niedermayer2013-02-06
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * rdp/combined2: dshow: allow for more codec ID's dshow: better error reporting dshow: fix log message Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | dshow: allow for more codec ID'srogerdpack2013-01-16
| | | | | | | | | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
| * | dshow: better error reportingrogerdpack2013-01-16
| | | | | | | | | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
| * | dshow: fix log messagerogerdpack2013-01-16
| | | | | | | | | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
* | | framecrcenc: print all side data elements, not just the firstMichael Niedermayer2013-02-06
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | framecrcenc: Also print the size of side data elementsMichael Niedermayer2013-02-06
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Fate test to print side_data crc if presentVignesh Venkatasubramanian2013-02-06
| | | | | | | | | | | | | | | | | | | | | | | | Modified the fate test crc generator to print the side_data's crc if side_data is present. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-06
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 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 <michaelni@gmx.at>
| * mpegvideo: initialize dummy reference frames.Anton Khirnov2013-02-06
| | | | | | | | | | | | | | 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-06
| | | | | | | | | | Found-by: aballier Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'dff6197dfb9b2d145729885c63f865c5fdd184aa'Michael Niedermayer2013-02-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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 <michaelni@gmx.at>
| * nuv: do not rely on get_buffer() initializing the frame.Anton Khirnov2013-02-06
| |
| * yop: initialize palette to 0Anton Khirnov2013-02-06
| | | | | | | | | | | | | | | | | | | | 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-06
|\| | | | | | | | | | | | | * commit '8136f234445862c94d1c081606b2d1e3d44fccf3': yop: check for input overreads. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * yop: check for input overreads.Anton Khirnov2013-02-06
| | | | | | | | CC:libav-stable@libav.org
* | Merge commit '06cf597c352519d2b70f293518c61b8c312f5d4f'Michael Niedermayer2013-02-06
|\| | | | | | | | | | | | | | | | | | | * commit '06cf597c352519d2b70f293518c61b8c312f5d4f': yop: check that extradata is large enough. Conflicts: libavcodec/yop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * yop: check that extradata is large enough.Anton Khirnov2013-02-06
| | | | | | | | CC:libav-stable@libav.org
* | Merge commit '89f11f498b9c15bc71494a11a7ec560f4adf630d'Michael Niedermayer2013-02-06
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '89f11f498b9c15bc71494a11a7ec560f4adf630d': qtrle: fix the topmost line for 1bit Conflicts: tests/ref/fate/qtrle-1bit See: 1af91978dbab35ba9fdede187577c00d643ae33b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qtrle: fix the topmost line for 1bitKostya Shishkov2013-02-06
| | | | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net> CC:libav-stable@libav.org
* | Merge commit '685e6f2e3939f124b41c7801cc541dad8252af3d'Michael Niedermayer2013-02-06
|\| | | | | | | | | | | | | * commit '685e6f2e3939f124b41c7801cc541dad8252af3d': xxan: properly handle odd heights. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xxan: properly handle odd heights.Kostya Shishkov2013-02-06
| | | | | | | | | | | | | | Duplicate the last one or two chroma lines. Signed-off-by: Anton Khirnov <anton@khirnov.net> CC:libav-stable@libav.org
* | Merge commit '2cd4068071b9a8908823a3107f97e938211045ce'Michael Niedermayer2013-02-06
|\| | | | | | | | | | | | | | | | | | | * commit '2cd4068071b9a8908823a3107f97e938211045ce': fraps: fix off-by one bug for version 1. Conflicts: libavcodec/fraps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fraps: fix off-by one bug for version 1.Anton Khirnov2013-02-06
| | | | | | | | CC:libav-stable@libav.org
* | Merge commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177'Michael Niedermayer2013-02-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <michaelni@gmx.at>
| * aasc: fix output for msrle compression.Anton Khirnov2013-02-06
| | | | | | | | | | | | The bottom line was invalid before. CC:libav-stable@libav.org