make it compatible with ffmpeg tag n3.X

avcodec/avcodec.go

@@ -161,10 +161,16 @@ func AvsubtitleFree(s *AvSubtitle) {
 	C.avsubtitle_free((*C.struct_AVSubtitle)(s))
 }
 
+//Alloc a packet
 func AvPacketAlloc() *Packet {
 	return (*Packet)(C.av_packet_alloc())
 }
 
+//Free a packet
+func AvPacketFree(packet *Packet) {
+	C.av_packet_free((**C.struct_AVPacket)(unsafe.Pointer(&packet)))
+}
+
 //Pack a dictionary for use in side_data.
 func AvPacketPackDictionary(d *Dictionary, s *int) *uint8 {
 	return (*uint8)(C.av_packet_pack_dictionary((*C.struct_AVDictionary)(d), (*C.int)(unsafe.Pointer(s))))
@@ -180,10 +186,6 @@ func AvcodecFindDecoder(id CodecId) *Codec {
 	return (*Codec)(C.avcodec_find_decoder((C.enum_AVCodecID)(id)))
 }
 
-func AvCodecIterate(p *unsafe.Pointer) *Codec {
-	return (*Codec)(C.av_codec_iterate(p))
-}
-
 //Find a registered decoder with the specified name.
 func AvcodecFindDecoderByName(n string) *Codec {
 	return (*Codec)(C.avcodec_find_decoder_by_name(C.CString(n)))

avcodec/avcodec_n4.go

@@ -0,0 +1,20 @@
+// +build !n3,!n2,!n1,!n0
+// require ffmpeg tag n4.x
+
+package avcodec
+
+//#cgo pkg-config: libavformat libavcodec libavutil libswresample
+//#include <stdio.h>
+//#include <stdlib.h>
+//#include <inttypes.h>
+//#include <stdint.h>
+//#include <string.h>
+//#include <libavformat/avformat.h>
+//#include <libavcodec/avcodec.h>
+//#include <libavutil/avutil.h>
+import "C"
+import "unsafe"
+
+func AvCodecIterate(p *unsafe.Pointer) *Codec {
+	return (*Codec)(C.av_codec_iterate(p))
+}

avcodec/context.go

@@ -70,6 +70,16 @@ func (ctxt *Context) AvcodecCopyContext(ctxt2 *Context) int {
 	return int(C.avcodec_copy_context((*C.struct_AVCodecContext)(ctxt), (*C.struct_AVCodecContext)(ctxt2)))
 }
 
+//Convert settings from AvCodecParameters into the destination Context.
+func (ctxt *Context) AvcodecFromParameters(parameters *AvCodecParameters) int {
+	return int(C.avcodec_parameters_to_context((*C.struct_AVCodecContext)(ctxt), (*C.struct_AVCodecParameters)(parameters)))
+}
+
+//Convert settings from the destination Context into AvCodecParameters.
+func (ctxt *Context) AvcodecToParameters(parameters *AvCodecParameters) int {
+	return int(C.avcodec_parameters_from_context((*C.struct_AVCodecParameters)(parameters), (*C.struct_AVCodecContext)(ctxt)))
+}
+
 //Initialize the Context to use the given Codec
 func (ctxt *Context) AvcodecOpen2(c *Codec, d **Dictionary) int {
 	return int(C.avcodec_open2((*C.struct_AVCodecContext)(ctxt), (*C.struct_AVCodec)(c), (**C.struct_AVDictionary)(unsafe.Pointer(d))))

avcodec/packet.go

@@ -61,7 +61,7 @@ func (p *Packet) AvCopyPacketSideData(r *Packet) int {
 
 }
 
-//Free a packet.
+//Free inner data of a packet.
 func (p *Packet) AvFreePacket() {
 	C.av_free_packet((*C.struct_AVPacket)(p))
 

avutil/error.go

@@ -16,7 +16,7 @@ import "errors"
 
 const (
 	AvErrorEOF    = -('E' | ('O' << 8) | ('F' << 16) | (' ' << 24))
-	AvErrorEAGAIN = -35
+	AvErrorEAGAIN = -11
 )
 
 func ErrorFromCode(code int) error {

avutil/memory.go

@@ -19,10 +19,6 @@ func AvMalloc(s uintptr) unsafe.Pointer {
 	return unsafe.Pointer(C.av_malloc(C.size_t(s)))
 }
 
-func AvMallocArray(n, s uintptr) unsafe.Pointer {
-	return C.av_malloc_array(C.size_t(n), C.size_t(s))
-}
-
 //Allocate or reallocate a block of memory.
 func AvRealloc(p *int, s uintptr) unsafe.Pointer {
 	return C.av_realloc(unsafe.Pointer(&p), C.size_t(s))
@@ -61,10 +57,6 @@ func AvCalloc(n, s uintptr) unsafe.Pointer {
 	return C.av_calloc(C.size_t(n), C.size_t(s))
 }
 
-func AvMalloczArray(n, s uintptr) unsafe.Pointer {
-	return C.av_mallocz_array(C.size_t(n), C.size_t(s))
-}
-
 //Duplicate the string s.
 func AvStrdup(s string) string {
 	return C.GoString(C.av_strdup(C.CString(s)))

avutil/memory_n4.go

@@ -0,0 +1,21 @@
+// +build !n3,!n2,!n1,!n0
+// require ffmpeg tag n4.x
+
+package avutil
+
+/*
+	#cgo pkg-config: libavutil
+	#include <libavutil/avutil.h>
+	#include <libavutil/frame.h>
+	#include <stdlib.h>
+*/
+import "C"
+import "unsafe"
+
+func AvMallocArray(n, s uintptr) unsafe.Pointer {
+	return C.av_malloc_array(C.size_t(n), C.size_t(s))
+}
+
+func AvMalloczArray(n, s uintptr) unsafe.Pointer {
+	return C.av_mallocz_array(C.size_t(n), C.size_t(s))
+}