Michael Niedermayer
244682dd08
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
log: Only include unistd.h if configure found it
ape: create audio stream before reading tags.
mov: make a length variable larger.
image2: Add "start_number" private option to the demuxer
image2: Add "start_number" private option to the muxer
avconv: remove a forgotten debugging printf.
avconv: use more descriptive names for hardcoded filters.
avconv: remove redundant handling of async.
doc/filters: fix typo.
h264: use asm cabac reader under a generic condition
Conflicts:
ffmpeg.c
libavformat/img2dec.c
libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-24 21:34:54 +02:00
2012-06-22 22:34:02 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2012-06-11 21:12:39 +02:00
2012-06-08 23:59:09 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2012-06-24 02:09:53 +02:00
2012-02-04 20:27:02 +01:00
2011-11-23 04:02:17 +01:00
2011-12-22 01:51:53 +01:00
2011-11-23 04:02:17 +01:00
2012-06-17 18:05:31 +02:00
2012-04-20 09:43:11 -04:00
2012-04-20 09:43:11 -04:00
2012-06-10 21:34:15 +02:00
2012-06-18 20:07:00 +02:00
2011-05-22 04:53:19 +02:00
2011-11-07 03:01:43 +01:00
2011-12-13 00:39:48 +01:00
2012-06-24 12:34:12 +02:00
2012-01-22 23:06:04 +01:00
2011-11-23 04:02:17 +01:00
2012-06-14 13:54:00 +02:00
2012-06-07 22:28:32 +02:00
2011-12-13 00:39:48 +01:00
2011-03-19 13:33:20 +00:00
2012-05-25 02:41:28 +02:00
2012-06-24 02:09:53 +02:00
2012-06-24 12:34:12 +02:00
2011-03-19 13:33:20 +00:00
2011-12-05 00:11:57 +01:00
2012-01-29 00:34:59 +01:00
2012-06-20 20:47:46 +02:00
2011-09-21 21:25:43 +02:00
2011-11-07 03:01:43 +01:00
2012-03-20 00:03:19 +01:00
2012-06-11 23:57:01 +02:00
2012-06-11 23:57:01 +02:00
2012-04-01 11:01:08 +02:00
2011-12-12 01:25:37 +01:00
2012-05-15 18:08:32 +02:00
2012-05-15 18:08:32 +02:00
2012-06-22 22:34:02 +02:00
2011-10-16 21:51:28 +02:00
2012-06-19 20:53:27 +02:00
2012-06-19 20:53:27 +02:00
2012-04-13 18:40:17 +02:00
2011-11-23 04:02:17 +01:00
2012-06-06 20:01:08 +02:00
2011-06-28 13:14:46 +02:00
2012-06-17 18:05:31 +02:00
2012-01-29 00:34:59 +01:00
2011-12-12 01:25:37 +01:00
2011-12-11 18:47:19 +00:00
2011-11-23 04:02:17 +01:00
2011-06-18 05:10:38 +02:00
2011-06-08 05:25:28 +02:00
2012-04-04 21:17:52 +02:00
2011-07-04 00:45:21 +02:00
2012-06-09 02:51:02 +02:00
2012-06-11 21:12:39 +02:00
2011-07-12 01:42:32 +02:00
2011-03-19 13:33:20 +00:00
2012-06-24 21:34:54 +02:00
2012-06-19 17:22:02 +02:00
2012-03-26 13:00:09 +02:00
2011-12-31 16:31:15 +01:00
2012-06-24 12:34:12 +02:00
2012-06-06 20:00:35 +02:00
2012-06-22 16:10:42 +02:00
2012-06-16 12:47:46 +02:00
2012-01-29 00:34:59 +01:00
2012-06-19 20:53:27 +02:00
2011-12-25 18:55:43 +01:00
2012-06-07 22:13:59 +02:00
2012-06-07 22:13:59 +02:00
2012-06-20 20:47:46 +02:00
2012-05-18 00:38:06 +02:00
2011-06-29 23:49:03 +01:00
2011-06-29 23:49:03 +01:00
2012-06-08 10:42:27 +00:00
2012-03-21 19:01:39 +01:00
2012-05-24 00:42:31 +02:00
2012-06-22 22:48:00 +02:00
2012-06-11 12:19:11 +02:00
2011-11-23 04:02:17 +01:00
2012-03-26 13:00:09 +02:00
2011-11-23 04:02:17 +01:00
2011-03-19 13:33:20 +00:00
2011-06-24 03:07:04 +02:00
2012-05-10 02:25:41 +02:00
2012-05-10 02:25:41 +02:00
2012-02-14 01:53:31 +01:00
2011-11-23 04:02:17 +01:00
2011-05-11 13:43:30 +02:00
2011-05-11 13:43:30 +02:00
2012-06-22 22:34:02 +02:00
2012-06-22 22:34:02 +02:00
2012-02-03 00:56:27 +01:00
2012-06-04 07:41:22 +02:00
2012-01-06 02:45:12 +01:00
2012-06-10 00:37:02 +02:00
2011-12-05 00:11:57 +01:00
2012-05-20 16:19:36 +02:00
2011-12-22 03:01:17 +01:00
2012-06-24 12:34:12 +02:00
2011-03-19 13:33:20 +00:00
244682dd08