summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-23
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: v410dec: Implement explode mode support zerocodec: fix direct rendering. wav: init st to NULL to avoid a false-positive warning. wavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bit h264: refactor NAL decode loop RTMPTE protocol support RTMPE protocol support rtmp: Add ff_rtmp_calc_digest_pos() rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it global swscale: add missing HAVE_INLINE_ASM check. lavfi: place x86 inline assembly under HAVE_INLINE_ASM. vc1: Add a test for interlaced field pictures swscale: Mark all init functions as av_cold swscale: x86: Drop pointless _mmx suffix from filenames lavf: use conditional notation for default codec in muxer declarations. swscale: place inline assembly bilinear scaler under HAVE_INLINE_ASM. dsputil: ppc: cosmetics: pretty-print dsputil: x86: add SHUFFLE_MASK_W macro configure: respect CC_O setting in check_cc Conflicts: Changelog configure libavcodec/v410dec.c libavcodec/zerocodec.c libavformat/asfenc.c libavformat/version.h libswscale/utils.c libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * v410dec: Implement explode mode supportDerek Buitenhuis2012-07-23
| | | | | | | | | | | | | | Try and decode broken files, but still fail if explode mode is enabled. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * zerocodec: fix direct rendering.Reimar Döffinger2012-07-23
| | | | | | | | | | | | | | | | | | | | | | | | Set picture type before calling get_buffer. This allows the DR application to make better decisions. It also fixes a resource leak in case of missing reference frames since it would call get_buffer but never release_buffer. Also use FFSWAP to ensure that the AVFrame is properly initialized in the next get_buffer (in particular that data[0] is NULL). Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * wav: init st to NULL to avoid a false-positive warning.Clément Bœsch2012-07-23
| | | | | | | | | | | | | | | | | | | | | | | | If st is NULL, it means no 'fmt ' tag is found, but 'data' tag (which needs a previous 'fmt ' tag to be parsed correctly and st initialized) check will make sure st is never dereferenced in that case. Fixes warning: libavformat/wav.c: In function ‘wav_read_header’: libavformat/wav.c:499:44: warning: ‘st’ may be used uninitialized in this function [-Wmaybe-uninitialized] Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * wavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bitHendrik Leppkes2012-07-23
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * h264: refactor NAL decode loopRonald S. Bultje2012-07-23
| | | | | | | | | | | | | | | | | | | | Write out the NAL decoding loops in full so that they are easier to parse for a preprocessor without it having to be aware of macros or other such things in C code. This also makes the code more readable. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * RTMPTE protocol supportSamuel Pitoiset2012-07-23
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * RTMPE protocol supportSamuel Pitoiset2012-07-23
| | | | | | | | | | | | | | | | | | | | This adds two protocols, but one of them is an internal implementation detail just used as an abstraction layer/generalization in the code. The RTMPE protocol implementation uses ffrtmpcrypt:// as an alternative to the tcp:// protocol. This allows moving most of the lower level logic out from the higher level generic rtmp code. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtmp: Add ff_rtmp_calc_digest_pos()Samuel Pitoiset2012-07-23
| | | | | | | | | | | | | | This function is used for calculating digest position for RTMP handshake packets. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it globalSamuel Pitoiset2012-07-23
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * swscale: add missing HAVE_INLINE_ASM check.Ronald S. Bultje2012-07-22
| | | | | | | | The function called in this block is under HAVE_INLINE_ASM itself also.
| * lavfi: place x86 inline assembly under HAVE_INLINE_ASM.Ronald S. Bultje2012-07-22
| | | | | | | | | | This allows compiling this code using compilers that do not understand gcc-style inline assembly.
| * vc1: Add a test for interlaced field picturesMashiat Sarker Shakkhar2012-07-22
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * swscale: Mark all init functions as av_coldDiego Biurrun2012-07-23
| |
| * swscale: x86: Drop pointless _mmx suffix from filenamesDiego Biurrun2012-07-23
| | | | | | | | The files do not contain only MMX code.
| * lavf: use conditional notation for default codec in muxer declarations.Ronald S. Bultje2012-07-22
| | | | | | | | | | This removes the use of macro nesting in these code constructs, which makes it easier to parse in pre-processors.
| * swscale: place inline assembly bilinear scaler under HAVE_INLINE_ASM.Ronald S. Bultje2012-07-22
| |
| * dsputil: ppc: cosmetics: pretty-printJustin Ruggles2012-07-22
| |
| * dsputil: x86: add SHUFFLE_MASK_W macroJason Garrett-Glaser2012-07-22
| | | | | | | | Simplifies pshufb masks that operate on words.
| * configure: respect CC_O setting in check_ccMans Rullgard2012-07-22
| | | | | | | | | | | | | | | | | | | | Use compiler-specific replacements for the -o flag in check_cc. This makes tests work properly with compilers using non-standard flags. The tms470 flags are updated to work with this scheme. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | swr: resampling: add filter type and Kaiser window beta to AVOptionsJustin Ruggles2012-07-23
| |
* | src_movie: implement multiple outputs.Nicolas George2012-07-23
| | | | | | | | | | The audio and video code paths were too different, most of the decoding has been rewritten.
* | buffersrc: use avfilter_get_buffer_ref_from_frame.Nicolas George2012-07-23
| |
* | lavfi: add avfilter_get_buffer_ref_from_frame.Nicolas George2012-07-23
| |
* | tls: user documentationPeter Ross2012-07-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/showwaves: do not set on outlink->out_buf the sent video frameStefano Sabatini2012-07-23
| | | | | | | | | | | | The video frame reference is passed along the filterchain, and is not possessed anymore by the filter. If out_buf is not set to NULL, it will be freed by ff_end_frame() causing a crash.
* | iff: set ham palette alpha to 0xFFPeter Ross2012-07-23
| | | | | | | | | | | | | | This addresses the problem that some HAM pictures were decoded with complete transparency as described in the 'iff: ANIM suppport ' thread on ffmpeg-devel. The decoder was already setting alpha correctly for CMAP palettes, just not HAM palettes.
* | vf_overlay: fix missed returnMichael Niedermayer2012-07-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: change "transmedia" into "multimedia".Nicolas George2012-07-23
| |
* | lavfi: add concat filter.Nicolas George2012-07-23
| |
* | ffmpeg: select input file based on output time.Nicolas George2012-07-23
| | | | | | | | | | | | | | | | | | Filters can change the timings, so input files must not necessarily be read at the same rythm. This patch select the input file to read based on the timestamp at output instead of input. With complex filter graphs, finding the input for a given output is done by making a request and checking to what buffer source it has been forwarded.
* | libschroedingerenc: remove assert related to the old API.Michael Niedermayer2012-07-23
| | | | | | | | | | | | | | The assert is no longer needed as the buffer is allocated after the size is known now. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libvorbisenc: switch to av_assertMichael Niedermayer2012-07-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libschroedingerenc: switch to av_assertMichael Niedermayer2012-07-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | g723.1dec: Make postfilter user switchableMichael Niedermayer2012-07-23
| | | | | | | | | | | | | | Code from qatar (55c3a4f617171ad1138df684cbafa570807bc6a9) Author of the code was probably Mohamed or Kostya Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | g723.1: various cosmetics and changes that should have no user vissible effect.Michael Niedermayer2012-07-23
| | | | | | | | | | | | | | code from qatar (55c3a4f617171ad1138df684cbafa570807bc6a9) Author of the code was probably Mohamed or Kostya Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'dwbuiten/master'Michael Niedermayer2012-07-23
|\ \ | | | | | | | | | | | | | | | | | | * dwbuiten/master: wav: Add check for 'fmt' tag in SMV code Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | wav: Add check for 'fmt' tag in SMV codeDerek Buitenhuis2012-07-22
| | | | | | | | | | | | | | | | | | | | | If there is a 'SMV0' tag, but no 'fmt' tag, it is possible that 'st' got used as NULL. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-22
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: FATE: fix the asyncts test build: Drop gcc-specific warning flag from header compilation rule FATE: add a test for the asyncts audio filter. matroskadec: return more correct error code on read error. buffersrc: check ff_get_audio_buffer() for errors. lavfi: check all ff_get_video_buffer() calls for errors. lavfi: check all avfilter_ref_buffer() calls for errors. vf_select: avoid an unnecessary avfilter_ref_buffer(). buffersrc: avoid creating unnecessary buffer reference lavfi: use avfilter_unref_bufferp() where appropriate. vf_fps: add more error checks. vf_fps: fix a memleak on malloc failure. lavfi: check all ff_start_frame/draw_slice/end_frame calls for errors lavfi: add error handling to end_frame(). lavfi: add error handling to draw_slice(). lavfi: add error handling to start_frame(). Conflicts: Makefile ffplay.c libavfilter/buffersrc.c libavfilter/vf_boxblur.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_frei0r.c libavfilter/vf_hflip.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/video.c libavfilter/vsrc_color.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | FATE: fix the asyncts testAnton Khirnov2012-07-22
| | | | | | | | | | | | Nellymoser is float, so use oneoff comparison instead of md5.
| * | build: Drop gcc-specific warning flag from header compilation ruleDiego Biurrun2012-07-22
| | | | | | | | | | | | | | | | | | The flag was added to avoid excessive warning spam, but nowadays those warnings no longer occur in such large numbers as to require silencing. Besides, gcc-specific flags do not belong in the Makefiles.
| * | FATE: add a test for the asyncts audio filter.Anton Khirnov2012-07-22
| | |
| * | matroskadec: return more correct error code on read error.Anton Khirnov2012-07-22
| | |
| * | buffersrc: check ff_get_audio_buffer() for errors.Anton Khirnov2012-07-22
| | |
| * | lavfi: check all ff_get_video_buffer() calls for errors.Anton Khirnov2012-07-22
| | |
| * | lavfi: check all avfilter_ref_buffer() calls for errors.Anton Khirnov2012-07-22
| | |
| * | vf_select: avoid an unnecessary avfilter_ref_buffer().Anton Khirnov2012-07-22
| | |
| * | buffersrc: avoid creating unnecessary buffer referenceAnton Khirnov2012-07-22
| | |
| * | lavfi: use avfilter_unref_bufferp() where appropriate.Anton Khirnov2012-07-22
| | |
| * | vf_fps: add more error checks.Anton Khirnov2012-07-22
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 11:34:11 +0000