virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
30,263 Commits 37 Branches 400 Tags 465 MiB
5655469ee7
Commit Graph

56 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
Reinhard Tartler
7ffe76e540 Merge libavcore into libavutil 
Done to keep ABI compatible. Otherwise this is just silly
 2011-02-16 23:00:30 +01:00
Reinhard Tartler
737eb5976f Merge libavcore into libavutil 
It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-02-15 16:18:21 +01:00
Anton Khirnov
fbdcdaee6e Replace remaining occurrences of deprecated CH_* with AV_CH_* 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit c2fcd0a7a4)
 2011-02-06 20:31:47 +01:00
Anton Khirnov
c2fcd0a7a4 Replace remaining occurrences of deprecated CH_* with AV_CH_* 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-06 08:26:12 -05:00
Diego Elio Pettenò
e7e2df27f8 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
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 d36beb3f69)
 2011-01-28 03:15:34 +01:00
Diego Elio Pettenò
d36beb3f69 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-26 16:08:45 +00:00
Diego Elio Pettenò
998d9ee7a4 Remove unused ff_ac3_parse_header_full function. 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 676f1f533e)
 2011-01-26 03:43:32 +01:00
Diego Elio Pettenò
676f1f533e Remove unused ff_ac3_parse_header_full function. 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-25 21:48:03 +01:00
Måns Rullgård
8fc0162ac4 Add av_ prefix to bswap macros 
Originally committed as revision 24170 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-10 22:12:30 +00:00
Måns Rullgård
e6b22522c9 bswap: change ME to NE in macro names 
Other parts of FFmpeg use NE (native endian) rather than ME (machine).
This makes it consistent.

Originally committed as revision 24169 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-10 22:09:01 +00:00
Justin Ruggles
a26f1d1092 ac3: make the value of codec_id during (E-)AC-3 parsing stay CODEC_ID_EAC3 
if any E-AC-3 frames have been detected instead of switching back and forth for
AC-3 core + dependent E-AC-3 substream(s).
Fixes Issue 2022.

Originally committed as revision 24103 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-07 23:52:24 +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
Stefano Sabatini
9106a698e7 Rename bitstream.h to get_bits.h. 
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-13 16:20:26 +00:00
Justin Ruggles
a169df2f76 Set the correct number of samples for E-AC-3 in the AC3 parser. 
Originally committed as revision 17472 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-20 22:00:41 +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
Måns Rullgård
6c414bb6d4 AC3: fix strict aliasing violation in parser 
Originally committed as revision 16181 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-17 02:30:26 +00:00
Justin Ruggles
2988c93d94 create a separate codec_id for E-AC-3 
Originally committed as revision 15143 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-01 14:33:54 +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
Justin Ruggles
30f71adc46 move mix level tables from parser to decoder. have parser read bitstream value instead of using an index to a table in the decoder. 
Originally committed as revision 13696 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-07 22:30:09 +00:00
Justin Ruggles
caf0fbc889 add more gain levels and adjust mix level tables accordingly. 
Originally committed as revision 13695 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-07 22:30:03 +00:00
Justin Ruggles
30cc3ac20e set default mix levels regardless of bitstream id 
Originally committed as revision 13693 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-07 22:29:45 +00:00
Justin Ruggles
3596aa6fe6 get substreamid from ac3 parser 
Originally committed as revision 13689 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-07 22:29:11 +00:00
Justin Ruggles
6730e9f300 get the number of blocks from the ac3 parser and use in the ac3 decoder. 
Originally committed as revision 13688 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-07 22:29:03 +00:00
Bartlomiej Wolowiec
0c79b1402a add a ff_ac3_parse_header_full() which calls ff_ac3_parse_header() 
and then reads the channel_map stuff

Originally committed as revision 12944 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-24 22:27:13 +00:00
Bartlomiej Wolowiec
55736cfbd2 change ff_ac3_parse_header() to take a GetBitContext instead of const char* 
Originally committed as revision 12922 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-22 11:14:01 +00:00
Michael Niedermayer
144b5bdc70 Make most of E-AC-3 work without breaking regression tests. 
Originally committed as revision 12903 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-19 12:04:33 +00:00
Michael Niedermayer
c087748f26 Part 2 of EAC3 support, this is still disabled as it breaks regressions 
due to bugs elsewhere.

Originally committed as revision 12897 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-19 02:29:27 +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
79b25a27b8 change name from stream type to frame type in AC3 code 
Originally committed as revision 12623 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-28 20:42:55 +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
6808a8eaf2 using EAC3_STREAM_TYPE_* instead of numbers 
Originally committed as revision 12571 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-24 22:21:22 +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
Zuxy Meng
98a6fff98c Apply 'cold' attribute to init/uninit functions in libavcodec 
Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-21 03:11:20 +00:00
Justin Ruggles
1d8cfa3168 cosmetics: indentation after last commit 
Originally committed as revision 11421 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-05 18:40:49 +00:00
Justin Ruggles
646800f79c move E-AC3 header parsing to ff_ac3_parse_header() 
Originally committed as revision 11420 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-05 18:39:55 +00:00
Justin Ruggles
86ad4c7e1b remove unneeded variables from AC3HeaderInfo 
Originally committed as revision 11419 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-05 17:04:57 +00:00
Justin Ruggles
e59cc20593 cosmetics: rename common ac3 variables 
Originally committed as revision 11196 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-09 03:27:14 +00:00
Justin Ruggles
5ce2134258 cosmetics: rename ac3 bit allocation variables 
Originally committed as revision 11194 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-09 03:23:04 +00:00