summaryrefslogtreecommitdiffstats
path: root/libavcodec/aac_ac3_parser.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-211-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * (e)ac3 parser: set duration instead of frame_sizeJustin Ruggles2012-02-201-1/+1
| |
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-261-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parserJustin Ruggles2011-03-251-0/+1
| | | | | | | | and decoder, and vice-versa for the AC-3 encoder.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
|/ | | | Signed-off-by: Mans Rullgard <[email protected]>
* Cosmetics: Re-indent after last commit.Alex Converse2010-03-041-13/+13
| | | | Originally committed as revision 22195 to svn://svn.ffmpeg.org/ffmpeg/trunk
* AAC parser: Don't write channels, sample rate, and frame size each frame.Alex Converse2010-03-041-3/+11
| | | | | | Thanks to backwards compatible HE-AAC signalling these values are unreliable. Originally committed as revision 22194 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics after last commitAlex Converse2009-05-131-3/+1
| | | | Originally committed as revision 18816 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Allow parsing and decoding of ADTS AAC files with channel config = 0Alex Converse2009-05-131-0/+2
| | | | Originally committed as revision 18815 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add channel layout support to the AC-3 decoder and AC-3 parser.Justin Ruggles2009-04-191-0/+1
| | | | Originally committed as revision 18622 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Allow AC-3 parser to modify codec_id.Joakim Plate2009-02-191-0/+3
| | | | | | Patch by Joakim Plate (elupus A ecce D se). Originally committed as revision 17447 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun2009-01-191-2/+2
| | | | Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reset state after some frame header is found.Michael Niedermayer2008-10-291-0/+1
| | | | | | Fixes issue704 Originally committed as revision 15742 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix all the recent problems Justin had run into with the AC3 parser,Michael Niedermayer2008-09-221-1/+1
| | | | | | including issue 459. Originally committed as revision 15381 to svn://svn.ffmpeg.org/ffmpeg/trunk
* create a separate codec_id for E-AC-3Justin Ruggles2008-09-011-1/+2
| | | | Originally committed as revision 15143 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: make all references to AC-3 capitalized and hyphenatedJustin Ruggles2008-08-031-2/+2
| | | | Originally committed as revision 14523 to svn://svn.ffmpeg.org/ffmpeg/trunk
* This fixes the code so it is correct on both sides of the if().Michael Niedermayer2008-04-191-1/+3
| | | | Originally committed as revision 12902 to svn://svn.ffmpeg.org/ffmpeg/trunk
* indentMichael Niedermayer2008-04-191-14/+14
| | | | Originally committed as revision 12901 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 100l I broke AC3 in MPEG seeking.Michael Niedermayer2008-04-191-1/+1
| | | | Originally committed as revision 12898 to svn://svn.ffmpeg.org/ffmpeg/trunk
* part 1 of EAC3 supportMichael Niedermayer2008-04-191-1/+4
| | | | Originally committed as revision 12896 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add new_frame_start and need_next_header.Michael Niedermayer2008-04-191-1/+2
| | | | | | based on a patch by Bartlomiej Originally committed as revision 12895 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change aac and ac3 parsers to use ff_combine_frame().Michael Niedermayer2008-04-191-37/+32
| | | | Originally committed as revision 12894 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove AACAC3FrameFlagMichael Niedermayer2008-04-181-2/+1
| | | | Originally committed as revision 12888 to svn://svn.ffmpeg.org/ffmpeg/trunk
* undo changes in aac_ac3_parserBartlomiej Wolowiec2008-04-091-39/+34
| | | | Originally committed as revision 12778 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Correction of typo in aac_ac3_parserBartlomiej Wolowiec2008-04-081-1/+1
| | | | Originally committed as revision 12768 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Corrections of errors in aac_ac3_parserBartlomiej Wolowiec2008-04-071-1/+8
| | | | Originally committed as revision 12759 to svn://svn.ffmpeg.org/ffmpeg/trunk
* change of aac_ac3_parser, so it is able to send complete portion of data to ↵Bartlomiej Wolowiec2008-04-051-34/+32
| | | | | | decoder Originally committed as revision 12758 to svn://svn.ffmpeg.org/ffmpeg/trunk
* removal of stream_type in AACAC3ParseContext and adding AACAC3FrameFlagBartlomiej Wolowiec2008-03-281-1/+2
| | | | Originally committed as revision 12622 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Pass AACAC3ParseContext to sync() instead of individual arguments. Patch byJustin Ruggles2008-03-231-8/+7
| | | | | | Bartlomiej Wolowiec (bartek wolowiec gmail com) Originally committed as revision 12564 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add downmixing support to libfaad decoderJustin Ruggles2008-01-051-3/+4
| | | | Originally committed as revision 11422 to svn://svn.ffmpeg.org/ffmpeg/trunk
* do not set channels before checking request_channelsJustin Ruggles2008-01-051-1/+2
| | | | Originally committed as revision 11414 to svn://svn.ffmpeg.org/ffmpeg/trunk
* adjust output channels based on AVCodecContext.request_channels in AC3 parserJustin Ruggles2008-01-051-0/+7
| | | | Originally committed as revision 11412 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: indentation after last commitJustin Ruggles2008-01-031-1/+1
| | | | Originally committed as revision 11387 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove workaround which is no longer needed due toJustin Ruggles2008-01-031-7/+0
| | | | | | AVCodecContext.request_channels Originally committed as revision 11386 to svn://svn.ffmpeg.org/ffmpeg/trunk
* factorize code and add safety check to prevent memcpying negative amountsMichael Niedermayer2007-10-131-13/+8
| | | | Originally committed as revision 10722 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: rename for consistency after previous aac and ac3 parsers moveAurelien Jacobs2007-05-081-2/+2
| | | | Originally committed as revision 8942 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move aac and ac3 parsers in their own filesAurelien Jacobs2007-05-081-0/+91
Originally committed as revision 8941 to svn://svn.ffmpeg.org/ffmpeg/trunk