FFmpeg/libavcodec
Michael Niedermayer 1667152a9c Merge commit 'acb571c89a065d943163c11efb46de35774f1909'
* commit 'acb571c89a065d943163c11efb46de35774f1909':
  avcodec: bump minor for adaptive h264 frame-mt
  avconv: pass the actually selected decoder to filter_codec_opts().

Conflicts:
	Changelog
	ffmpeg_opt.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20 02:44:22 +01:00
..
2012-11-26 11:17:17 -05:00
2012-12-17 01:35:14 +01:00
2012-11-24 10:56:47 +00:00
2012-11-24 10:56:47 +00:00
2012-12-14 20:58:01 +01:00
2012-11-23 15:52:12 +01:00
2012-12-06 19:09:48 +00:00
2012-12-14 01:13:21 +01:00
2012-11-30 15:00:35 +00:00
2012-12-08 01:13:07 +00:00
2012-11-07 18:08:23 +01:00
2012-12-19 21:46:11 +01:00
2012-12-11 20:17:30 +11:00
2012-11-23 18:10:02 +01:00
2012-12-05 19:31:27 +01:00
2012-12-08 01:13:07 +00:00
2012-12-08 01:13:07 +00:00
2012-12-12 17:46:05 +01:00
2012-12-18 01:58:17 +01:00
2012-12-14 00:31:18 +01:00
2012-12-15 11:46:30 +01:00
2012-11-28 16:21:25 +00:00
2012-11-04 23:35:09 +00:00
2012-12-17 20:37:54 +11: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
2012-12-10 11:19:42 -05:00