[FFmpeg-devel] [PATCH 2/2] avcodec/mpegvideo: Check pointer when allocation fail

[Roman Savchenko]

---
 libavcodec/mpegvideo.c | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 11d6729..bd47203 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -1044,11 +1044,14 @@ do {\
 
 if (s1->bitstream_buffer) {
 if (s1->bitstream_buffer_size +
-FF_INPUT_BUFFER_PADDING_SIZE > s->allocated_bitstream_buffer_size)
+FF_INPUT_BUFFER_PADDING_SIZE > s->allocated_bitstream_buffer_size) 
{
 av_fast_malloc(&s->bitstream_buffer,
&s->allocated_bitstream_buffer_size,
s1->allocated_bitstream_buffer_size);
-s->bitstream_buffer_size = s1->bitstream_buffer_size;
+if (!s->bitstream_buffer)
+return AVERROR(ENOMEM);
+}
+s->bitstream_buffer_size = s1->bitstream_buffer_size;
 memcpy(s->bitstream_buffer, s1->bitstream_buffer,
s1->bitstream_buffer_size);
 memset(s->bitstream_buffer + s->bitstream_buffer_size, 0,
-- 
1.9.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH 1/2] avformat/avienc: Correct possible dereference of null

[Roman Savchenko]

---
 libavformat/avienc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index fb2cdd2..62d84d5 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -386,6 +386,8 @@ static int avi_write_header(AVFormatContext *s)
 t = NULL;
 if (langstr) {
 char* str = av_asprintf("Subtitle - %s-xx;02", langstr);
+if (!str)
+return AVERROR(ENOMEM);
 ff_riff_write_info_tag(s->pb, "strn", str);
 av_free(str);
 }
-- 
1.9.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] Creating stereo 3d movie

[Roman Savchenko]

Hi All,

could anyone please share any information about how to create stereo 3d
movie with ffmpeg library? Examples will be very nice.

Many thanks,
Roman
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel