Merge commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Mar 2013 10:41:31 +0000 (11:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Mar 2013 10:41:31 +0000 (11:41 +0100)
commitec203cd69b57e298e6735e041fb5a2a0c880b44c
treed53b453b87f4add82711a578bc2bc703ae193744
parent973dc110ba0ace5ecc57a01b3f6a44d58cd8079c
parente671d3ad6cd7fe1d02e9b35b889a25d8c059fce9
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@gmx.at>
libavcodec/h264.c
libavformat/flvdec.c