FFmpeg

Commit Graph

Author	SHA1	Message	Date
Michael Niedermayer	45975ab7a1	Merge remote-tracking branch 'qatar/master' * qatar/master: movenc: Indicate that negative timestamps are supported Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	66722b4ba9	Merge commit 'c34a96a5ddfa390ce2a352eca79190766c9056d4' * commit 'c34a96a5ddfa390ce2a352eca79190766c9056d4': dxa: fix decoding of first I-frame by separating I/P-frame decoding Conflicts: libavcodec/dxa.c See: `186e47ef6d` Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	338f8b2eaf	avformat/matroskadec: check out_samplerate before using it in av_rescale() Prevent assertion failure with damaged input Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
James Almer	af248fa117	matroskadec: Improve TTA duration calculation Calculate the duration as accurately as possible to improve decoding of samples where the last frame is smaller than the rest. Example: Take lossless-audio/luckynight-partial.tak from the FATE suit and convert it to TTA muxed into matroska: ffmpeg -i $(SAMPLES)/lossless-audio/luckynight-partial.tak -c:a tta lucky.mka The framemd5 output for lucky.mka without this patch: 0, 0, 0, 46080, 184320, 7c3751ddd571d2903c3cf0ab4b3e3d0a 0, 46080, 46080, 46080, 184320, 6b70c782ba1da3f933fde2daa4f96b73 0, 92160, 92160, 46080, 184320, dcf70d89c54b9a4f0b302d4ec4fb302d 0, 138240, 138240, 46080, 184320, 48713ca38b388d2ea4abf5b86ed1226f 0, 184320, 184320, 46080, 184320, 12188a23648e7ebfb07cd6fe9197b2ea 0, 230400, 230400, 46080, 184320, 49653ab8186a5d4a044ed284671a26e0 0, 276480, 276480, 46080, 184320, 5e82c6a7fe58c7ea612c03a0a2927dd4 0, 322560, 322560, 46080, 184320, 83dc449dbd9eab5f2e8ad2b4403d6a21 0, 368640, 368640, 46080, 184320, bdd6b92c23d30978d4e802d305b0fc49 With this patch: 0, 0, 0, 46080, 184320, 7c3751ddd571d2903c3cf0ab4b3e3d0a 0, 46080, 46080, 46080, 184320, 6b70c782ba1da3f933fde2daa4f96b73 0, 92160, 92160, 46080, 184320, dcf70d89c54b9a4f0b302d4ec4fb302d 0, 138240, 138240, 46080, 184320, 48713ca38b388d2ea4abf5b86ed1226f 0, 184320, 184320, 46080, 184320, 12188a23648e7ebfb07cd6fe9197b2ea 0, 230400, 230400, 46080, 184320, 49653ab8186a5d4a044ed284671a26e0 0, 276480, 276480, 46080, 184320, 5e82c6a7fe58c7ea612c03a0a2927dd4 0, 322560, 322560, 46080, 184320, 83dc449dbd9eab5f2e8ad2b4403d6a21 0, 368640, 368640, 46080, 184320, bdd6b92c23d30978d4e802d305b0fc49 0, 414720, 414720, 4230, 16920, b50b440c5bbcecb8e9fbece643447593 The duration without this patch was calculated as 418950000000, which is bigger than uint32_t and as such stored as 2338172288. With this patch the duration is correctly calculated as 418950. Signed-off-by: James Almer <jamrial@gmail.com> Approved-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Paul B Mahol	02eb15a6c1	wavpackenc: do not copy samples if they are not available Signed-off-by: Paul B Mahol <onemda@gmail.com>	11 years ago
Vignesh Venkatasubramanian	571efd9729	lavf/matroska: Adding the new SeekPreRoll element In order to encapsuate Opus in Matroska, there is a new element that has been added to the Matroska Spec, SeekPreRoll. It has the duration in nanoseconds that has to be decoded before every seek. Spec: http://matroska.org/technical/specs/index.html#SeekPreRoll Proposal for encapsulateing Opus in Matroska: http://wiki.xiph.org/MatroskaOpus Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Martin Storsjö	0a14fefd68	movenc: Indicate that negative timestamps are supported The mov/mp4 muxer has support for handling negative timestamps via edit lists (which customarily is used for handling the 1-frame delay due to B-frames as well). Using the muxer's native way of handling it is better than using the generic offsetting. The generic offsetting is a bit too crude when e.g. the timebase of one track is 1/fps, where the edit lists can handle it accurately. Signed-off-by: Martin Storsjö <martin@martin.st>	11 years ago
Michael Niedermayer	6e4b9b8a2f	avcodec: fix compilation without vdpau Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	a0c6c8e53e	Revert "Merge commit of 'vdpau: remove old-style decoders'" This reverts commit `bf36dc50ea`, reversing changes made to `b7fc2693c7`. Conflicts: libavcodec/h264.c Keeping support for the old VDPAU API has been requested by our VDPAU maintainer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	0a141b0e49	avcodec/dxa: Support printing picture debug info Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Stephen Hutchinson	2c25e83b1d	avisynth: Support video input from AviSynth 2.5 properly. Uses the 2.5 compatibility header included with the variant of FFMS2 that uses AviSynth's C-interface. A copy of this header is now provided in compat/avisynth. avs_get_row_size_p and avs_get_height_p changed between versions 2.5 and 2.6. Since the avisynth_c.h header that avformat uses assumes AviSynth 2.6, it would cause 2.5 to crash if given any kind of real video (the Version() function was known to work, though). AvxSynth was unaffected by this issue because, despite being based on AviSynth 2.5.8 and using 2.5.8's interface version number of 3, it actually uses 2.6's versions of these functions. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Janne Grunau	c34a96a5dd	dxa: fix decoding of first I-frame by separating I/P-frame decoding `5ef7c84` broke decoding for the first keyframe due to an unnecessary check for a reference frame. CC: libav-stable@libav.org	11 years ago
Michael Niedermayer	9640ea1da4	dxa: fix support of decoding all frames even in the absence of references The case where decoding should only happen for keyframes and afterwards (CODEC_FLAG2_SHOW_ALL not set) does not fully work neither before nor after this Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	186e47ef6d	dxa: only fail with an error about reference frames if the reference frame would be used Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	7a342f97c4	Merge remote-tracking branch 'qatar/master' * qatar/master: dxa: Make sure the reference frame exists See: `12eb2fd539` Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	bd71071066	Merge commit 'c59967fa7cc5bc2fa06b36c17d2c207240c06b3e' * commit 'c59967fa7cc5bc2fa06b36c17d2c207240c06b3e': h261: check the mtype index Conflicts: libavcodec/h261dec.c The right half of the check is impossible to be true and thus replaced by an assert() See: `ec3cd74f2d` Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	2c1a215ddb	ffv1: update years in header Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	c8d89be477	ffv1enc: propagate error code from write_extradata() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	eeb3fb9e62	ffv1enc: check for malloc failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Stefano Sabatini	faf7c35655	lavf/tee: add support for bitstream filtering This allows to apply different bitstream filters to different outputs, with no need to transcode.	11 years ago
Michael Niedermayer	29852ffc64	avcodec/dirac_dwt: Remove unused ff_spatial_idwt2() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	cbdf4d6a61	avfilter/vf_mp: remove unused sws related functions Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	247fa6c27c	avfilter: remove ff_copy_int*_list The functions are unused Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	c62801270f	swscale: change ff_dither_8x8_128 dimensions to be consistent with the others Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Luca Barbato	5ef7c84a93	dxa: Make sure the reference frame exists Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org	11 years ago
Luca Barbato	c59967fa7c	h261: check the mtype index Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org	11 years ago
Paul B Mahol	66f1de66b8	lavfi/transpose: call av_frame_copy_props() Signed-off-by: Paul B Mahol <onemda@gmail.com>	11 years ago
Paul B Mahol	e74a5acb40	lavfi/transpose: support slice threading Signed-off-by: Paul B Mahol <onemda@gmail.com>	11 years ago
Paul B Mahol	ef6718a5f7	lavfi/tile: make color of blank/unused area configurable Signed-off-by: Paul B Mahol <onemda@gmail.com>	11 years ago
Michael Niedermayer	d7ed473d5c	Merge remote-tracking branch 'qatar/master' * qatar/master: altivec: perform an explicit unaligned load Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	c02945b6d2	Merge commit '9d86bfc259ae9ba7a76067ec931ff20fbb86ea2a' * commit '9d86bfc259ae9ba7a76067ec931ff20fbb86ea2a': hlsenc: Don't reset the number variable when wrapping Conflicts: libavformat/hlsenc.c See: `75b9fb27f5` Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	50c0837801	Merge commit '09c93b1b957f2049ea5fd8fb0e6f4d82680172f2' * commit '09c93b1b957f2049ea5fd8fb0e6f4d82680172f2': hlsenc: Append the last incomplete segment when closing the output Conflicts: libavformat/hlsenc.c See: `4630dfd1eb` Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	dff205cca3	Merge commit 'c9031c7c1446a1a63eff7c0bf50d1ee559adf3fb' * commit 'c9031c7c1446a1a63eff7c0bf50d1ee559adf3fb': hlsenc: Add a proper dependency on the mpegts muxer Conflicts: libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	83386a1f62	Merge commit '239f55bf3c966782b781338df284f250393b9ed6' * commit '239f55bf3c966782b781338df284f250393b9ed6': vp56data: Move all data tables to the .c file Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	669ea5e102	Merge commit 'cb214707a6cb0d3272ec0261af6f1f5d8b7dabc7' * commit 'cb214707a6cb0d3272ec0261af6f1f5d8b7dabc7': vp56data: Move all shared enum/struct declarations to common header Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	dbcee7cc5c	Merge commit '38f64c03301ac66d7b54b3e4bd2bf6454f9fb2d3' * commit '38f64c03301ac66d7b54b3e4bd2bf6454f9fb2d3': mpeg12decdata.h: Move all tables to the only place they are used Conflicts: libavcodec/mpeg12decdata.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	89f4812cda	Merge commit 'ec6c1b1d832ec3261cc3faf93a18d7b2a84883c6' * commit 'ec6c1b1d832ec3261cc3faf93a18d7b2a84883c6': mpeg12decdata: Remove unused #define Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	b7a025092f	Merge commit 'c591d4575a6f97fbbe6145304b1ea960e8e81e14' * commit 'c591d4575a6f97fbbe6145304b1ea960e8e81e14': avcodec: Replace local extern declarations for tables with header #includes Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	c14fc4585c	Merge commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3' * commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3': swscale: Move extern declarations for tables to swscale_internal.h Conflicts: libswscale/output.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/utils.c libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	1ef0b8f9cc	Merge commit 'd258531502b24cb653204fe4f003c8815755bdc4' * commit 'd258531502b24cb653204fe4f003c8815755bdc4': swscale: Mark a bunch of tables only used within one file static Conflicts: libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	7372177a08	Merge commit '060ce0c697e261ca2792a7df30dfd1bae6900a4f' * commit '060ce0c697e261ca2792a7df30dfd1bae6900a4f': ivi_common: Make some tables only used within the file static Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	e1ec7990fe	Merge commit '4b054a3400f728c54470ee6a1eefe1d82420f6a2' * commit '4b054a3400f728c54470ee6a1eefe1d82420f6a2': rtpproto: Check the right feature detection macro Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	165e42b542	Merge commit '163a729725c6eb0081b0af41a7279f7d19aee86e' * commit '163a729725c6eb0081b0af41a7279f7d19aee86e': electronicarts: Let functions always returning the same value return void Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	4195321a82	Merge commit '4908c8ef2706d98022bf27a5c5bca1fe109e7529' * commit '4908c8ef2706d98022bf27a5c5bca1fe109e7529': electronicarts: Improve some function/variable names Conflicts: libavformat/electronicarts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	6bba695785	Merge commit 'a90cff137b2aca89380b0acad41cd7bb05619ece' * commit 'a90cff137b2aca89380b0acad41cd7bb05619ece': electronicarts: comment wording fixes Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	6a4e55a246	Merge commit '288f2ffb57ae9e9eee2748aca26da3aeb3ca6f6c' * commit '288f2ffb57ae9e9eee2748aca26da3aeb3ca6f6c': electronicarts: Remove bogus function documentation Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	a87cf3689e	Merge commit '8747fce91fca6bb8e9936497f2de05c905cf43b5' * commit '8747fce91fca6bb8e9936497f2de05c905cf43b5': electronicarts: K&R formatting cosmetics Conflicts: libavformat/electronicarts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	15677e7239	Merge commit 'e8c0defe1322f0ff281d9bc5eee91fa1b712b6aa' * commit 'e8c0defe1322f0ff281d9bc5eee91fa1b712b6aa': 8bps: decode 24bit files correctly as rgb32 on bigendian Conflicts: libavcodec/8bps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Kostya Shishkov	f399e406af	altivec: perform an explicit unaligned load Implicit vector loads on POWER7 hardware can use the VSX instruction set instead of classic Altivec/VMX. Let's force a VMX load in this case. Signed-off-by: Martin Storsjö <martin@martin.st>	11 years ago
Michael Niedermayer	ec0e0eb4c1	avfilter/vf_scale+aresample: minor simpification Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago

1 2 3 4 5 ...

55626 Commits (45975ab7a192d7c687e77342de2ddfebb3b2fa4d) All Branches Search

55626 Commits (45975ab7a192d7c687e77342de2ddfebb3b2fa4d)

All Branches