Mercurial > mxe-octave
view src/of-video-1-fixes.patch @ 4076:7c123db86666
of-video: fix crash in of-video
* src/of-video-1-fixes.patch: update patch for using av_malloc
author | John Donoghue |
---|---|
date | Fri, 08 Jan 2016 13:54:13 -0500 |
parents | 03ed5810b068 |
children |
line wrap: on
line source
diff -ur video-1.2.1.orig/src/AVHandler.cc video-1.2.1/src/AVHandler.cc --- video-1.2.1.orig/src/AVHandler.cc 2016-01-06 12:44:20.588188244 -0500 +++ video-1.2.1/src/AVHandler.cc 2016-01-08 08:40:05.511829573 -0500 @@ -560,7 +560,7 @@ } // XXX FIXME XXX What is the best size for video_outbuf? - video_outbuf = (uint8_t *)malloc(VIDEO_OUTBUF_SIZE); + video_outbuf = (uint8_t *)av_malloc(VIDEO_OUTBUF_SIZE); return 0; } diff -ur video-1.2.1.orig/src/oct-avifile.cc video-1.2.1/src/oct-avifile.cc --- video-1.2.1.orig/src/oct-avifile.cc 2016-01-06 12:44:20.588188244 -0500 +++ video-1.2.1/src/oct-avifile.cc 2016-01-08 08:38:22.357487990 -0500 @@ -57,6 +57,14 @@ } void +Avifile::print(std::ostream& os, bool pr_as_read_syntax) +{ + os << "AVI movie [" << filename << "][" << av->get_codec() << "]: " + << frames << " frame" << (frames != 1 ? "s" : "") << ", " + << frame_rows << "x" << frame_columns << "\n"; +} + +void Avifile::addframe(const NDArray &f) { if (frames == 0) diff -ur video-1.2.1.orig/src/oct-avifile.h video-1.2.1/src/oct-avifile.h --- video-1.2.1.orig/src/oct-avifile.h 2016-01-06 12:44:20.588188244 -0500 +++ video-1.2.1/src/oct-avifile.h 2016-01-08 08:39:19.029576872 -0500 @@ -52,6 +52,7 @@ ~Avifile(void); void print(std::ostream& os, bool pr_as_read_syntax) const; + void print(std::ostream& os, bool pr_as_read_syntax=false); void addframe(const NDArray &f);