1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
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
..
amv
2011-06-30 09:47:32 +01:00
caf
2011-10-12 03:47:51 +02:00
crc
2011-07-03 17:17:54 +01:00
dpx
2010-08-28 11:46:03 +00:00
2010-08-28 11:46:03 +00:00
2011-10-18 10:45:22 +03:00
2011-01-22 03:08:21 +00:00
2011-07-04 16:26:26 +01:00
md5
2011-07-03 18:19:18 +01:00
2010-08-31 11:13:14 +00:00
2010-07-17 10:50:25 +00:00
2010-04-19 11:51:40 +00:00
2010-07-11 12:44:32 +00:00
ptx
rl2
2011-08-17 15:00:42 +02:00
sha
2010-08-31 20:07:38 +00:00
2011-09-14 11:13:54 +03:00
smc
2011-01-14 22:32:26 +00:00
2010-12-28 23:52:53 +00:00
tmv
2011-09-07 12:16:15 +02:00
vp3
2010-08-25 17:23:38 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
w64
2011-03-22 11:07:46 +00:00
2010-08-28 14:51:51 +00:00
yop
2010-07-11 00:07:31 +00:00