[FFmpeg-cvslog] avformat/ffmdec: Check ffio_set_buf_size() return value
ffmpeg | branch: release/2.4 | Michael Niedermayer michae...@gmx.at | Sun Jun 7 14:55:10 2015 +0200| [8fc8b3eebe95aa0c810b6ceacf41d54b785d0589] | committer: Michael Niedermayer avformat/ffmdec: Check ffio_set_buf_size() return value Signed-off-by: Michael Niedermayer michae...@gmx.at (cherry picked from commit dc55477a64cefebf8dcc611f026be71382814ae2) Signed-off-by: Michael Niedermayer michae...@gmx.at http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8fc8b3eebe95aa0c810b6ceacf41d54b785d0589 --- libavformat/ffmdec.c |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index 5c40539..2753f2c 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -95,7 +95,9 @@ static int ffm_read_data(AVFormatContext *s, retry_read: if (pb-buffer_size != ffm-packet_size) { int64_t tell = avio_tell(pb); -ffio_set_buf_size(pb, ffm-packet_size); +int ret = ffio_set_buf_size(pb, ffm-packet_size); +if (ret 0) +return ret; avio_seek(pb, tell, SEEK_SET); } id = avio_rb16(pb); /* PACKET_ID */ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/ffmdec: Check ffio_set_buf_size() return value
ffmpeg | branch: release/2.5 | Michael Niedermayer michae...@gmx.at | Sun Jun 7 14:55:10 2015 +0200| [057d6e1cd62055c58db1087b553e6beb871509ab] | committer: Michael Niedermayer avformat/ffmdec: Check ffio_set_buf_size() return value Signed-off-by: Michael Niedermayer michae...@gmx.at (cherry picked from commit dc55477a64cefebf8dcc611f026be71382814ae2) Signed-off-by: Michael Niedermayer michae...@gmx.at http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=057d6e1cd62055c58db1087b553e6beb871509ab --- libavformat/ffmdec.c |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index 33bbde0..57df43b 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -98,7 +98,9 @@ static int ffm_read_data(AVFormatContext *s, retry_read: if (pb-buffer_size != ffm-packet_size) { int64_t tell = avio_tell(pb); -ffio_set_buf_size(pb, ffm-packet_size); +int ret = ffio_set_buf_size(pb, ffm-packet_size); +if (ret 0) +return ret; avio_seek(pb, tell, SEEK_SET); } id = avio_rb16(pb); /* PACKET_ID */ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/ffmdec: Check ffio_set_buf_size() return value
ffmpeg | branch: release/2.6 | Michael Niedermayer michae...@gmx.at | Sun Jun 7 14:55:10 2015 +0200| [e21db6e3399ff875828a51d028a4e55814ca09f6] | committer: Michael Niedermayer avformat/ffmdec: Check ffio_set_buf_size() return value Signed-off-by: Michael Niedermayer michae...@gmx.at (cherry picked from commit dc55477a64cefebf8dcc611f026be71382814ae2) Signed-off-by: Michael Niedermayer michae...@gmx.at http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e21db6e3399ff875828a51d028a4e55814ca09f6 --- libavformat/ffmdec.c |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index 33bbde0..57df43b 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -98,7 +98,9 @@ static int ffm_read_data(AVFormatContext *s, retry_read: if (pb-buffer_size != ffm-packet_size) { int64_t tell = avio_tell(pb); -ffio_set_buf_size(pb, ffm-packet_size); +int ret = ffio_set_buf_size(pb, ffm-packet_size); +if (ret 0) +return ret; avio_seek(pb, tell, SEEK_SET); } id = avio_rb16(pb); /* PACKET_ID */ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/ffmdec: Check ffio_set_buf_size() return value
ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Sun Jun 7 14:55:10 2015 +0200| [dc55477a64cefebf8dcc611f026be71382814ae2] | committer: Michael Niedermayer avformat/ffmdec: Check ffio_set_buf_size() return value Signed-off-by: Michael Niedermayer michae...@gmx.at http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dc55477a64cefebf8dcc611f026be71382814ae2 --- libavformat/ffmdec.c |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index 7c0f451..9b50c9f 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -98,7 +98,9 @@ static int ffm_read_data(AVFormatContext *s, retry_read: if (pb-buffer_size != ffm-packet_size) { int64_t tell = avio_tell(pb); -ffio_set_buf_size(pb, ffm-packet_size); +int ret = ffio_set_buf_size(pb, ffm-packet_size); +if (ret 0) +return ret; avio_seek(pb, tell, SEEK_SET); } id = avio_rb16(pb); /* PACKET_ID */ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog