virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
28,658 Commits 37 Branches 400 Tags 464 MiB
907783f221
Commit Graph

54 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
12dffc4502 ac3: define AC3_MAX_CPL_BANDS and use it in ac3dec.h 
(cherry picked from commit b35743ffb4)
 2011-03-05 02:29:33 +01:00
Justin Ruggles
b35743ffb4 ac3: define AC3_MAX_CPL_BANDS and use it in ac3dec.h 2011-03-04 16:48:09 -05:00
Justin Ruggles
dff80041e3 Add ff_ prefix to ac3_common_init(). 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4c57cde942)
 2011-01-28 03:15:33 +01:00
Justin Ruggles
4c57cde942 Add ff_ prefix to ac3_common_init(). 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-26 15:35:27 +00:00
Diego Elio Pettenò
a172126c38 Remove unused ac3_parametric_bit_allocation function. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 362bfe2997)
 2011-01-26 03:43:30 +01:00
Diego Elio Pettenò
362bfe2997 Remove unused ac3_parametric_bit_allocation function. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-25 15:09:46 +00:00
Justin Ruggles
e0b9f94b39 cosmetics: use some size macros in ac3tab.c/h 
Originally committed as revision 25969 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:51:47 +00:00
Justin Ruggles
47ae6e795b define AC3_CRITICAL_BANDS and use it in the AC-3 encoder and decoder. 
Originally committed as revision 25967 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:51:40 +00:00
Justin Ruggles
1fda2c10f6 cosmetics: Define AC3_WINDOW_SIZE and use it instead of AC3_BLOCK_SIZE*2. 
Originally committed as revision 25951 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:50:40 +00:00
Justin Ruggles
7066cc8f2b cosmetics: use better (and shared) macro names for some constant values 
Originally committed as revision 25950 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 14:50:34 +00:00
Måns Rullgård
49bd8e4b84 Fix grammar errors in documentation 
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-30 15:38:06 +00:00
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands. 
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-04-20 14:45:34 +00:00
Stefano Sabatini
bf7e799c9e Remove '\p', '\c' and '\e' doxygen markup from doxy, as it should 
improve plain text doxy readability.

See the thread: "[RFC] Should we use doxygen markup?".

Originally committed as revision 19122 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-06 09:35:15 +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
Diego Biurrun
bad5537e2c Use full internal pathname in doxygen @file directives. 
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 02:00: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
Justin Ruggles
20e047262f cosmetics: alignment after last commit 
Originally committed as revision 16035 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-08 03:15:10 +00:00
Justin Ruggles
72a6244b5d ac3: detect dba errors and prevent writing past end of array 
Originally committed as revision 16034 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-08 03:13:20 +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
Justin Ruggles
687671f03b pass bap table to ff_ac3_bit_alloc_calc_bap() 
Originally committed as revision 13694 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-07 22:29:54 +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
Justin Ruggles
406113721f move some AC3HeaderInfo struct fields to the Coded elements group. 
Originally committed as revision 13612 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-02 02:54:46 +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
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
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
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
8001d92345 cosmetics: vertical align after last commit 
Originally committed as revision 11195 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-09 03:25:42 +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
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
Justin Ruggles
cc2a8443eb move some common values to ac3.h and utilize them 
Originally committed as revision 9679 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-15 01:31:09 +00:00
Aurelien Jacobs
e0fe500f01 avoid multiple inclusion of ac3.h 
Originally committed as revision 8940 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-08 23:24:22 +00:00
Aurelien Jacobs
7adb10bedf move ac3 tables from a .h to a .c 
Originally committed as revision 8816 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-25 22:12:51 +00:00
Diego Biurrun
98d0205145 Move AC3 header parsing code together with the rest of the AC3 parsing code. 
Originally committed as revision 8739 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-15 12:32:36 +00:00
Justin Ruggles
575bf46f16 split ac3_parametric_bit_allocation into 3 separate functions 
Originally committed as revision 8442 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-18 21:43:20 +00:00
Justin Ruggles
495529f7df hardcode ff_ac3_frame_sizes table 
Originally committed as revision 8435 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-18 04:53:21 +00:00
Justin Ruggles
2476139973 move AC-3 header parsing to ac3.c 
Originally committed as revision 8323 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-11 16:44:14 +00:00
Justin Ruggles
050aa8b9bc remove redundancy in AC-3 parser by using common tables from ac3tab.h 
Originally committed as revision 8318 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-11 02:13:05 +00:00
Justin Ruggles
4258a0a32a Remove common code from AC-3 encoder and utilize ac3.c. 
Originally committed as revision 8306 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-09 13:57:42 +00:00
Måns Rullgård
486497e07b revert bad checkin 
Originally committed as revision 7044 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-14 03:18:09 +00:00
Måns Rullgård
be6ed6fff4 move some CFLAGS settings away from config.* writing section 
Originally committed as revision 7043 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-14 03:12:29 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library' 
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-07 15:30:46 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address. 
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-12 22:43:26 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace. 
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-17 18:14:38 +00:00