Merge commit '58c120a9290eef057dbf26761a4f89b7f67bbde1'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 03:21:45 +0000 (04:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 03:23:43 +0000 (04:23 +0100)
commitae4e7f7ba603a1624d4aaeee2c368677739b7322
tree29ea5c72f1e2be65b88f16a5974d7e50851cb594
parentb27ba2e540b873fe8e50280a734194ada002a077
parent58c120a9290eef057dbf26761a4f89b7f67bbde1
Merge commit '58c120a9290eef057dbf26761a4f89b7f67bbde1'

* commit '58c120a9290eef057dbf26761a4f89b7f67bbde1':
  mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContext

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