From: stbenz <benz.st@gmail.com>
Date: Tue, 14 Apr 2015 21:11:26 +0000 (+0200)
Subject: transcoding: set AVFrame format, width and height, fixes #2763
X-Git-Tag: v4.1~151
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01a095ceb5f76a3efffda421a6579821c68a412a;p=thirdparty%2Ftvheadend.git

transcoding: set AVFrame format, width and height, fixes #2763

ffmpeg 2.6 checks, if format, width and height is set in avcodec_encode_video2 and generates a warning, if they aren't set.
---

diff --git a/src/plumbing/transcoding.c b/src/plumbing/transcoding.c
index 58371ea53..a8144f5b7 100644
--- a/src/plumbing/transcoding.c
+++ b/src/plumbing/transcoding.c
@@ -1211,7 +1211,11 @@ transcoder_stream_video(transcoder_t *t, transcoder_stream_t *ts, th_pkt_t *pkt)
     transcoder_stream_invalidate(ts);
     goto cleanup;
   }
- 
+
+  vs->vid_enc_frame->format  = octx->pix_fmt;
+  vs->vid_enc_frame->width   = octx->width;
+  vs->vid_enc_frame->height  = octx->height;
+
   vs->vid_enc_frame->pkt_pts = vs->vid_dec_frame->pkt_pts;
   vs->vid_enc_frame->pkt_dts = vs->vid_dec_frame->pkt_dts;