summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* v4l2: fix regression that caused ffmpeg to occasionally get stuckMichael Niedermayer2013-03-021-0/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavd/v4l2: copy frames into normally allocated packets whenever there is ↵Giorgio Vazzana2013-03-021-23/+64
| | | | | | | | | | | just one buffer left available This will avoid the possibility that we dequeue more buffers than we have obtained from the v4l2 driver. Fixes ticket #1570 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffplay: use AVFrame accessor functionsMichael Niedermayer2013-03-011-6/+6
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/utils: use AVFrame accessor functionsMichael Niedermayer2013-03-011-26/+28
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/rawdec: use AVFrame accessor functionsMichael Niedermayer2013-03-011-2/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* pngdec: use AVFrame accessor functionsMichael Niedermayer2013-03-011-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* gifdec: use AVFrame accessor functionsMichael Niedermayer2013-03-011-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* cpia: use AVFrame accessor functionsMichael Niedermayer2013-03-011-4/+4
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* tiff: use AVFrame accessor functionsMichael Niedermayer2013-03-011-5/+5
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ac3dec: use AVFrame accessor functionsMichael Niedermayer2013-03-011-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffprobe: use AVFrame accessor functionsMichael Niedermayer2013-03-011-4/+4
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* doc/examples/demuxing: use AVFrame accessor functionsMichael Niedermayer2013-03-011-3/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec: add ff_frame_get_metadatap()Michael Niedermayer2013-03-012-0/+4
| | | | | | This is needed for av_dict_* Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavc/codec_desc: add/fix .props for SGI/DPX/X-face/BRender PIX imagePaul B Mahol2013-03-011-2/+4
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* Handle an invalid extra mpeg2 picture header following a frame-encoded picture.Joseph Artsimovich2013-03-011-0/+9
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* sgidec: use unchecked bytestream2 functions where it makes sensePaul B Mahol2013-03-011-7/+7
| | | | | | Overreads can not happen as header size of 512 bytes is required. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* soxr: libsoxr 0.1.1 supportRob Sykes2013-03-011-0/+4
| | | | | | | Libsoxr 0.1.1 will be out very soon; no changes planned beyond what's currently in git. It includes a couple of fixes (not affecting FFmpeg's current usage) and a minor API change (but remains ABI compatible). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* exr: use bytestream functions in pxr24_uncompress()Paul B Mahol2013-03-011-3/+3
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-03-011-3/+3
|\ | | | | | | | | | | | | * qatar/master: lls: Do not return from void functions Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lls: Do not return from void functionsDiego Biurrun2013-03-011-3/+3
| |
* | Merge commit '4da950c0ae224b9b8ef952dadf614be2c050023e'Michael Niedermayer2013-03-012-4/+8
|\ \ | |/ | | | | | | | | | | * commit '4da950c0ae224b9b8ef952dadf614be2c050023e': lls: #ifndef --> #if in FF_API_ version guard Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lls: #ifndef --> #if in FF_API_ version guardDiego Biurrun2013-03-012-4/+8
| |
* | Merge commit 'e8c52271c45ec27d783e74238dcfad0c2008731c'Michael Niedermayer2013-03-012-169/+192
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'e8c52271c45ec27d783e74238dcfad0c2008731c': Revert "Move H264/QPEL specific asm from dsputil.asm to h264_qpel_*.asm." Conflicts: libavcodec/x86/dsputil.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Revert "Move H264/QPEL specific asm from dsputil.asm to h264_qpel_*.asm."Diego Biurrun2013-02-282-169/+191
| | | | | | | | | | | | | | This reverts commit f90ff772e7e35b4923c2de429d1fab9f2569b568. The code should be put back in h264_qpel_8bit.asm, but unfortunately it is unconditionally used from dsputil_mmx.c since 71155d7.
* | Merge commit '399663be9d4a839b894c48a21b62926eb8497d72'Michael Niedermayer2013-03-012-2/+2
|\ \ | |/ | | | | | | | | | | * commit '399663be9d4a839b894c48a21b62926eb8497d72': lls: mark max_order as unsigned short Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lls: mark max_order as unsigned shortLuca Barbato2013-02-282-2/+2
| | | | | | | | | | | | The value is within 0 and 32. Remove an `array subscript is below array bounds` warning.
* | Merge commit '9d4da474f5f40b019cb4cb931c8499deee586174'Michael Niedermayer2013-03-014-13/+42
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '9d4da474f5f40b019cb4cb931c8499deee586174': lls: move to the private namespace Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lls: move to the private namespaceLuca Barbato2013-02-284-13/+42
| | | | | | | | The functions are private.
* | Merge commit '7ac6d2423e9bf0f40c67be9a0ca7600b516b0282'Michael Niedermayer2013-03-011-3/+3
|\ \ | |/ | | | | | | | | | | * commit '7ac6d2423e9bf0f40c67be9a0ca7600b516b0282': lls: K&R formatting cosmetics Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lls: K&R formatting cosmeticsLuca Barbato2013-02-281-3/+3
| |
* | Merge commit 'df0229a7caa124dcfb84c34b48d316744c467311'Michael Niedermayer2013-03-012-0/+4
|\ \ | |/ | | | | | | | | | | * commit 'df0229a7caa124dcfb84c34b48d316744c467311': avconv: Apply codec options to streams that are copied as well Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: Apply codec options to streams that are copied as wellMartin Storsjö2013-02-282-0/+4
| | | | | | | | | | | | | | | | | | | | This allows setting/overriding e.g. the bitrate parameter, which is required for the smoothstreaming muxer. Normally, the bitrate is set by the demuxer in these cases, but not all demuxers can provide it. This allows stream copy of data to the smoothstreaming muxer from such inputs. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'cb6f8245aed2c26fe95c30cd68c45983277a945a'Michael Niedermayer2013-03-011-3/+1
|\ \ | |/ | | | | | | | | | | | | * commit 'cb6f8245aed2c26fe95c30cd68c45983277a945a': cmdutils: Allow calling filter_codec_opts without a set encoder pnm: Use av_pix_fmt_desc_get instead of accessing the array directly Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: Allow calling filter_codec_opts without a set encoderMartin Storsjö2013-02-281-3/+1
| | | | | | | | | | | | | | In this case, no encoder specific options are filtered, only options specific to that codec type in general. Signed-off-by: Martin Storsjö <martin@martin.st>
| * pnm: Use av_pix_fmt_desc_get instead of accessing the array directlyMartin Storsjö2013-02-282-2/+2
| | | | | | | | | | | | | | This fixes boken fate tests with MSVC with DLLs, broken since b5f536d24. Signed-off-by: Martin Storsjö <martin@martin.st>
* | ffmpeg: fix variable name in psnr printing codeMichael Niedermayer2013-03-011-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libvpxenc: dont redundantly zero fields, the whole context is zeroed on initMichael Niedermayer2013-03-011-3/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libvpxenc: add psnr supportPascal Massimino2013-02-281-5/+52
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/lavfi: force probesize to cover at least 30 framesMichael Niedermayer2013-02-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | This ensures that fps and other values are estimated correctly, the probesize also is intended to limit disk/protocol reads which does not apply to lavfi inputs at all. Fixes Ticket1051 Something similar could be usefull to other input devices Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | exr: pxr24 decompressionPaul B Mahol2013-02-281-1/+65
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | exr: fix error message when pixel type is not setPaul B Mahol2013-02-281-1/+1
| | | | | | | | | | | | This only happens with missing chlist attribute from header. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | exr: s/bits_per_color_id/pixel_typePaul B Mahol2013-02-281-18/+17
| | | | | | | | | | | | | | | | | | Previous naming was misleading. Also fix wrong message about missing support for 32-bit unsigned int pixel type. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | exr: track channels propertiesPaul B Mahol2013-02-281-0/+25
| | | | | | | | | | | | | | Needed for proper decoding of channels with subsampling and also for remaining compression methods. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavf/avio: check for : in filenames for protocols.Nicolas George2013-02-281-1/+3
| | | | | | | | | | | | | | | | | | If the first "special" character in a filename is a comma, it can introduce protocol options, but only if there is a colon at the end. Otherwise, it is just a filename with a comma. Fix trac ticket #2303.
* | lavfi/af_aresample: fix info log for unknown layouts.Nicolas George2013-02-281-2/+2
| |
* | lavfi/af_aresample: fix layout consistency check.Nicolas George2013-02-281-1/+1
| | | | | | | | | | If the channel layout is unknown, lswr will internally use the default one for the corresponding number of channels.
* | lavf: rescale duration for chained muxers.Nicolas George2013-02-281-0/+4
| | | | | | | | | | | | | | Fix trac ticket #2300 because the duration of the segments was computed using the timestamp of the last packet plus its duration using the 1/90000 default time base instead of using the chained muxer time base.
* | lavc/exr: use size_t instead of int for sizes.Nicolas George2013-02-281-1/+1
| | | | | | | | Fix a segfault on 64-bits archs.
* | loco: silence warning: decoded may be used uninitialized in this functionMichael Niedermayer2013-02-281-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-289-10/+123
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavf: Add a fate test for the noproxy pattern matching lavf: Handle the environment variable no_proxy more properly Conflicts: libavformat/Makefile libavformat/internal.h libavformat/tls.c libavformat/utils.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud