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