RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
32,402 Commits 37 Branches 400 Tags 270 MiB
Commit Graph

24 Commits

Author SHA1 Message Date
Michael Niedermayer 27ef7b1bcd Merge remote-tracking branch 'newdev/master' 
* 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-26 03:06:30 +01:00
Justin Ruggles be18738801 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.
 2011-03-25 16:59:00 -04:00
Mans Rullgard 2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Justin Ruggles bfeca7beb6 Add channel layout support to the AC-3 decoder and AC-3 parser. 
Originally committed as revision 18622 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-19 15:05:32 +00:00
Joakim Plate 4cff8dc88f Allow AC-3 parser to modify codec_id. 
Patch by Joakim Plate (elupus A ecce D se).

Originally committed as revision 17447 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-19 00:28:19 +00:00
Diego Biurrun 406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences. 
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-19 15:46:40 +00:00
Alex Converse 11d6f38cc9 Factorise enum of AC3 error types to be usable by AAC in the ADTS patch that 
will follow

Patch by Alex Converse ( alex converse gmail com )

Originally committed as revision 16479 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 18:10:10 +00:00
Stefano Sabatini 987903826b Globally rename the header inclusion guard names. 
Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".

Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 07:39:47 +00:00
Justin Ruggles 14b7062829 cosmetics: make all references to AC-3 capitalized and hyphenated 
Originally committed as revision 14523 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-03 16:42:32 +00:00
David Liu 7694a7d93f Close parse context. 
Patch by David LIU david liu st com

Originally committed as revision 13962 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-25 12:30:35 +00:00
Måns Rullgård 7c43009358 add necessary #includes in headers 
Originally committed as revision 13043 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-03 13:29:39 +00:00
Michael Niedermayer 133ac890fb Add new_frame_start and need_next_header. 
based on a patch by Bartlomiej

Originally committed as revision 12895 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-19 01:59:55 +00:00
Michael Niedermayer 454064ad1e Change aac and ac3 parsers to use ff_combine_frame(). 
Originally committed as revision 12894 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-19 01:50:40 +00:00
Michael Niedermayer 8c731c9743 remove AACAC3FrameFlag 
Originally committed as revision 12888 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-18 03:09:01 +00:00
Bartlomiej Wolowiec 469d8816d6 undo changes in aac_ac3_parser 
Originally committed as revision 12778 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-09 22:11:21 +00:00
Bartlomiej Wolowiec c09ed33e18 Corrections of errors in aac_ac3_parser 
Originally committed as revision 12759 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-07 20:54:08 +00:00
Bartlomiej Wolowiec 0a5754c3b7 change of aac_ac3_parser, so it is able to send complete portion of data to decoder 
Originally committed as revision 12758 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-05 20:09:36 +00:00
Bartlomiej Wolowiec be1e2a2bfa removal of stream_type in AACAC3ParseContext and adding AACAC3FrameFlag 
Originally committed as revision 12622 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-28 19:59:58 +00:00
Bartlomiej Wolowiec 4e6eeaf019 using stream type in eac3 parser 
Originally committed as revision 12570 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-24 21:25:49 +00:00
Justin Ruggles c599e297e7 Pass AACAC3ParseContext to sync() instead of individual arguments. Patch by 
Bartlomiej Wolowiec (bartek wolowiec gmail com)

Originally committed as revision 12564 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-23 15:43:29 +00:00
Diego Biurrun 5b21bdabe4 Add FFMPEG_ prefix to all multiple inclusion guards. 
Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-17 09:37:46 +00:00
Måns Rullgård 99545457bf include all prerequisites in header files 
Originally committed as revision 9344 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-16 22:59:13 +00:00
Aurelien Jacobs 679c2294cb cosmetics: rename for consistency after previous aac and ac3 parsers move 
Originally committed as revision 8942 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-08 23:29:07 +00:00
Aurelien Jacobs 99ff31dc75 move aac and ac3 parsers in their own files 
Originally committed as revision 8941 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-08 23:25:31 +00:00