clean reader of packets

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 058af459efd3 · 2014-02-24T18:22:14.000-05:00
diff --git a/src/AvTranscoder/InputStream.cpp b/src/AvTranscoder/InputStream.cpp
@@ -38,7 +38,10 @@ bool InputStream::readNextPacket( DataStream& data ) const
 	AVPacket packet;
 	av_init_packet( &packet );
 
-	readNextPacket( packet );
+	if( ! readNextPacket( packet ) )
+	{
+		return false;
+	}
 
 	// is it possible to remove this copy ?
 	// using : av_packet_unref ?
@@ -66,6 +69,8 @@ bool InputStream::readNextPacket( AVPacket& packet ) const
 		{
 			return true;
 		}
+		av_free_packet( &packet );
+		av_init_packet( &packet );
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,10 @@ bool InputStream::readNextPacket( DataStream& data ) const`
`38`	`38`	`AVPacket packet;`
`39`	`39`	`av_init_packet( &packet );`
`40`	`40`
`41`		`- readNextPacket( packet );`
	`41`	`+ if( ! readNextPacket( packet ) )`
	`42`	`+ {`
	`43`	`+ return false;`
	`44`	`+ }`
`42`	`45`
`43`	`46`	`// is it possible to remove this copy ?`
`44`	`47`	`// using : av_packet_unref ?`
`@@ -66,6 +69,8 @@ bool InputStream::readNextPacket( AVPacket& packet ) const`
`66`	`69`	`{`
`67`	`70`	`return true;`
`68`	`71`	`}`
	`72`	`+ av_free_packet( &packet );`
	`73`	`+ av_init_packet( &packet );`
`69`	`74`	`}`
`70`	`75`	`}`
`71`	`76`