diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-02 14:41:31 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-02 14:41:31 +0400 |
| commit | ec203cd69b57e298e6735e041fb5a2a0c880b44c (patch) | |
| tree | d53b453b87f4add82711a578bc2bc703ae193744 /libavformat | |
| parent | 973dc110ba0ace5ecc57a01b3f6a44d58cd8079c (diff) | |
| parent | e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9 (diff) | |
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 'libavformat')
| -rw-r--r-- | libavformat/flvdec.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 482e876d6e..d0511f1582 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -212,10 +212,14 @@ static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int flv_co vcodec->codec_id = AV_CODEC_ID_VP6A; if (read) { if (vcodec->extradata_size != 1) { - vcodec->extradata_size = 1; vcodec->extradata = av_malloc(1 + FF_INPUT_BUFFER_PADDING_SIZE); + if (vcodec->extradata) + vcodec->extradata_size = 1; } - vcodec->extradata[0] = avio_r8(s->pb); + if (vcodec->extradata) + vcodec->extradata[0] = avio_r8(s->pb); + else + avio_skip(s->pb, 1); } return 1; // 1 byte body size adjustment for flv_read_packet() case FLV_CODECID_H264: |