[FFmpeg-cvslog] Merge commit 'ff953fecffd3b9a616a046723fb9d4690be032a6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec  5 15:52:16 2012 +0100| [2f980cf39a14f90b9356b51ef1ed6e7816f6aac3] | committer: Michael Niedermayer

Merge commit 'ff953fecffd3b9a616a046723fb9d4690be032a6'

* commit 'ff953fecffd3b9a616a046723fb9d4690be032a6':
  lavc: set frame properties in ff_get_buffer().

Conflicts:
	libavcodec/utils.c

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

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