Michael Niedermayer 9400603140 Merge commit '9f17685dfb70a73823aca16ad246ee3b831d1de8'
* commit '9f17685dfb70a73823aca16ad246ee3b831d1de8':
  avcodec: Deprecate unused defines and options

Conflicts:
	doc/APIchanges
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-03 20:53:00 +02:00
..
2014-07-20 02:01:50 +02:00
2014-07-20 23:58:36 +02:00
2014-06-03 10:58:19 -08:00
2014-05-23 23:30:21 +02:00
2014-07-08 02:11:19 +02:00
2014-05-28 03:52:50 +02:00
2014-07-20 23:58:36 +02:00
2013-08-29 22:52:04 +02:00
2014-07-17 11:29:01 +02:00