RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
47,614 Commits 36 Branches 392 Tags 305 MiB
Commit Graph

21 Commits

Author SHA1 Message Date
Michael Niedermayer dd8ffc1925 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (47 commits)
  lavc: hide private symbols.
  lavc: deprecate img_get_alpha_info().
  lavc: use avpriv_ prefix for ff_toupper4.
  lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits.
  lavc: use avpriv_ prefix for ff_ac3_parse_header.
  lavc: use avpriv_ prefix for ff_frame_rate_tab.
  lavc: rename ff_find_start_code to avpriv_mpv_find_start_code
  lavc: use avpriv_ prefix for ff_split_xiph_headers.
  lavc: use avpriv_ prefix for ff_dirac_parse_sequence_header.
  lavc: use avpriv_ prefix for some dv symbols used in lavf.
  lavc: use avpriv_ prefix for some flac symbols used in lavf.
  lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf.
  lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf.
  lavc: use avpriv_ prefix for ff_aac_parse_header().
  lavf: hide private symbols.
  lavf: use avpriv_ prefix for some dv functions.
  lavf: use avpriv_ prefix for ff_new_chapter().
  avcodec: add CODEC_CAP_DELAY note to avcodec_decode_audio3() documentation
  avcodec: clarify the CODEC_CAP_DELAY note in avcodec_decode_video2()
  avcodec: clarify documentation of CODEC_CAP_DELAY
  ...

Conflicts:
	configure
	doc/general.texi
	libavcodec/Makefile
	libavcodec/aacdec.c
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/dv.c
	libavcodec/dvdata.c
	libavcodec/dvdata.h
	libavcodec/libspeexenc.c
	libavcodec/mpegvideo.c
	libavcodec/version.h
	libavformat/avidec.c
	libavformat/dv.c
	libavformat/dv.h
	libavformat/flvenc.c
	libavformat/mov.c
	libavformat/mp3enc.c
	libavformat/oggparsespeex.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 02:01:26 +02:00
Anton Khirnov 6f89efeaa7 lavc: use avpriv_ prefix for ff_ac3_parse_header. 
It's used in lavf.
 2011-10-20 21:06:58 +02: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
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
Diego Biurrun 4563de772c Restore mistakenly removed [in]/[out] Doxygen parameter attributes. 
Originally committed as revision 24241 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-14 21:22:06 +00:00
Diego Biurrun 3fa7626863 Avoid square brackets in Doxygen comments; Doxygen chokes on them. 
Originally committed as revision 23979 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-02 11:44:58 +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
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
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
Justin Ruggles fbe52e4188 use enum value for CRC error 
Originally committed as revision 13580 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-31 15:31:57 +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
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 3df880934e better AC3 header error reporting 
Originally committed as revision 10496 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-15 02:41:24 +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