Merge remote-tracking branch 'remotes/origin/leak-mem2' into leak-mem…

…-audio # Conflicts: # avcodec/avcodec.go
baohavan · Dec 11, 2019 · b07cab8 · b07cab8
1 parent 3c09e15
commit b07cab8
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/avcodec/avcodec.go b/avcodec/avcodec.go
@@ -154,6 +154,7 @@ const (
 	CodecIDNone  CodecID = C.AV_CODEC_ID_NONE
 	CodecIDMJpeg CodecID = C.AV_CODEC_ID_MJPEG
 	CodecIDLJpeg CodecID = C.AV_CODEC_ID_LJPEG
+	CodecIDAAC   CodecID = C.AV_CODEC_ID_AAC
 )
 
 type Flags int64