Michael Niedermayer f5f3684fb8 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavf: simplify is_intra_only() by using codec descriptors.
  lavc: add an intra-only codec property.
  lavc: add codec descriptors.
  lavc: fix mixing CODEC_ID/AV_CODEC_ID in C++ code.
  dict: move struct AVDictionary definition to dict.c
  dict: add av_dict_count()

Conflicts:
	doc/APIchanges
	libavcodec/old_codec_ids.h
	libavformat/utils.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-11 15:01:45 +02:00
..
2012-07-28 18:16:55 +02:00
2012-01-28 11:04:19 +01:00
2012-05-22 00:39:53 +02:00
2012-06-18 09:38:36 +02:00
2012-08-09 01:03:05 +02:00
2012-05-25 17:27:40 +02:00
2012-03-13 01:14:04 +01:00
2012-07-22 12:48:57 +02:00
2012-03-20 11:10:25 +00:00