Files
ffmpeg/libavcodec
Michael Niedermayer 13795dbb64 Merge commit '6d97484d72e33f7dde9493a9ead1a72e2f029605'
* commit '6d97484d72e33f7dde9493a9ead1a72e2f029605':
  avcodec: av_log_ask_for_sample() ---> avpriv_request_sample()
  rsodec: Use avpriv_report_missing_feature() where appropriate

Conflicts:
	libavcodec/anm.c
	libavcodec/mlpdec.c
	libavcodec/pictordec.c
	libavcodec/sunrast.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-14 12:52:12 +01:00
..
2013-02-21 23:06:30 +01:00
2013-03-13 15:07:46 +01:00
2013-03-06 22:11:46 +01:00
2013-01-21 10:24:45 +00:00
2013-03-06 22:11:46 +01:00
2013-01-14 22:59:05 +01:00
2013-01-14 22:59:05 +01:00
2013-01-09 01:08:39 +01:00
2012-12-21 00:18:34 +01:00
2013-01-21 10:24:45 +00:00
2012-11-30 15:00:35 +00:00
2012-12-05 19:31:27 +01:00
2013-03-06 10:31:56 +00:00
2013-03-02 20:39:38 +01:00
2012-12-08 01:13:07 +00:00
2012-12-08 01:13:07 +00:00
2012-12-31 00:41:35 +01:00
2013-01-23 19:39:42 +01:00
2013-01-23 19:39:42 +01:00
2013-03-05 03:29:04 +01:00
2013-01-24 01:47:20 +01:00
2012-11-28 16:21:25 +00:00
2013-02-03 13:08:36 +01:00
2013-01-12 14:06:30 +01:00
2013-03-13 09:13:54 +01:00
2013-01-14 22:59:05 +01:00
2013-01-14 22:59:05 +01:00
2013-01-06 16:30:02 +01:00
2012-12-09 22:01:00 +00:00
2012-12-09 22:01:00 +00:00
2012-12-09 22:01:00 +00:00
2013-03-13 14:35:48 +01:00
2013-03-13 14:35:48 +01:00
2012-12-22 00:58:08 +01:00
2012-12-22 00:58:08 +01:00