Merge commit 'c2f7417eeb9cc31f75e71f7be2780f90f1628d7e'

* commit 'c2f7417eeb9cc31f75e71f7be2780f90f1628d7e':
  vc1: move MpegEncContext.resync_marker into VC1Context.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/dxva2_vc1.c
Simple merge

diff --cc libavcodec/mss2.c
Simple merge

diff --cc libavcodec/vaapi_vc1.c
Simple merge

diff --cc libavcodec/vc1.c
Simple merge

diff --cc libavcodec/vc1.h
Simple merge

diff --cc libavcodec/vdpau_vc1.c
Simple merge