* commit '58c120a9290eef057dbf26761a4f89b7f67bbde1': mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContext Merged-by: Michael Niedermayer <michaelni@gmx.at>