[FFmpeg-cvslog] Merge commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar  2 11:41:31 2013 +0100| [ec203cd69b57e298e6735e041fb5a2a0c880b44c] | committer: Michael Niedermayer

Merge commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9'

* commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9':
  h264: do not copy ref count/ref2frm when updating per-frame context
  flvdec: Check the return value of a malloc

Conflicts:
	libavformat/flvdec.c

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

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