Merge commit 'c2f7417eeb9cc31f75e71f7be2780f90f1628d7e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 23:48:01 +0000 (00:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 23:49:34 +0000 (00:49 +0100)
* commit 'c2f7417eeb9cc31f75e71f7be2780f90f1628d7e':
  vc1: move MpegEncContext.resync_marker into VC1Context.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/dxva2_vc1.c
libavcodec/mss2.c
libavcodec/vaapi_vc1.c
libavcodec/vc1.c
libavcodec/vc1.h
libavcodec/vdpau_vc1.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge