ffmpeg/libavcodec
Michael Niedermayer b18e17eabf Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
  utils: Check for extradata size overflows.
  ARM: rv34: fix asm syntax in dc transform functions
  avio: Fix the value of the deprecated URL_FLAG_NONBLOCK
  rv34: fix and optimise frame dependency checking
  rv34: NEON optimised dc only inverse transform
  avprobe: use avio_size() instead of deprecated AVFormatContext.file_size.
  ffmenc: remove references to deprecated AVFormatContext.timestamp.
  lavf: undeprecate read_seek().
  avserver: remove code using deprecated CODEC_CAP_PARSE_ONLY.
  lavc: replace some remaining FF_I_TYPE with AV_PICTURE_TYPE_I
  lavc: ifdef out parse_only AVOption
  nellymoserdec: SAMPLE_FMT -> AV_SAMPLE_FMT
  mpegvideo_enc: ifdef out/replace references to deprecated codec flags.
  riff: remove references to sonic codec ids
  indeo4: add some missing static and const qualifiers
  rv34: DC-only inverse transform
  avconv: use AVFrame.width/height/format instead of corresponding AVCodecContext fields
  lavfi: move version macros to a new installed header version.h
  vsrc_buffer: release the buffer on uninit.
  rgb2rgb: rgb12tobgr12()
  ...

Conflicts:
	avconv.c
	doc/APIchanges
	ffprobe.c
	libavfilter/Makefile
	libavfilter/avfilter.h
	libswscale/rgb2rgb.c
	libswscale/rgb2rgb.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-13 01:29:48 +01:00
..
2011-06-02 20:06:00 +01:00
2011-11-27 21:19:07 +01:00
2011-04-17 23:43:54 +02:00
2011-11-25 13:19:54 +00:00
2012-01-03 16:28:17 -05:00
2011-03-28 00:16:44 +02:00
2011-05-05 03:30:24 +02:00
2011-04-11 23:39:12 +02:00
2011-11-06 09:37:34 +01:00
2011-09-16 05:53:14 +02:00
2012-01-12 16:32:55 +01:00
2012-01-11 21:29:25 +01:00
2011-11-12 20:01:05 +01:00
2011-05-13 04:40:40 +02:00
2011-05-13 04:40:40 +02:00
2011-11-12 20:01:50 +01:00
2011-12-28 22:05:24 +01:00
2011-04-26 22:06:13 +02:00
2011-11-12 20:05:35 +01:00
2011-10-30 21:50:17 +01:00
2011-10-30 21:50:17 +01:00
2011-12-30 20:00:53 +01:00
2011-11-05 00:02:31 +01:00
2011-12-11 00:32:25 +01:00
2011-11-05 00:02:38 +01:00
2011-11-12 20:07:31 +01:00
2011-12-10 11:58:03 +01:00
2011-12-19 16:30:30 +01:00
2011-04-27 03:51:04 +02:00
2011-11-09 23:10:07 +01:00
2011-10-10 02:58:18 +02:00
2011-09-24 21:11:01 +02:00
2011-12-30 20:00:53 +01:00
2011-09-25 21:16:55 +02:00
2012-01-11 08:56:24 -05:00
2012-01-11 08:56:24 -05:00
2011-11-05 15:37:02 +01:00
2011-11-05 15:37:02 +01:00
2011-12-23 05:58:32 +01:00
2011-08-30 05:41:44 +02:00
2011-10-21 01:00:41 -07:00
2011-05-11 05:47:02 +02:00
2011-10-21 01:00:41 -07:00
2011-05-24 01:31:53 +02:00
2012-01-12 16:32:55 +01:00
2012-01-12 16:32:55 +01:00
2011-07-21 18:10:58 +01:00
2011-09-08 05:34:17 +02:00
2011-11-13 15:43:09 +01:00
2011-11-24 15:39:41 +01:00
2012-01-07 00:11:43 +01:00
2012-01-12 16:32:55 +01:00
2011-12-17 05:04:56 +01:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-12-13 15:46:23 +01:00
2011-05-21 13:48:10 +02:00
2012-01-08 20:22:17 +01:00
2011-11-11 18:40:19 +01:00
2011-12-30 20:00:53 +01:00
2012-01-07 19:23:21 +01:00
2011-12-30 20:00:53 +01:00
2011-11-12 20:15:21 +01:00
2011-12-13 20:01:49 +01:00
2011-04-03 16:40:12 +02:00
2012-01-12 17:02:13 +01:00
2011-10-27 15:27:32 +02:00
2011-11-12 20:15:56 +01:00
2011-12-13 21:08:43 +01:00
2012-01-12 09:52:33 +01:00
2012-01-12 09:52:33 +01:00
2011-12-30 20:00:53 +01:00
2011-03-28 00:16:44 +02:00
2011-12-23 11:39:41 +01:00
2011-12-02 03:23:07 +01:00
2012-01-11 18:14:13 +01:00
2012-01-11 18:14:13 +01:00
2011-12-13 19:54:31 +01:00
2011-10-19 20:26:55 +02:00
2011-12-01 18:46:22 +01:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-01-03 23:52:28 +01:00
2011-04-20 04:48:23 +02:00
2011-11-12 20:49:53 +01:00