Merge commit '35e0833d410e31d9fd35695ad798c5d13de2af58'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 21:27:28 +0000 (22:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 21:27:28 +0000 (22:27 +0100)
commitbe0b869b04c049ea00fd178bb4c4fe4b767ed31d
tree2f0ae8973b9cc3a5a1fbec3a47828570e83b7d67
parentf924d6e40b269158ff54f5b5a6f08ae3fdefbd5c
parent35e0833d410e31d9fd35695ad798c5d13de2af58
Merge commit '35e0833d410e31d9fd35695ad798c5d13de2af58'

* commit '35e0833d410e31d9fd35695ad798c5d13de2af58':
  mpeg4videodec: add a mpeg4-specific private context.

Conflicts:
libavcodec/mpeg4video_parser.c
libavcodec/mpeg4videodec.c

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