FFmpeg/libavcodec
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-11 21:40:43 +02:00
2012-06-21 01:30:16 +00:00
2012-06-18 21:44:22 +02:00
2012-06-23 01:38:47 +02:00
2012-06-22 22:47:33 +00:00
2012-06-20 21:07:27 +00:00
2012-06-14 15:48:43 +00:00
2012-06-07 21:31:22 +02:00
2012-06-07 21:32:32 +02:00
2012-06-07 21:07:17 +02:00
2012-06-18 21:44:48 +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-21 11:47:00 +02:00
2012-06-20 18:19:53 +02:00
2012-06-24 20:20:23 +02:00
2012-06-19 21:38:18 +02:00
2012-06-17 17:09:34 +02:00
2012-06-06 21:18:14 +02:00
2012-06-10 23:36:22 +02:00
2012-06-24 20:18:00 +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-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-07 18:01:09 +02:00
2012-06-10 15:40:24 +02:00
2012-06-21 01:30:16 +00:00
2012-06-21 01:23:15 +00:00
2012-06-17 19:50:58 +02:00
2012-06-06 21:18:47 +02:00