eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-16 20:10:09 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
c0445df5b35947cf40abcb15ce6b39e404e20799
ffmpeg/libavformat/flvdec.c
Michael Niedermayer ec203cd69b 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>
2013-03-02 11:41:31 +01:00

33 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink