[FFmpeg-cvslog] Merge commit 'c9be276f8b040e7d441a77f774afe94b6f137be6' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 15:54:30 2014 +0200| [8e5a02151227f1fc4639c2047ba0059a2dba243d] | committer: Michael Niedermayer

Merge commit 'c9be276f8b040e7d441a77f774afe94b6f137be6' into release/1.1

* commit 'c9be276f8b040e7d441a77f774afe94b6f137be6':
  mpegvideo: set reference/pict_type on generated reference frames

Conflicts:
	libavcodec/mpegvideo.c

See: 532b93b51631ee58443bee8aec7c2a2b2a1746be
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8e5a02151227f1fc4639c2047ba0059a2dba243d
---