Merge commit '83678dbbae64ad8c501e0c732c1117e642c25dae'

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

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

diff --cc libavcodec/libopenh264dec.c
index 3acc369,60e4b02..f9b91ce
--- 1/libavcodec/libopenh264dec.c
--- 2/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)