Frame: avoid using of av_copy_packet

Clement Champetier · Clement Champetier · commit c4d4fe817fe3 · 2015-02-17T10:56:21.000+01:00
* av_copy_packet: not available on ubuntu 14.04 * Fix #86
diff --git a/src/AvTranscoder/frame/Frame.cpp b/src/AvTranscoder/frame/Frame.cpp
@@ -15,7 +15,13 @@ Frame::Frame( const size_t dataSize )
 
 Frame::Frame(AVPacket& avPacket)
 {
+#if LIBAVCODEC_VERSION_MAJOR > 54 || ( LIBAVCODEC_VERSION_MAJOR == 54 && LIBAVCODEC_VERSION_MINOR > 56 )
 	av_copy_packet( &_packet, &avPacket );
+#else
+	// we just care about data, not side properties of AVPacket
+	initAVPacket();
+	copyData( avPacket.data, avPacket.size );
+#endif
 }
 
 Frame::~Frame()
diff --git a/src/AvTranscoder/frame/Frame.hpp b/src/AvTranscoder/frame/Frame.hpp
@@ -19,7 +19,7 @@ class AvExport Frame
 	/// Create a frame with a the given buffer size
 	Frame( const size_t dataSize );
 
-	/// Create a frame from the given AVPAcket (copy data)
+	/// Create a frame from the given AVPAcket (copy data of given packet)
 	Frame( AVPacket& avPacket );
 
 	/// Free buffer of data

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,13 @@ Frame::Frame( const size_t dataSize )`
`15`	`15`
`16`	`16`	`Frame::Frame(AVPacket& avPacket)`
`17`	`17`	`{`
	`18`	`+#if LIBAVCODEC_VERSION_MAJOR > 54 \|\| ( LIBAVCODEC_VERSION_MAJOR == 54 && LIBAVCODEC_VERSION_MINOR > 56 )`
`18`	`19`	`av_copy_packet( &_packet, &avPacket );`
	`20`	`+#else`
	`21`	`+ // we just care about data, not side properties of AVPacket`
	`22`	`+ initAVPacket();`
	`23`	`+ copyData( avPacket.data, avPacket.size );`
	`24`	`+#endif`
`19`	`25`	`}`
`20`	`26`
`21`	`27`	`Frame::~Frame()`