Merge commit 'e41ff4210ac1192c62de3052b33a38c7bcf772f2'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 00:14:46 +0000 (01:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 00:14:46 +0000 (01:14 +0100)
commit92e10e34b1422423715bbfadfcd19b045f63dbcc
tree397c5fe54835f043d6bc40bce7fb1e02b13c034e
parent56572787ae2d7e113e36d5347b3d7263b35bdf98
parente41ff4210ac1192c62de3052b33a38c7bcf772f2
Merge commit 'e41ff4210ac1192c62de3052b33a38c7bcf772f2'

* commit 'e41ff4210ac1192c62de3052b33a38c7bcf772f2':
  mpeg4videodec: move use_intra_dc_vlc from MpegEncContext to Mpeg4DecContext

Conflicts:
libavcodec/mpeg4videodec.c

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