Updated

Author: djthorpe

etc/docker/Dockerfile

@@ -12,7 +12,7 @@ COPY . .
 RUN set -x \
   && apt update -y \
   && apt install -y ca-certificates lsb-release \
-  && echo "deb https://www.deb-multimedia.org $(lsb_release -sc) main non-free" >> /etc/apt/sources.list \
+  && echo "deb https://www.deb-multimedia.org $(lsb_release -sc) main" >> /etc/apt/sources.list \
   && apt update -y -oAcquire::AllowInsecureRepositories=true \
   && apt install -y --force-yes deb-multimedia-keyring \
   && apt install -y --allow-unauthenticated libavcodec-dev libavdevice-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev
@@ -29,7 +29,7 @@ ARG SOURCE
 RUN set -x \
   && apt update -y \
   && apt install -y ca-certificates lsb-release \
-  && echo "deb https://www.deb-multimedia.org $(lsb_release -sc) main non-free" >> /etc/apt/sources.list \
+  && echo "deb https://www.deb-multimedia.org $(lsb_release -sc) main" >> /etc/apt/sources.list \
   && apt update -y -oAcquire::AllowInsecureRepositories=true \
   && apt install -y --force-yes deb-multimedia-keyring \
   && apt install -y --allow-unauthenticated ffmpeg

sys/ffmpeg61/avcodec.go

@@ -297,7 +297,6 @@ type jsonAVCodecParameters struct {
 	SampleAspectRatio AVRational  `json:"sample_aspect_ratio,omitempty"`
 	SampleRate        int         `json:"sample_rate,omitempty"`
 	FrameSize         int         `json:"frame_size,omitempty"`
-	Framerate         AVRational  `json:"framerate,omitempty"`
 }
 
 func (ctx *AVCodecParameters) MarshalJSON() ([]byte, error) {
@@ -312,14 +311,9 @@ func (ctx *AVCodecParameters) MarshalJSON() ([]byte, error) {
 		SampleAspectRatio: (AVRational)(ctx.sample_aspect_ratio),
 		SampleRate:        int(ctx.sample_rate),
 		FrameSize:         int(ctx.frame_size),
-		Framerate:         (AVRational)(ctx.framerate),
 	})
 }
 
-func (ctx *AVCodecParameters) Format() int {
-	return int(ctx.format)
-}
-
 func (ctx *AVCodecParameters) CodecType() AVMediaType {
 	return AVMediaType(ctx.codec_type)
 }
@@ -336,6 +330,10 @@ func (ctx *AVCodecParameters) SetCodecTag(tag uint32) {
 	ctx.codec_tag = C.uint32_t(tag)
 }
 
+func (ctx *AVCodecParameters) Format() int {
+	return int(ctx.format)
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // AVCodec