Merge commit '3f47d316cda9037024ffbc76f789332e62b729bc'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jan 2013 14:46:35 +0000 (15:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jan 2013 14:46:39 +0000 (15:46 +0100)
* commit '3f47d316cda9037024ffbc76f789332e62b729bc':
  mpegvideo_enc: do not modify the input frame.

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

Simple merge