From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 30 Nov 2013 03:02:11 +0000 (+0100)
Subject: Merge commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=aeead427896a632c09c13c2b90ba096bf8678ef1;p=ffmpeg

Merge commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5'

* commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5':
  mpeg4videodec: remove a write-only variable from MpegEncContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

aeead427896a632c09c13c2b90ba096bf8678ef1