OSDN Git Service

Merge commit 'f7d228676cb7669059889c4225c8a8dc56708c24'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 00:38:55 +0000 (01:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 00:38:55 +0000 (01:38 +0100)
commit36e2ec40688d0c3c350d31fae00a54f6a23b7647
tree80cf0550bc36f8b772d1cfbc83b1ea48e988ac45
parentdb7580b4f6b2217917aa6f372e3a18dfca43624a
parentf7d228676cb7669059889c4225c8a8dc56708c24
Merge commit 'f7d228676cb7669059889c4225c8a8dc56708c24'

* commit 'f7d228676cb7669059889c4225c8a8dc56708c24':
  mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContext

Conflicts:
libavcodec/mpeg4videodec.c

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