Merge commit '1a89025793ca73d9685a8ce8e3194efa64dd6844'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 22:04:13 +0000 (23:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 22:04:26 +0000 (23:04 +0100)
* commit '1a89025793ca73d9685a8ce8e3194efa64dd6844':
  mpeg4videodec: move MpegEncContext.vol_sprite_usage to Mpeg4DecContext

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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge