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)
* commit 'a5a71992cae34b321ceb8374f44ce17a945a3881':
  mpeg4videoenc: don't set MpegEncContext.resync_marker

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

Simple merge