Merge commit 'ee8af2dd99dcb7a01a667deedec81d1aa2a00d72'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 21:35:52 +0000 (22:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 21:35:52 +0000 (22:35 +0100)
commitad13b8ca9bf5a5cad9cbd4bb36dcd3134d2a2019
tree43a9d022b3843dd8e4762b9ec777800f7cfcad8d
parentbe0b869b04c049ea00fd178bb4c4fe4b767ed31d
parentee8af2dd99dcb7a01a667deedec81d1aa2a00d72
Merge commit 'ee8af2dd99dcb7a01a667deedec81d1aa2a00d72'

* commit 'ee8af2dd99dcb7a01a667deedec81d1aa2a00d72':
  mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContext

Conflicts:
libavcodec/h263dec.c
libavcodec/mpeg4videodec.c

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