ffmpeg/libavformat
Michael Niedermayer 1889c6724a Merge remote-tracking branch 'qatar/master'
* qatar/master:
  AVOptions: fix av_set_string3() doxy to match reality.
  cmdutils: get rid of dummy contexts for examining AVOptions.
  lavf,lavc,sws: add {avcodec,avformat,sws}_get_class() functions.
  AVOptions: add AV_OPT_SEARCH_FAKE_OBJ flag for av_opt_find().
  cpu detection: avoid a signed overflow

Conflicts:
	avconv.c
	cmdutils.c
	doc/APIchanges
	ffmpeg.c
	libavcodec/options.c
	libavcodec/version.h
	libavformat/version.h
	libavutil/avutil.h

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