[SCM] xjadeo/master: Patch refreshed.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 223574bd426581a88f9208e8cd0438665052a251
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Mar 23 19:10:31 2015 +0100

    Patch refreshed.

diff --git a/debian/patches/0001-Fix-building-with-Libav-10-11.patch b/debian/patches/0001-Fix-building-with-Libav-10-11.patch
index 189414f..43e18d5 100644
--- a/debian/patches/0001-Fix-building-with-Libav-10-11.patch
+++ b/debian/patches/0001-Fix-building-with-Libav-10-11.patch
@@ -11,7 +11,7 @@ Index: xjadeo/src/xjadeo/xjadeo.c
 ===================================================================
 --- xjadeo.orig/src/xjadeo/xjadeo.c
 +++ xjadeo/src/xjadeo/xjadeo.c
-@@ -427,7 +427,7 @@ static uint64_t parse_pts_from_frame (AV
+@@ -471,7 +471,7 @@ static uint64_t parse_pts_from_frame (AV
  
  	pts = AV_NOPTS_VALUE;
  
@@ -20,7 +20,7 @@ Index: xjadeo/src/xjadeo/xjadeo.c
  	if (pts == AV_NOPTS_VALUE) {
  		pts = av_frame_get_best_effort_timestamp (f);
  		if (pts != AV_NOPTS_VALUE) {
-@@ -854,6 +854,7 @@ static int index_frames () {
+@@ -898,6 +898,7 @@ static int index_frames () {
  
  		int err = 0;
  		int bailout = 100;
@@ -28,7 +28,7 @@ Index: xjadeo/src/xjadeo/xjadeo.c
  		while (!got_pic && --bailout) {
  
  			if ((err = av_read_frame (pFormatCtx, &packet)) < 0) {
-@@ -867,6 +868,8 @@ static int index_frames () {
+@@ -911,6 +912,8 @@ static int index_frames () {
  				error |= 32;
  				break;
  			}
@@ -37,7 +37,7 @@ Index: xjadeo/src/xjadeo/xjadeo.c
  
  #ifdef USE_DUP_PACKET
  			if (av_dup_packet (&packet) < 0) {
-@@ -905,7 +908,7 @@ static int index_frames () {
+@@ -949,7 +952,7 @@ static int index_frames () {
  		if (err < 0 || !bailout) continue;
  
  		fidx[i].frame_pts = pts;
@@ -46,7 +46,7 @@ Index: xjadeo/src/xjadeo/xjadeo.c
  		if (pts != AV_NOPTS_VALUE) {
  #if 0 // DEBUG
  			printf("FN %"PRId64", PKT-PTS %"PRId64" FRM-PTS: %"PRId64"\n", i, fidx[i].pkt_pts, fidx[i].frame_pts);
-@@ -1274,11 +1277,11 @@ int open_movie (char* file_name) {
+@@ -1319,11 +1322,11 @@ int open_movie (char* file_name) {
  	 * hence here AVRational fractions are inverse.
  	 */
  	framerate = 0;

-- 
xjadeo packaging