Merge commit 'a5a71992cae34b321ceb8374f44ce17a945a3881'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 22:53:57 +0000 (23:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 22:55:00 +0000 (23:55 +0100)
commit26b526e776a4ee7b88775f12c75b0a87fcc0e8e4
treef736f167b26a1e4da7a949bc7c41a6140d52c6c3
parentf5d6541ba0d279955a2df798646e30370d85458a
parenta5a71992cae34b321ceb8374f44ce17a945a3881
Merge commit 'a5a71992cae34b321ceb8374f44ce17a945a3881'

* commit 'a5a71992cae34b321ceb8374f44ce17a945a3881':
  mpeg4videoenc: don't set MpegEncContext.resync_marker

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg4videoenc.c