[FFmpeg-cvslog] Merge commit '04f691cd4fb7d226e54df886a21ba201cb5019f4'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Nov  1 20:21:35 2017 -0300| [f3f1bbc6a88bcbc02acc97907d0d932f32ec4574] | committer: James Almer

Merge commit '04f691cd4fb7d226e54df886a21ba201cb5019f4'

* commit '04f691cd4fb7d226e54df886a21ba201cb5019f4':
  mmal: Add missing .item_name to AVClass declaration

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

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

 libavcodec/mmaldec.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c
index 0b1195dc3e..f2ee3557aa 100644
--- a/libavcodec/mmaldec.c
+++ b/libavcodec/mmaldec.c
@@ -844,6 +844,7 @@ static const AVOption options[]={
 #define FFMMAL_DEC_CLASS(NAME) \
     static const AVClass ffmmal_##NAME##_dec_class = { \
         .class_name = "mmal_" #NAME "_dec", \
+        .item_name  = av_default_item_name, \
         .option     = options, \
         .version    = LIBAVUTIL_VERSION_INT, \
     };


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