Mercurial > mxe-octave

comparison src/of-video-1-fixes.patch @ 4076:7c123db86666

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
4075:423925d2c032 4076:7c123db86666
1 diff -ur video-1.2.1.orig/src/AVHandler.cc video-1.2.1/src/AVHandler.cc
2 --- video-1.2.1.orig/src/AVHandler.cc 2016-01-06 12:44:20.588188244 -0500
3 +++ video-1.2.1/src/AVHandler.cc 2016-01-08 08:40:05.511829573 -0500
4 @@ -560,7 +560,7 @@
5 }
6
7 // XXX FIXME XXX What is the best size for video_outbuf?
8 - video_outbuf = (uint8_t *)malloc(VIDEO_OUTBUF_SIZE);
9 + video_outbuf = (uint8_t *)av_malloc(VIDEO_OUTBUF_SIZE);
10
11 return 0;
12 }
1 diff -ur video-1.2.1.orig/src/oct-avifile.cc video-1.2.1/src/oct-avifile.cc 13 diff -ur video-1.2.1.orig/src/oct-avifile.cc video-1.2.1/src/oct-avifile.cc
2 --- video-1.2.1.orig/src/oct-avifile.cc 2016-01-06 12:44:20.588188244 -0500 14 --- video-1.2.1.orig/src/oct-avifile.cc 2016-01-06 12:44:20.588188244 -0500
3 +++ video-1.2.1/src/oct-avifile.cc 2016-01-06 12:59:04.321779847 -0500 15 +++ video-1.2.1/src/oct-avifile.cc 2016-01-08 08:38:22.357487990 -0500
4 @@ -57,6 +57,14 @@ 16 @@ -57,6 +57,14 @@
5 } 17 }
6 18
7 void 19 void
8 +Avifile::print(std::ostream& os, bool pr_as_read_syntax) 20 +Avifile::print(std::ostream& os, bool pr_as_read_syntax)
16 Avifile::addframe(const NDArray &f) 28 Avifile::addframe(const NDArray &f)
17 { 29 {
18 if (frames == 0) 30 if (frames == 0)
19 diff -ur video-1.2.1.orig/src/oct-avifile.h video-1.2.1/src/oct-avifile.h 31 diff -ur video-1.2.1.orig/src/oct-avifile.h video-1.2.1/src/oct-avifile.h
20 --- video-1.2.1.orig/src/oct-avifile.h 2016-01-06 12:44:20.588188244 -0500 32 --- video-1.2.1.orig/src/oct-avifile.h 2016-01-06 12:44:20.588188244 -0500
21 +++ video-1.2.1/src/oct-avifile.h 2016-01-06 12:58:15.673572910 -0500 33 +++ video-1.2.1/src/oct-avifile.h 2016-01-08 08:39:19.029576872 -0500
22 @@ -52,6 +52,7 @@ 34 @@ -52,6 +52,7 @@
23 ~Avifile(void); 35 ~Avifile(void);
24 36
25 void print(std::ostream& os, bool pr_as_read_syntax) const; 37 void print(std::ostream& os, bool pr_as_read_syntax) const;
26 + void print(std::ostream& os, bool pr_as_read_syntax=false); 38 + void print(std::ostream& os, bool pr_as_read_syntax=false);