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
path: root/libavcodec/libmp3lame.c
AgeCommit message (Collapse)Author
2012-06-10Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: libmp3lame: add missing layout terminator avconv: multithreaded demuxing. Bump lavu minor and add an APIChanges entry for audioconvert functions. audioconvert: add a function for extracting the channel with the given index audioconvert: add a function for getting the name of a single channel. audioconvert: add a function for getting channel's index in layout audioconvert: use av_popcount64 in av_get_channel_layout_nb_channels vf_libopencv: add missing headers. iac: add missing dependency Conflicts: configure doc/APIchanges ffmpeg.c libavcodec/libmp3lame.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10libmp3lame: add missing layout terminatorMichael Niedermayer
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2012-06-01libmp3lame: add missing layout terminatorMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-16Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (26 commits) fate: use diff -b in oneline comparison Add missing version bumps and APIchanges/Changelog entries. lavfi: move buffer management function to a separate file. lavfi: move formats-related functions from default.c to formats.c lavfi: move video-related functions to a separate file. fate: make smjpeg a demux test fate: separate sierra-vmd audio and video tests fate: separate smacker audio and video tests libmp3lame: set supported channel layouts. avconv: automatically insert asyncts when -async is used. avconv: add support for audio filters. lavfi: add asyncts filter. lavfi: add aformat filter lavfi: add an audio buffer sink. lavfi: add an audio buffer source. buffersrc: add av_buffersrc_write_frame(). buffersrc: fix invalid read in uninit if the fifo hasn't been allocated lavfi: rename vsrc_buffer.c to buffersrc.c avfiltergraph: reindent lavfi: add channel layout/sample rate negotiation. ... Conflicts: Changelog doc/APIchanges doc/filters.texi ffmpeg.c ffprobe.c libavcodec/libmp3lame.c libavfilter/Makefile libavfilter/af_aformat.c libavfilter/allfilters.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffersrc.c libavfilter/defaults.c libavfilter/formats.c libavfilter/src_buffer.c libavfilter/version.h libavfilter/vf_yadif.c libavfilter/vsrc_buffer.c libavfilter/vsrc_buffer.h libavutil/avutil.h tests/fate/audio.mak tests/fate/demux.mak tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-14libmp3lame: set supported channel layouts.Anton Khirnov
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-22libmp3lame: 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-21libmp3lame: use AVCodec.encode2()Justin Ruggles
2012-02-21Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (36 commits) adpcmenc: Use correct frame_size for Yamaha ADPCM. avcodec: add ff_samples_to_time_base() convenience function to internal.h adx parser: set duration mlp parser: set duration instead of frame_size gsm parser: set duration mpegaudio parser: set duration instead of frame_size (e)ac3 parser: set duration instead of frame_size flac parser: set duration instead of frame_size avcodec: add duration field to AVCodecParserContext avutil: add av_rescale_q_rnd() to allow different rounding pnmdec: remove useless .pix_fmts libmp3lame: support float and s32 sample formats libmp3lame: renaming, rearrangement, alignment, and comments libmp3lame: use the LAME default bit rate libmp3lame: use avpriv_mpegaudio_decode_header() for output frame parsing libmp3lame: cosmetics: remove some pointless comments libmp3lame: convert some debugging code to av_dlog() libmp3lame: remove outdated comment. libmp3lame: do not set coded_frame->key_frame. libmp3lame: improve error handling in MP3lame_encode_init() ... Conflicts: doc/APIchanges libavcodec/libmp3lame.c libavcodec/pcxenc.c libavcodec/pnmdec.c libavcodec/pnmenc.c libavcodec/sgienc.c libavcodec/utils.c libavformat/hls.c libavutil/avutil.h libswscale/x86/swscale_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-20libmp3lame: support float and s32 sample formatsJustin Ruggles
2012-02-20libmp3lame: renaming, rearrangement, alignment, and commentsJustin Ruggles
2012-02-20libmp3lame: use the LAME default bit rateJustin Ruggles
Also, only set bit rate for CBR.
2012-02-20libmp3lame: use avpriv_mpegaudio_decode_header() for output frame parsingJustin Ruggles
2012-02-20libmp3lame: cosmetics: remove some pointless commentsJustin Ruggles
2012-02-20libmp3lame: convert some debugging code to av_dlog()Justin Ruggles
also remove unneeded commented-out full frame data debugging
2012-02-20libmp3lame: remove outdated comment.Justin Ruggles
We now require at least libmp3lame 3.98.3. lame_encode_buffer_interleaved() still doesn't work for mono, but it does not "die"; it just expects a stereo interleaved buffer.
2012-02-20libmp3lame: do not set coded_frame->key_frame.Justin Ruggles
it is already set in avcodec_alloc_frame()
2012-02-20libmp3lame: improve error handling in MP3lame_encode_init()Justin Ruggles
2012-02-20libmp3lame: remove unneeded 'stereo' field from Mp3AudioContextJustin Ruggles
2012-01-29libmp3lame: remove dupe assigmentPaul B Mahol
It is already done by avcodec_alloc_context(). Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-28Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (71 commits) movenc: Allow writing to a non-seekable output if using empty moov movenc: Support adding isml (smooth streaming live) metadata libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set sunrast: Document the different Sun Raster file format types. sunrast: Add a check for experimental type. libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat lavf: remove disabled FF_API_SET_PTS_INFO cruft lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft lavf: remove disabled FF_API_REORDER_PRIVATE cruft lavf: remove disabled FF_API_SEEK_PUBLIC cruft lavf: remove disabled FF_API_STREAM_COPY cruft lavf: remove disabled FF_API_PRELOAD cruft lavf: remove disabled FF_API_NEW_STREAM cruft lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft lavf: remove disabled FF_API_MUXRATE cruft lavf: remove disabled FF_API_FILESIZE cruft lavf: remove disabled FF_API_TIMESTAMP cruft lavf: remove disabled FF_API_LOOP_OUTPUT cruft lavf: remove disabled FF_API_LOOP_INPUT cruft lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft ... Conflicts: doc/APIchanges libavcodec/8bps.c libavcodec/avcodec.h libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/options.c libavcodec/sunrast.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/h264_deblock.asm libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/avformat.h libavformat/avio.c libavformat/avio.h libavformat/aviobuf.c libavformat/dv.c libavformat/mov.c libavformat/utils.c libavformat/version.h libavformat/wtv.c libavutil/Makefile libavutil/file.c libswscale/x86/input.asm libswscale/x86/swscale_mmx.c libswscale/x86/swscale_template.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-27lavc: remove disabled FF_API_LAME_GLOBAL_OPTS cruft.Anton Khirnov
2012-01-12libmp3lame: It appears the buffer used is a bit too small.Michael Niedermayer
Increase it by an arbitrary amount. Fixes part of Ticket676 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-30Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: fate: split off DPCM codec FATE tests into their own file fate: split off PCM codec FATE tests into their own file libvorbis: K&R reformatting cosmetics libmp3lame: K&R formatting cosmetics fate: Add a video test for xxan decoder mpegvideo_enc: K&R cosmetics (line 1000-2000). avconv: K&R cosmetics qt-faststart: Fix up indentation indeo4: remove two unused variables doxygen: cleanup style to support older doxy fate: add more tests for VC-1 decoder applehttpproto: Apply the same reload interval changes as for the demuxer applehttp: Use half the target duration as interval if the playlist didn't update applehttp: Use the last segment duration as reload interval lagarith: add decode support for arith rgb24 mode Conflicts: avconv.c libavcodec/libmp3lame.c libavcodec/mpegvideo_enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-30libmp3lame: K&R formatting cosmeticsAneesh Dogra
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-10-31libmp3lame: log error message in case of invalid number of channelsStefano Sabatini
Also return meaningful error number in place of -1. Improve feedback.
2011-10-13Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (31 commits) tiffenc: initialize forgotten avctx. avplay: free the active audio packet at exit. avplay: free rdft data used for spectrogram analysis. log.h: make AVClass a named struct fix ac3 encoder documentation vc1: more prettyprinting cosmetics vc1: prettyprint some tables vc1: K&R formatting cosmetics AVOptions: bump minor and add APIchanges entry. cmdutils/avtools: simplify show_help() by using av_opt_child_class_next() AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_* Remove all uses of deprecated AVOptions API. AVOptions: add av_opt_next, deprecate av_next_option. AVOptions: add functions for evaluating option strings. AVOptions: split get_number(). AVOptions: add av_opt_get*, deprecate av_get*. AVOptions: add av_opt_set*(). AVOptions: add new API for enumerating children. rv34: move inverse transform functions to DSP context flvenc: Write the right metadata entry count ... Conflicts: avconv.c cmdutils.c doc/APIchanges ffplay.c ffprobe.c libavcodec/ac3dec.c libavcodec/h264.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options.c libavdevice/libdc1394.c libavdevice/v4l2.c libavfilter/vf_drawtext.c libavformat/flvdec.c libavformat/mpegtsenc.c libavformat/options.c libavutil/avutil.h libavutil/opt.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-12AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*Anton Khirnov
2011-09-02Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: avconv: fix some bugs introduced in 630902a1e1336e7ee0cf3dcbcb6eb07af8edf660 libmp3lame: fix typo AVOptions: drop av_ prefix from static av_get_number(). libx264: use X264_THREADS_AUTO constant instead of 0. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-01libmp3lame: fix typoAnton Khirnov
FF_API_LAME_GLOBAL_OPTIONS => FF_API_LAME_GLOBAL_OPTS Thanks to Clément Bœsch for spotting.
2011-09-01Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (31 commits) libx264: set default thread count to 0 (auto) lavc: cosmetics, group deprecated codec flags mpeg12: add 'scan_offset' private option. h263/p encoder: add 'structured_slices' private option. h263/p encoder: add 'obmc' private option. h263p encoder: add 'aiv' private option. h263p encoder: add 'umv' private option. mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option. mjpegdec: add 'extern_huff' private option. mpeg4enc: add 'data_partitioning' private option. snow: add 'memc_only' private option. libx264: add 'mbtree' private option. libx264: add 'psy' private option. libmp3lame: add 'reservoir' private option. mpeg2enc: add 'non_linear_quant' private option mpeg12enc: add drop_frame_timecode private option. mpeg12enc: add intra_vlc private option. VC1: Support dynamic dimension changes mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested lavc: deprecate CODEC_FLAG2_BRDO ... Conflicts: avconv.c libavcodec/libmp3lame.c libavcodec/libx264.c libavcodec/mjpegdec.c libavcodec/mpeg12enc.c libavcodec/mpegvideo.h libavcodec/vc1.c libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-31libmp3lame: add 'reservoir' private option.Anton Khirnov
Deprecate CODEC_FLAG2_BIT_RESERVOIR
2011-07-30Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata. H.264: tweak some other x86 asm for Atom probe: Fix insane flow control. mpegts: remove invalid error check s302m: use nondeprecated audio sample format API lavc: use designated initialisers for all codecs. x86: cabac: add operand size suffixes missing from 6c32576 Conflicts: libavcodec/ac3enc_float.c libavcodec/flacenc.c libavcodec/frwu.c libavcodec/pictordec.c libavcodec/qtrleenc.c libavcodec/v210enc.c libavcodec/wmv2dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-29lavc: use designated initialisers for all codecs.Anton Khirnov
It's more readable and less prone to breakage.
2011-05-20mp3lame: add #include required for AV_RB32 macro.Ronald S. Bultje
Fixes compilation with mp3lame enabled.
2011-05-20libmp3lame: include "libavutil/intreadwrite.h" headerStefano Sabatini
Fix compilation.
2011-04-1932bit libmp3lame support.Peter Belkner
2011-04-19Check avcodec_alloc_frame() failure.Peter Belkner
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-28Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò
None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit d36beb3f6902b1217beda576aa18abf7eb72b03c)
2011-01-26Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò
None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
2010-11-12Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enumStefano Sabatini
SampleFormat with AVSampleFormat. Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-02Allow mono encoding with LAME.Thierry Foucu
Patch by Thierry Foucu, tfoucu gmail Originally committed as revision 25650 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-16Remove useless comment.Carl Eugen Hoyos
Originally committed as revision 25129 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-16Allow float values for libmp3lame quality.James Darnley
Patch by James Darnley, james D darnley A gmail Originally committed as revision 25128 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-22Set .supported_samplerates for mpeg audio encoders.Michael Niedermayer
Originally committed as revision 22944 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20Remove explicit filename from Doxygen @file commands.Diego Biurrun
Passing an explicit filename to this command is only necessary if the documentation in the @file block refers to a file different from the one the block resides in. Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini
is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-06Make sample_fmts and channel_layouts compound literals const to reduce size ofReimar Döffinger
.data section. Originally committed as revision 19787 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-29 18:10:13 +0300