Merge commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 00:45:25 +0000 (01:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 00:46:51 +0000 (01:46 +0100)
commitcf948200bd7083fb214bf7e1bd9ce3c82edd3303
treedb6dca355dee94aace3fc88106314260ec88534d
parent36e2ec40688d0c3c350d31fae00a54f6a23b7647
parentff7ffe48097f32417781fe8b2b417eff05a52c55
Merge commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55'

* commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55':
  mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContext

Conflicts:
libavcodec/mpeg4videodec.c

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