Merge commit 'e026ee0446de27fc38e33e98704fada012fdc763'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 03:40:46 +0000 (04:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 03:40:51 +0000 (04:40 +0100)
commitf09f295109b3d333ecd97f4c200fd543add0e416
treef341a71dd6581ef5ec27628250c1ebacb45e2055
parent7f18cb9101e4e1921fd0a5cfe72fbdb69ac9bf8a
parente026ee0446de27fc38e33e98704fada012fdc763
Merge commit 'e026ee0446de27fc38e33e98704fada012fdc763'

* commit 'e026ee0446de27fc38e33e98704fada012fdc763':
  mpeg4videodec: move sprite_{shift,traj} from MpegEncContext to Mpeg4DecContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg4video.h
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.h
libavcodec/vaapi_mpeg4.c