Merge remote-tracking branch 'flyingrat/ffmpeg-n1.2' into fernet-ffmpeg-2

Conflicts:
	lib/ffmpeg/configure
	lib/ffmpeg/libavcodec/Makefile
	lib/ffmpeg/libavcodec/allcodecs.c
	lib/ffmpeg/libavcodec/h264.c
	lib/ffmpeg/libavcodec/mpegvideo.c
	lib/ffmpeg/libavutil/pixdesc.c
	lib/ffmpeg/libavutil/pixfmt.h
ffmpeg: fix merge (squash me)
xvba: fix merge of ffmpeg 1.2