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-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-21(e)ac3 parser: set duration instead of frame_sizeJustin Ruggles
2011-03-26Merge remote-tracking branch 'newdev/master'Michael Niedermayer
* newdev/master: mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom. Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser and decoder, and vice-versa for the AC-3 encoder. Use audio_service_type to set stream disposition. Add APIchanges entry for audio_service_type. Add audio_service_type field to AVCodecContext for encoding and reporting of the service type in the audio bitstream. configure: in check_ld, place new -l flags before existing ones support @heading, @subheading, @subsubheading, and @subsubsection in texi2pod.pl doc: update build system documentation aacenc: indentation aacenc: fix the side calculation in search_for_ms vp8.c: rename EDGE_* to VP8_EDGE_*. Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/version.h libavcodec/vp8.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-25Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parserJustin Ruggles
and decoder, and vice-versa for the AC-3 encoder.
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2010-03-04Cosmetics: Re-indent after last commit.Alex Converse
Originally committed as revision 22195 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04AAC parser: Don't write channels, sample rate, and frame size each frame.Alex Converse
Thanks to backwards compatible HE-AAC signalling these values are unreliable. Originally committed as revision 22194 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13Cosmetics after last commitAlex Converse
Originally committed as revision 18816 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13Allow parsing and decoding of ADTS AAC files with channel config = 0Alex Converse
Originally committed as revision 18815 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-19Add channel layout support to the AC-3 decoder and AC-3 parser.Justin Ruggles
Originally committed as revision 18622 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-19Allow AC-3 parser to modify codec_id.Joakim Plate
Patch by Joakim Plate (elupus A ecce D se). Originally committed as revision 17447 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-30Reset state after some frame header is found.Michael Niedermayer
Fixes issue704 Originally committed as revision 15742 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-22Fix all the recent problems Justin had run into with the AC3 parser,Michael Niedermayer
including issue 459. Originally committed as revision 15381 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01create a separate codec_id for E-AC-3Justin Ruggles
Originally committed as revision 15143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-03cosmetics: make all references to AC-3 capitalized and hyphenatedJustin Ruggles
Originally committed as revision 14523 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-19This fixes the code so it is correct on both sides of the if().Michael Niedermayer
Originally committed as revision 12902 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-19indentMichael Niedermayer
Originally committed as revision 12901 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-19100l I broke AC3 in MPEG seeking.Michael Niedermayer
Originally committed as revision 12898 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-19part 1 of EAC3 supportMichael Niedermayer
Originally committed as revision 12896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-19Add new_frame_start and need_next_header.Michael Niedermayer
based on a patch by Bartlomiej Originally committed as revision 12895 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-19Change aac and ac3 parsers to use ff_combine_frame().Michael Niedermayer
Originally committed as revision 12894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-18remove AACAC3FrameFlagMichael Niedermayer
Originally committed as revision 12888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-10undo changes in aac_ac3_parserBartlomiej Wolowiec
Originally committed as revision 12778 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-08Correction of typo in aac_ac3_parserBartlomiej Wolowiec
Originally committed as revision 12768 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-08Corrections of errors in aac_ac3_parserBartlomiej Wolowiec
Originally committed as revision 12759 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-06change of aac_ac3_parser, so it is able to send complete portion of data to ↵Bartlomiej Wolowiec
decoder Originally committed as revision 12758 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-28removal of stream_type in AACAC3ParseContext and adding AACAC3FrameFlagBartlomiej Wolowiec
Originally committed as revision 12622 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-23Pass AACAC3ParseContext to sync() instead of individual arguments. Patch byJustin Ruggles
Bartlomiej Wolowiec (bartek wolowiec gmail com) Originally committed as revision 12564 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-06add downmixing support to libfaad decoderJustin Ruggles
Originally committed as revision 11422 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-05do not set channels before checking request_channelsJustin Ruggles
Originally committed as revision 11414 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-05adjust output channels based on AVCodecContext.request_channels in AC3 parserJustin Ruggles
Originally committed as revision 11412 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-04cosmetics: indentation after last commitJustin Ruggles
Originally committed as revision 11387 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-04remove workaround which is no longer needed due toJustin Ruggles
AVCodecContext.request_channels Originally committed as revision 11386 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-13factorize code and add safety check to prevent memcpying negative amountsMichael Niedermayer
Originally committed as revision 10722 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-09cosmetics: rename for consistency after previous aac and ac3 parsers moveAurelien Jacobs
Originally committed as revision 8942 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-09move aac and ac3 parsers in their own filesAurelien Jacobs
Originally committed as revision 8941 to svn://svn.ffmpeg.org/ffmpeg/trunk