* commit 'acb571c8':
  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>