[FFmpeg-cvslog] Merge commit 'feded990e3ef9af4a0b827d5b6d8fe86f0b94942'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan  4 00:16:08 2014 +0100| [532b93b51631ee58443bee8aec7c2a2b2a1746be] | committer: Michael Niedermayer

Merge commit 'feded990e3ef9af4a0b827d5b6d8fe86f0b94942'

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

Conflicts:
	libavcodec/mpegvideo.c

The picture type is left at P type as it was explicitly set before

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

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