[SCM] MLT multimedia framework packaging branch, master, updated. debian/0.8.0-1-4-g4eeb70e

[Patrick Matthäi]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/mlt.git;a=commitdiff;h=4eeb70e

The following commit has been merged in the master branch:
commit 4eeb70eda50c506b804f782c37b992c7a524b212
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Fri Jul 13 20:42:14 2012 +0200

    * Add patch 03-audio-limits-and-crash, which fixes a crash if invalid audio
      bitrates are submitted.
      Closes: #681319
---
 debian/changelog                              |    3 ++
 debian/patches/03-audio-limits-and-crash.diff |   32 +++++++++++++++++++++++++
 debian/patches/series                         |    1 +
 3 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 23dd25f..7b9031c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ mlt (0.8.0-2) UNRELEASED; urgency=low
     Closes: #681339
   * Add patch 02-allow-file-prefix, which adds the file:// prefix support.
     Closes: #677276
+  * Add patch 03-audio-limits-and-crash, which fixes a crash if invalid audio
+    bitrates are submitted.
+    Closes: #681319
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 12 Jul 2012 21:49:53 +0200
 
diff --git a/debian/patches/03-audio-limits-and-crash.diff b/debian/patches/03-audio-limits-and-crash.diff
new file mode 100644
index 0000000..48a5d95
--- /dev/null
+++ b/debian/patches/03-audio-limits-and-crash.diff
@@ -0,0 +1,32 @@
+# melt/libav may crash if you supply invalid audio bitrates.
+# Closes: #681319
+
+diff -Naur mlt-0.8.0.orig/src/modules/avformat/consumer_avformat.c mlt-0.8.0/src/modules/avformat/consumer_avformat.c
+--- mlt-0.8.0.orig/src/modules/avformat/consumer_avformat.c	2012-07-13 20:27:19.692559127 +0200
++++ mlt-0.8.0/src/modules/avformat/consumer_avformat.c	2012-07-13 20:34:17.714427055 +0200
+@@ -668,6 +668,7 @@
+ 	else
+ 	{
+ 		mlt_log_warning( NULL, "%s: Unable to encode audio - disabling audio output.
", __FILE__ );
++		audio_input_frame_size = 0;
+ 	}
+ 
+ 	return audio_input_frame_size;
+@@ -1405,7 +1406,17 @@
+ 			audio_input_frame_size = open_audio( properties, oc, audio_st[i], audio_outbuf_size,
+ 				acodec? acodec : NULL );
+ 			if ( !audio_input_frame_size )
++			{
++				// Remove the audio stream from the output context
++				int j;
++				for ( j = 0; j < oc->nb_streams; j++ )
++				{
++					if ( oc->streams[j] == audio_st[i] )
++						av_freep( &oc->streams[j] );
++				}
++				--oc->nb_streams;
+ 				audio_st[i] = NULL;
++			}
+ 		}
+ 
+ 		// Setup custom I/O if redirecting
diff --git a/debian/patches/series b/debian/patches/series
index 921375a..fc9974a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-changed-preset-path.diff
 02-allow-file-prefix.diff
+03-audio-limits-and-crash.diff

-- 
MLT multimedia framework packaging