[FFmpeg-cvslog] Merge commit '83678dbbae64ad8c501e0c732c1117e642c25dae'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Sep 11 13:57:23 2018 -0300| [ff44c2d4f483cda53859ce019f3815c69239a7e0] | committer: James Almer

Merge commit '83678dbbae64ad8c501e0c732c1117e642c25dae'

* commit '83678dbbae64ad8c501e0c732c1117e642c25dae':
  libopenh264dec: Export the decoded profile and level in AVCodecContext

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ff44c2d4f483cda53859ce019f3815c69239a7e0
---

 libavcodec/libopenh264dec.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/libavcodec/libopenh264dec.c b/libavcodec/libopenh264dec.c
index 3acc3696da..f9b91ce3c0 100644
--- a/libavcodec/libopenh264dec.c
+++ b/libavcodec/libopenh264dec.c
@@ -95,6 +95,9 @@ static int svc_decode_frame(AVCodecContext *avctx, void *data,
     int ret, linesize[3];
     AVFrame *avframe = data;
     DECODING_STATE state;
+#if OPENH264_VER_AT_LEAST(1, 7)
+    int opt;
+#endif
 
     if (!avpkt->data) {
 #if OPENH264_VER_AT_LEAST(1, 9)
@@ -138,6 +141,12 @@ FF_DISABLE_DEPRECATION_WARNINGS
     avframe->pkt_pts = avpkt->pts;
 FF_ENABLE_DEPRECATION_WARNINGS
 #endif
+#if OPENH264_VER_AT_LEAST(1, 7)
+    (*s->decoder)->GetOption(s->decoder, DECODER_OPTION_PROFILE, &opt);
+    avctx->profile = opt;
+    (*s->decoder)->GetOption(s->decoder, DECODER_OPTION_LEVEL, &opt);
+    avctx->level = opt;
+#endif
 
     *got_frame = 1;
     return avpkt->size;


======================================================================

diff --cc libavcodec/libopenh264dec.c
index 3acc3696da,60e4b028ec..f9b91ce3c0
--- a/libavcodec/libopenh264dec.c
+++ b/libavcodec/libopenh264dec.c
@@@ -92,9 -92,12 +92,12 @@@ static int svc_decode_frame(AVCodecCont
      SVCContext *s = avctx->priv_data;
      SBufferInfo info = { 0 };
      uint8_t* ptrs[3];
 -    int linesize[3];
 +    int ret, linesize[3];
      AVFrame *avframe = data;
      DECODING_STATE state;
+ #if OPENH264_VER_AT_LEAST(1, 7)
+     int opt;
+ #endif
  
      if (!avpkt->data) {
  #if OPENH264_VER_AT_LEAST(1, 9)