summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'ffmpeg-mt/master'Michael Niedermayer2011-05-21
| | | | | | | | | | | | | | | | | | * ffmpeg-mt/master: Update todo. h264: add an assert that copied pictures are valid picture pointers valgrind-check: run with 1 and 3 threads h264: When decoding a packet with multiple PPS/SPS, don't start the next thread until all of them have been read Allow some pictures to be released earlier after 51ead6d2c40c5defdd211f435aec49b19f5f6a18 h264: fix slice threading MC reading uninitialized frame edges. Please see ffmpeg-mt for a list of authors of these changes. Conflicts: libavcodec/h264.c mt-work/valgrind-check.sh Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Add a flag to disable side data merging.Michael Niedermayer2011-05-21
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge/split side data.Michael Niedermayer2011-05-21
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Encoding alac with more than two channels is not supported.Carl Eugen Hoyos2011-05-21
|
* vf_libopencv: prefer opencv/cxcore.h over cxtypes.hStefano Sabatini2011-05-20
| | | | | | | Require the presence of opencv/cxcore.h in place of opencv/cxtypes.h, which has been removed. Fix compilation with libopencv > 2.1.0. Fix trac issue #221.
* decoders.texi: fix typos in rawvideo sectionStefano Sabatini2011-05-20
|
* cmdutils: use const AVClass * when sensefulStefano Sabatini2011-05-20
| | | | | | | | | Fix warnings: cmdutils.c: In function ‘opt_default’: cmdutils.c:304: warning: initialization discards qualifiers from pointer target type cmdutils.c: In function ‘set_context_opts’: cmdutils.c:431: warning: passing argument 2 of ‘alloc_priv_context’ discards qualifiers from pointer target type cmdutils.c:414: note: expected ‘struct AVClass *’ but argument is of type ‘const struct AVClass *’
* encoders.texi: add documentation for the libx264 encoderStefano Sabatini2011-05-20
| | | | | Also remove -x264opts item from the ffmpeg manual, since it belongs to the encoders section.
* decoders.texi: add documentation for rawvideo decoder and optionsStefano Sabatini2011-05-20
|
* doc: add decoders.texi fileStefano Sabatini2011-05-20
|
* encoders.texi: decrease level for audio encoders sectionStefano Sabatini2011-05-20
| | | | | | | | Make Audio Encoders a separate chapter, and decrese the contained sections level by one. Improve rendering, and improve consistency with the other parts of the manual.
* ffprobe.texi: remove inclusion of muxers sectionStefano Sabatini2011-05-20
| | | | Muxers are not used by ffprobe.
* indeo3: release buffer in indeo3_decode_end()Stefano Sabatini2011-05-20
| | | | Fix leak.
* indeo3: remove unnecessary includesStefano Sabatini2011-05-20
|
* indeo3: add @file doxy and a link to multimedia wiki documentationStefano Sabatini2011-05-20
|
* cmdutils: reset *picref_ptr to NULL in get_filtered_frame()Stefano Sabatini2011-05-20
| | | | | Avoid the presence of an invalid pointer, fix a crash in case of get_filtered_frame() failure.
* ffmpeg: remove useless NULL-check on avfilter_unref_bufferStefano Sabatini2011-05-20
| | | | | | The check is no more required since recent changes in the avfilter_unref_buffer(), the check is done in the function. Simplify.
* libmp3lame: include "libavutil/intreadwrite.h" headerStefano Sabatini2011-05-20
| | | | Fix compilation.
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: qdm2: Use floating point synthesis filter. h264: correct border check. h264: fix loopfilter with threading at slice boundaries. Fix ff_mpa_synth_filter_fixed() prototype Rename costablegen.c ---> cos_tablegen.c. Collapse tableprint.c into tableprint.h. Simplify trig table rules Remove potentially unstable filenames from comments in generated files. Ignore generated tables and generated table generator programs. Simplify CLEANFILES make variable by using wildcards. Remove silly insults from avformat_version() Doxygen documentation. mpegaudiodsp: fix x86 and ppc makefiles configure: Adjust AVX assembler check. mpegaudio: remove unused version of SAME_HEADER_MASK mpegaudio: remove useless #undef at end of file asfdec: add missing #include for av_bswap32() mpegaudio: merge two #if CONFIG_FLOAT blocks mpegaudio: move some struct definitions from mpegaudio.h Move some mpegaudio functions to new mpegaudiodsp subsystem Conflicts: libavcodec/h264.c libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qdm2: Use floating point synthesis filter.Vitor Sessak2011-05-19
| | | | | | | | | | | | This avoid needlessly convertion from floating point to fixed point and back. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * h264: correct border check.Ronald S. Bultje2011-05-19
| | | | | | | | | | | | | | | | | | When backing up the top-left border, check that the top-left (rather than left) MB indeed does belong to our slice. If it doesn't, backing up has no positive effect but may accidentally interfere with other threads writing in the same space. Fixes occasional one-off effects when enabling slice-MT.
| * h264: fix loopfilter with threading at slice boundaries.Ronald S. Bultje2011-05-19
| |
| * Fix ff_mpa_synth_filter_fixed() prototypeMans Rullgard2011-05-20
| | | | | | | | | | | | | | The prototype should use the same typedefs as the definition, or it will fail where int32_t is not int (DOS apparently). Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Rename costablegen.c ---> cos_tablegen.c.Diego Biurrun2011-05-19
| | | | | | | | | | | | This is consistent with how all other table generation programs are named. Moreover this ensures that the cos table generation program is correctly deleted when cleaning the tree.
| * Collapse tableprint.c into tableprint.h.Diego Biurrun2011-05-19
| | | | | | | | | | tableprint.c serves little purpose on its own and removing it allows building the table generator programs with the normal HOSTPROGS Makefile rules.
| * Simplify trig table rulesMans Rullgard2011-05-19
| | | | | | | | | | | | | | | | This collapses the make rules for the trig tables into a pattern rule. Based on a patch by Diego, modified to avoid using fragile make constructs and allow future addition of fixed-point sin tables. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Remove potentially unstable filenames from comments in generated files.Diego Biurrun2011-05-19
| |
| * Ignore generated tables and generated table generator programs.Diego Biurrun2011-05-19
| |
| * Simplify CLEANFILES make variable by using wildcards.Diego Biurrun2011-05-19
| | | | | | | | Also ensures that generated file cos_fixed_tables.c is deleted on 'make clean'.
| * Remove silly insults from avformat_version() Doxygen documentation.Diego Biurrun2011-05-19
| |
| * mpegaudiodsp: fix x86 and ppc makefilesMans Rullgard2011-05-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * configure: Adjust AVX assembler check.Diego Biurrun2011-05-19
| | | | | | | | | | | | Older nasm versions have trouble assembling certain AVX instructions, but the current AVX check did not detect this. Update the check to use an instruction that triggers the nasm problem.
| * mpegaudio: remove unused version of SAME_HEADER_MASKMans Rullgard2011-05-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mpegaudio: remove useless #undef at end of fileMans Rullgard2011-05-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * asfdec: add missing #include for av_bswap32()Mans Rullgard2011-05-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mpegaudio: merge two #if CONFIG_FLOAT blocksMans Rullgard2011-05-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mpegaudio: move some struct definitions from mpegaudio.hMans Rullgard2011-05-19
| | | | | | | | | | | | | | These structs are only used in mpegaudiodec.c, so move them there and remove no longer needed #include lines from mpegaudio.h. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Move some mpegaudio functions to new mpegaudiodsp subsystemMans Rullgard2011-05-19
| | | | | | | | | | | | | | | | This separation allows these functions to be used in a cleaner fashion from other codecs (e.g. qdm2) and simplifies creating optimised versions of them. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | ReindentMartin Storsjö2011-05-20
| |
* | rtpenc_chain: Pass the MP4A_LATM flag to chained muxersMartin Storsjö2011-05-20
| |
* | rtpenc: MP4A-LATM payload supportJuan Carlos Rodriguez2011-05-20
| |
* | movenc: Pass AVFormatContext flags to the SDP generationMartin Storsjö2011-05-20
| |
* | sdp: Allow passing AVFormatContext flags to the SDP generationMartin Storsjö2011-05-20
| |
* | vsrc_buffer: document av_vsrc_buffer_add_video_buffer_ref()Stefano Sabatini2011-05-19
| |
* | vsrc_buffer: add av_vsrc_buffer_add_frame()Stefano Sabatini2011-05-19
| | | | | | | | | | | | The new function is a wrapper around av_vsrc_buffer_add_video_buffer_ref(), and allows to simplify the act of pushing AVFrame data to the source buffer.
* | vsrc_buffer: fix example in docs, add mandatory parametersStefano Sabatini2011-05-19
| |
* | vsrc_buffer: make the source accept sws_param in initStefano Sabatini2011-05-19
| | | | | | | | | | Avoid the need of two distinct av_vsrc_add_video_buffer_ref* functions. Simplify the interface.
* | vsrc_buffer: propagate avfilter_open() error codeStefano Sabatini2011-05-19
| |
* | vsrc_buffer: fix styleStefano Sabatini2011-05-19
| |
* | lavfi: add avfilter_get_video_buffer_ref_from_frame to avcodec.hStefano Sabatini2011-05-19
| | | | | | | | Simplify passing AVFrame data to av_vsrc_buffer_add_video_buffer_ref().