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
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-10-21 02:01:26 +02:00
2011-09-26 00:24:01 +02:00
2011-03-19 13:33:20 +00:00
2011-10-21 02:01:26 +02:00
2011-10-20 02:34:51 +02:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-17 03:38:47 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-05-13 04:40:40 +02:00
2011-03-19 13:33:20 +00:00
2011-04-17 23:43:54 +02:00
2011-06-24 03:07:04 +02:00
2011-03-19 13:33:20 +00:00
2011-10-21 02:01:26 +02:00
2011-10-14 22:24:00 +02:00
2011-10-20 02:34:51 +02:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-10-21 02:01:26 +02:00
2011-10-01 03:48:33 +02:00
2011-05-22 04:53:19 +02:00
2011-06-01 20:29:27 +02:00
2011-07-03 03:14:10 +02:00
2011-10-18 01:54:40 +02:00
2011-10-20 02:34:51 +02:00
2011-09-08 22:37:31 +02:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-16 02:38:02 +02:00
2011-10-16 02:43:36 +02:00
2011-10-20 02:34:51 +02:00
2011-10-16 21:51:28 +02:00
2011-08-01 00:58:49 +02:00
2011-04-28 10:45:32 +02:00
2011-10-20 02:34:51 +02:00
2011-08-22 09:35:58 +02:00
2011-05-27 23:48:22 +02:00
2011-10-20 02:34:51 +02:00
2011-04-09 03:17:07 +02:00
2011-07-17 20:12:02 +02:00
2011-10-12 16:51:16 +02:00
2011-05-01 00:26:05 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-08-09 19:56:25 +02:00
2011-10-20 02:34:51 +02:00
2011-09-07 07:27:55 +02:00
2011-05-22 04:53:19 +02:00
2011-10-21 02:01:26 +02:00
2011-06-09 04:47:19 +02:00
2011-10-07 22:28:07 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-09-07 02:36:42 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-07-17 20:12:02 +02:00
2011-10-13 16:50:20 +02:00
2011-10-13 06:00:03 +02:00
2011-04-21 03:37:05 +02:00
2011-10-21 02:01:26 +02:00
2011-03-19 13:33:20 +00:00
2011-09-28 18:13:52 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-10-13 06:00:03 +02:00
2011-04-09 03:17:07 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-10-14 03:48:22 +02:00
2011-10-14 03:48:22 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-09-24 22:39:52 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-09-17 22:36:43 +02:00
2011-10-21 02:01:26 +02:00
2011-10-20 02:34:51 +02:00
2011-10-21 02:01:26 +02:00
2011-08-26 01:29:40 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-10-21 02:01:26 +02:00
2011-10-20 21:06:45 +02:00
2011-10-17 07:33:10 +02:00
2011-10-20 02:34:51 +02:00
2011-07-06 01:34:08 +02:00
2011-10-20 02:34:51 +02:00
2011-08-20 00:27:38 +02:00
2011-10-20 02:34:51 +02:00
2011-05-27 23:48:22 +02:00
2011-10-17 03:38:47 +02:00
2011-05-24 23:34:24 +02:00
2011-05-29 03:34:35 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-07-17 20:12:02 +02:00
2011-04-20 04:48:23 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-04-04 01:29:40 +02:00
2011-04-04 01:29:40 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-04-20 04:48:23 +02:00
2011-05-22 04:53:19 +02:00
2011-07-04 00:45:21 +02:00
2011-05-17 03:05:36 +02:00
2011-10-21 02:01:26 +02:00
2011-10-19 11:20:48 +02:00
2011-06-11 03:51:36 +02:00
2011-07-11 04:23:25 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-03-19 13:33:20 +00:00
2011-10-18 01:54:40 +02:00
2011-10-20 02:34:51 +02:00
2011-03-19 13:33:20 +00:00
2011-10-21 02:01:26 +02:00
2011-05-27 23:48:22 +02:00
2011-08-09 19:56:25 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-09-27 22:27:52 +02:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-10-13 06:00:03 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-06-05 03:00:31 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-09-26 13:51:29 +02:00
2011-10-21 02:01:26 +02:00
2011-10-05 04:07:59 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-06-02 20:06:00 +01:00
2011-03-19 13:33:20 +00:00
2011-10-20 13:06:16 -04:00
2011-10-20 20:57:23 +02:00
2011-10-20 02:34:51 +02:00
2011-10-18 01:54:40 +02:00
2011-05-13 04:40:40 +02:00
2011-04-24 03:41:22 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-10-13 06:00:03 +02:00
2011-09-24 22:39:52 +02:00
2011-04-06 19:30:42 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-09-17 22:36:43 +02:00
2011-10-13 16:50:20 +02:00
2011-03-19 13:33:20 +00:00
2011-10-13 06:00:03 +02:00
2011-10-20 02:34:51 +02:00
2011-07-14 20:44:58 +02:00
2011-10-20 02:34:51 +02:00
2011-04-15 04:50:06 +02:00
2011-10-20 02:34:51 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-07-04 00:45:21 +02:00
2011-07-03 03:14:10 +02:00
2011-09-23 00:35:31 +02:00
2011-10-18 01:54:40 +02:00
2011-09-27 02:14:37 +02:00
2011-04-24 03:41:22 +02:00
2011-09-08 22:37:31 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-24 03:41:22 +02:00
2011-06-03 05:19:30 +02:00
2011-04-24 03:41:22 +02:00
2011-04-24 03:41:22 +02:00
2011-05-13 04:40:40 +02:00
2011-04-24 03:41:22 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-04-24 03:41:22 +02:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-04-09 03:17:07 +02:00
2011-03-19 13:33:20 +00:00
2011-06-15 20:21:33 +02:00
2011-06-17 05:49:58 +02:00
2011-10-21 02:01:26 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-10-18 01:54:40 +02:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +02:00
2011-10-20 02:34:51 +02:00
2011-10-18 01:54:40 +02:00
2011-03-19 13:33:20 +00:00
2011-10-18 01:54:40 +02:00
2011-10-18 01:54:40 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-10-21 02:01:26 +02:00
2011-08-26 23:18:54 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-10-17 16:51:48 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-05-22 04:53:19 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-20 02:34:51 +02:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-05-30 02:39:26 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-04-12 03:48:21 +02:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-08-25 21:43:30 +02:00
2011-07-14 20:44:58 +02:00
2011-10-21 02:01:26 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-19 17:02:11 +02:00
2011-09-08 01:55:07 +02:00
2011-10-20 02:34:51 +02:00
2011-09-26 00:22:41 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
dd8ffc1925