summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'a17a7661906ba295d67afd80ac0770422e1b02b3'Hendrik Leppkes2015-10-22
|\ | | | | | | | | | | | | * commit 'a17a7661906ba295d67afd80ac0770422e1b02b3': lavc: Add data and linesize to AVSubtitleRect Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: Add data and linesize to AVSubtitleRectVittorio Giovara2015-10-21
| | | | | | | | | | | | | | | | | | | | | | | | Use the new fields directly instead of the ones from AVPicture. This removes a layer of indirection which serves no pratical purpose whatsoever, and will help in removing AVPicture structure completely later. Every subtitle encoder/decoder seamlessly points to the new arrays, so it is possible to deprecate AVSubtitleRect.pict. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec/nuv: Fix 'libavcodec/nuv.c:83:19: warning: passing argument 3 of ↵Michael Niedermayer2015-10-22
| | | | | | | | | | | | av_image_copy from incompatible pointer type' Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/x86/vc1dsp: Remove unused macroMichael Niedermayer2015-10-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'f890677d05bc4e8b494a73373ab4cc19791bf884'Hendrik Leppkes2015-10-22
|\| | | | | | | | | | | | | * commit 'f890677d05bc4e8b494a73373ab4cc19791bf884': Replace any remaining avpicture function with imgutils Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * Replace any remaining avpicture function with imgutilsVittorio Giovara2015-10-21
| | | | | | | | | | | | avpicture_get_size() -> av_image_get_buffer_size() Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avfilter/vf_zscale: fix typoLou Logan2015-10-22
| | | | | | | | | | | | Fixes #4958 as found by nicol. Signed-off-by: Lou Logan <lou@lrcd.com>
* | Merge commit '13bddab7de10aebf6efb98aa6d7ff0c51bb0e364'Hendrik Leppkes2015-10-22
|\| | | | | | | | | | | | | * commit '13bddab7de10aebf6efb98aa6d7ff0c51bb0e364': nuv: Replace avpicture functions with imgutils Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * nuv: Replace avpicture functions with imgutilsVittorio Giovara2015-10-21
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '48c06386831604921bdaf4fb77ea02766cd615f4'Hendrik Leppkes2015-10-22
|\| | | | | | | | | | | | | * commit '48c06386831604921bdaf4fb77ea02766cd615f4': dpx: Replace avpicture functions with imgutils Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dpx: Replace avpicture functions with imgutilsVittorio Giovara2015-10-21
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | roqvideodec: use av_frame_copyHendrik Leppkes2015-10-22
| |
* | Merge commit 'f0a106578d759de6183eea3c75f8373b6d3153c1'Hendrik Leppkes2015-10-22
|\| | | | | | | | | | | | | * commit 'f0a106578d759de6183eea3c75f8373b6d3153c1': roqvideodec: Replace avpicture functions with imgutils Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * roqvideodec: Replace avpicture functions with imgutilsVittorio Giovara2015-10-21
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'ef3a3519c10620c4206738595bf03fc0bed71802'Hendrik Leppkes2015-10-22
|\| | | | | | | | | | | | | * commit 'ef3a3519c10620c4206738595bf03fc0bed71802': rawdec: Replace avpicture functions with imgutils Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * rawdec: Replace avpicture functions with imgutilsLuca Barbato2015-10-21
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'fcc1280acb6e6f682b34c2101b075b82f83d71ba'Hendrik Leppkes2015-10-22
|\| | | | | | | | | | | | | * commit 'fcc1280acb6e6f682b34c2101b075b82f83d71ba': rawenc: Replace avpicture functions with imgutils Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * rawenc: Replace avpicture functions with imgutilsLuca Barbato2015-10-21
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '3496cec43304ac040d6d05f9d500a6f93cc049e7'Hendrik Leppkes2015-10-22
|\| | | | | | | | | | | | | * commit '3496cec43304ac040d6d05f9d500a6f93cc049e7': msrle: Use AVFrame instead of AVPicture Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * msrle: Use AVFrame instead of AVPictureVittorio Giovara2015-10-21
| | | | | | | | | | | | | | Callers always use a frame and cast it to AVPicture, change ff_msrle_decode() to accept an AVFrame directly instead. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'ac981d16415e7fd99683e10297781c7d9ec1a8cd'Hendrik Leppkes2015-10-22
|\| | | | | | | | | | | | | * commit 'ac981d16415e7fd99683e10297781c7d9ec1a8cd': APIchanges: Fill in missing dates and hashes Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * APIchanges: Fill in missing dates and hashesVittorio Giovara2015-10-19
| |
* | ffmpeg: add abort_on option to allow aborting on empty outputMarton Balint2015-10-22
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffmpeg: fix ffmpeg.h trailing whitespaceMarton Balint2015-10-22
| | | | | | | | | | | | | | How this passed through the commit hook? Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* | qsvdec: fix get_format and hwaccel_context handlingHendrik Leppkes2015-10-22
| | | | | | | | This enables the qsv transcoder to actually get activated
* | Merge commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8'Hendrik Leppkes2015-10-22
|\| | | | | | | | | | | | | * commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8': avconv: add support for Intel QSV-accelerated transcoding Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avconv: add support for Intel QSV-accelerated transcodingAnton Khirnov2015-10-16
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'dc923bc23b3efd949d0bf67ff1abdb95059e5843'Hendrik Leppkes2015-10-22
|\| | | | | | | | | | | | | * commit 'dc923bc23b3efd949d0bf67ff1abdb95059e5843': qsvenc: add an API for allocating opaque surfaces Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvenc: add an API for allocating opaque surfacesAnton Khirnov2015-10-16
| |
* | Merge commit '2ec96b6bd5bf7b22978711bcf2cee702bee89c6f'Hendrik Leppkes2015-10-22
|\| | | | | | | | | | | | | * commit '2ec96b6bd5bf7b22978711bcf2cee702bee89c6f': qsvenc: cosmetics, reindent Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvenc: cosmetics, reindentAnton Khirnov2015-10-16
| |
* | Merge commit 'f6f32fc93d39caf329869c1bff8ad024ccab1d42'Hendrik Leppkes2015-10-22
|\| | | | | | | | | | | | | * commit 'f6f32fc93d39caf329869c1bff8ad024ccab1d42': qsvenc: set the timestamp for PIX_FMT_QSV frames as well Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvenc: set the timestamp for PIX_FMT_QSV frames as wellAnton Khirnov2015-10-16
| |
* | Merge commit '772c87c5a658f36d7c0612f5da583fc2bfa54f79'Hendrik Leppkes2015-10-22
|\| | | | | | | | | | | | | * commit '772c87c5a658f36d7c0612f5da583fc2bfa54f79': qsvenc: support passing arbitrary external buffers to the encoder Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvenc: support passing arbitrary external buffers to the encoderAnton Khirnov2015-10-16
| |
* | avutil/intmath: fix undefined behavior in ff_ctzll_c()Michael Niedermayer2015-10-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavformat/electronicarts: also demux mpeg audio layer 2Peter Ross2015-10-22
| | | | | | | | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> http://wiki.multimedia.cx/index.php?title=Electronic_Arts_SCxl Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavc/x86/vc1dsp_init: Fix compilation with --disable-yasm.Carl Eugen Hoyos2015-10-22
| |
* | lavf/mpjpegdec: Return 0 if an allocation inside the probe function fails.Carl Eugen Hoyos2015-10-22
| |
* | avformat/electronicarts: fix demuxing of certain eam filesPaul B Mahol2015-10-22
| | | | | | | | | | | | Such files have gaps between header chunks. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/electronicarts: support ADPCM PSXPaul B Mahol2015-10-22
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | mmaldec: Add mpeg2 decoding supportJulian Scheel2015-10-22
| | | | | | | | | | | | | | | | | | | | Register mmaldec as mpeg2 decoder. Supporting mpeg2 in mmaldec is just a matter of setting the correct MMAL_ENCODING on the input port. To ease the addition of further supported mmal codecs a macro is introduced to generate the decoder and decoder class structs. Signed-off-by: Julian Scheel <julian@jusst.de> Signed-off-by: wm4 <nfxjfg@googlemail.com>
* | x86/Makefile: move decoder/encoder objects out of the subsystems sectionJames Almer2015-10-22
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | ffmpeg: exit on corrupt packets or decoded frames if exit_on_error flag is ↵Marton Balint2015-10-22
| | | | | | | | | | | | | | present Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffmpeg: factorize checking decoder resultMarton Balint2015-10-22
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffmpeg: exit on av_write_trailer failure if exit_on_error is setMarton Balint2015-10-22
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffmpeg: log failed av_write_trailerMarton Balint2015-10-22
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* | vc1dsp: Port ff_vc1_put_ver_16b_shift2_mmx to yasmTimothy Gu2015-10-21
| | | | | | | | | | | | This function is only used within other inline asm functions, hence the HAVE_MMX_INLINE guard. Per recent discussions, we should not worry about the performance of inline asm-only builds.
* | libavformat/mxfdec.c: Report dark metadata keys only when they match no ↵Alexis Ballier2015-10-22
| | | | | | | | | | | | | | parser at all, not everytime they fail to match one. Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavformat/mxfdec.c: cosmetics: Add missing space after '?' in log message.Alexis Ballier2015-10-22
| | | | | | | | | | Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>