diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-02 11:41:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-02 11:41:31 +0100 |
| commit | ec203cd69b57e298e6735e041fb5a2a0c880b44c (patch) | |
| tree | d53b453b87f4add82711a578bc2bc703ae193744 /cmdutils.c | |
| parent | 973dc110ba0ace5ecc57a01b3f6a44d58cd8079c (diff) | |
| parent | e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9 (diff) | |
| download | ffmpeg-ec203cd69b57e298e6735e041fb5a2a0c880b44c.tar.gz | |
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>
Diffstat (limited to 'cmdutils.c')
0 files changed, 0 insertions, 0 deletions