Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-10-07Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: wmaenc: use float planar sample format (e)ac3enc: use planar sample format aacenc: use planar sample format adpcmenc: use planar sample format for adpcm_ima_wav and adpcm_ima_qt adpcmenc: move 'ch' variable to higher scope adpcmenc: fix 3 instances of variable shadowing adpcm_ima_wav: simplify encoding libvorbis: use planar sample format libmp3lame: use planar sample formats vorbisenc: use float planar sample format ffm: do not write or read the audio sample format parseutils: fix parsing of invalid alpha values doc/RELEASE_NOTES: update for the 9 release. smoothstreamingenc: Add a more verbose error message smoothstreamingenc: Ignore the return value from mkdir smoothstreamingenc: Try writing a manifest when opening the muxer smoothstreamingenc: Move the output_chunk_list and write_manifest functions up smoothstreamingenc: Properly return errors from ism_flush to the caller smoothstreamingenc: Check the output UrlContext before accessing it Conflicts: doc/RELEASE_NOTES libavcodec/aacenc.c libavcodec/ac3enc_template.c libavcodec/wmaenc.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-06(e)ac3enc: use planar sample formatJustin Ruggles
2012-06-09Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: float_dsp: ppc: add a separate header for Altivec function prototypes ARM: fix float_dsp breakage from d5a7229 Add a float DSP framework to libavutil PPC: Move types_altivec.h and util_altivec.h from libavcodec to libavutil ARM: Move asm.S from libavcodec to libavutil vc1dsp: mark put/avg_vc1_mspel_mc() always_inline Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-08Add a float DSP framework to libavutilJustin Ruggles
Move vector_fmul() from DSPContext to AVFloatDSPContext.
2012-03-23cosmetics: remove superfluous curly bracketsPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-22ac3enc: switch to ff_alloc_packet2().Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-22Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (26 commits) adxenc: use AVCodec.encode2() adxenc: Use the AVFrame in ADXContext for coded_frame indeo4: fix out-of-bounds function call. configure: Restructure help output. configure: Internal-only components should not be command-line selectable. vorbisenc: use AVCodec.encode2() libvorbis: use AVCodec.encode2() libopencore-amrnbenc: use AVCodec.encode2() ra144enc: use AVCodec.encode2() nellymoserenc: use AVCodec.encode2() roqaudioenc: use AVCodec.encode2() libspeex: use AVCodec.encode2() libvo_amrwbenc: use AVCodec.encode2() libvo_aacenc: use AVCodec.encode2() wmaenc: use AVCodec.encode2() mpegaudioenc: use AVCodec.encode2() libmp3lame: use AVCodec.encode2() libgsmenc: use AVCodec.encode2() libfaac: use AVCodec.encode2() g726enc: use AVCodec.encode2() ... Conflicts: configure libavcodec/Makefile libavcodec/ac3enc.c libavcodec/adxenc.c libavcodec/libgsm.c libavcodec/libvorbis.c libavcodec/vorbisenc.c libavcodec/wmaenc.c tests/ref/acodec/g722 tests/ref/lavf/asf tests/ref/lavf/ffm tests/ref/lavf/mkv tests/ref/lavf/mpg tests/ref/lavf/rm tests/ref/lavf/ts tests/ref/seek/lavf_asf tests/ref/seek/lavf_ffm tests/ref/seek/lavf_mkv tests/ref/seek/lavf_mpg tests/ref/seek/lavf_rm tests/ref/seek/lavf_ts Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-21ac3enc: update to AVCodec.encode2()Justin Ruggles
Update FATE references due to encoder delay.
2012-02-14Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: rtpdec: Use 4 byte startcodes for H.264 matroskadec: Mark variable as av_unused. Move some conditionally used variables into the block where they are used. Drop some completely unnecessary av_unused attributes. swscale: Remove unused variable alpMmxFilter. Drop unnecessary av_uninit attributes from some variable declarations. movenc: Support muxing wmapro in ismv/isma mpegtsenc: Add an AVOption for forcing a new PAT/PMT/SDT to be written swscale: move YUV2PACKED16WRAPPER() macro down to where it is used. swscale: handle gray16 as a "planar" YUV format (Y-only, of course). swscale: use yuv2packed1() functions for unscaled chroma also. swscale: fix incorrect chroma bias in yuv2rgb48_1_c(). swscale: fix invalid memory accesses in yuvpacked1() functions. Move PS2 MMI code below the mips subdirectory, where it belongs. mips: Move MMI function declarations to a header. build: Set correct dependencies for rtmp* protocols implemented by librtmp. Conflicts: libavcodec/ac3enc_template.c libavformat/mpegtsenc.c libswscale/output.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-13Drop unnecessary av_uninit attributes from some variable declarations.Diego Biurrun
Recent versions of gcc (4.4+) no longer give false positive warnings.
2011-11-29ac3enc: clenaup project name in one commentMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-03Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (44 commits) replacement Indeo 3 decoder gsm demuxer: do not allocate packet twice. flvenc: use first packet delay as global delay. ac3enc: doxygen update. imc: return error codes instead of 0 for error conditions. imc: return meaningful error codes instead of -1 imc: do not set channel layout for stereo imc: validate channel count imc: check for ff_fft_init() failure imc: check output buffer size before decoding imc: use DSPContext.bswap16_buf() to byte-swap packet data rtsp: add allowed_media_types option libgsm: add flush function to reset the decoder state when seeking libgsm: simplify decoding by using a loop gsm: log error message when packet is too small libgsmdec: do not needlessly set *data_size to 0 gsmdec: do not needlessly set *data_size to 0 gsmdec: add flush function to reset the decoder state when seeking libgsmdec: check output buffer size before decoding gsmdec: log error message when output buffer is too small. ... Conflicts: Changelog ffplay.c libavcodec/indeo3.c libavcodec/mjpeg_parser.c libavcodec/vp3.c libavformat/cutils.c libavformat/id3v2.c libavutil/parseutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-03ac3enc: doxygen update.Justin Ruggles
Add some parameters to existing function documentation. Remove some unneeded documentation. Convert some static function documentation to non-doxygen style.
2011-10-22Merge remote-tracking branch 'mans/ac3'Michael Niedermayer
* mans/ac3: ac3enc: slightly faster quantize_mantissas_blk_ch() ac3enc: NEON optimised sum_square_butterfly_float ac3enc: neon optimised sum_square_butterfly_int32 ac3enc: move inner loop of compute_rematrixing_strategy to ac3dsp Conflicts: libavcodec/ac3enc_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-05ac3enc: Add channel coupling support for the fixed-point AC-3 encoder.Justin Ruggles
Update FATE references accordingly.
2011-09-05ac3enc: scale floating-point coupling channel coefficients inJustin Ruggles
scale_coefficients() rather than in apply_channel_coupling()
2011-09-05ac3enc: fix encoding of stereo ac3 files when rematrixing is disabled.Justin Ruggles
The number of rematrixing bands still needs to be calculated.
2011-08-22ac3enc: remove outdated TODO comment for apply_channel_coupling()Justin Ruggles
2011-08-11ac3enc: clip coupling coordinates during calculationJustin Ruggles
This is faster than using the clip_coefficients() function. Also, clipping the coordinates before determining reuse is better since it will compare coordinates that are closer to their final encoded values.
2011-08-10ac3enc: remove unneeded #includeJustin Ruggles
2011-08-10ac3enc: restructure coupling coordinate reuse calculationJustin Ruggles
2011-08-10ac3enc: allow new coupling coordinates to be sent independently for eachJustin Ruggles
channel.
2011-08-10ac3enc: separate exponent bit counting from exponent grouping.Justin Ruggles
Move bit counting to the bit allocation function. Move exponent grouping to after bit allocation. This will allow for adjustment of bandwidth parameters during bit allocation without having to do exponent grouping multiple times.
2011-07-27eac3enc: support writing of basic mixing and info metadataJustin Ruggles
2011-07-21eac3enc: use different numbers of blocks per frame to allow higher bitratesJustin Ruggles
2011-07-14ac3enc: merge AC3MDCTContext with AC3EncodeContext.Justin Ruggles
Since both the fixed-point and floating-point encoders use the FFTContext, this no longer needs to be in a separate context. Also, when a short-transform context is added, the same MDCT window will be used.
2011-07-14ac3enc: prefer passing AC3EncodeContext rather than AVCodecContextJustin Ruggles
2011-07-06ac3enc: move inner loop of compute_rematrixing_strategy to ac3dspMans Rullgard
2011-07-01ac3enc: clip coefficients after MDCT.Justin Ruggles
This ensures that any processing between the MDCT and exponent extraction will be using clipped coefficients.
2011-06-27ac3enc: move ff_ac3_encode_frame() to ac3enc_template.cJustin Ruggles
This avoids using function pointers for quite a few small functions, most of which just call DSP functions.
2011-06-16ac3enc: use correct alignment and length in channel coupling dsp functions.Justin Ruggles
This fixes a segfault when using the C version of ac3dsp.float_to_fixed24().
2011-06-14ac3enc: fix allocation of floating point samples.Justin Ruggles
sizeof(SampleType) is different for fixed and float encoders.
2011-06-14ac3enc: split templated float vs. fixed functions into a separate file.Justin Ruggles
Function pointers are used for templated functions instead of needlessly duplicating many functions.