Merge commit '5e555f93009f0605db120eec78262d0fe337e645'

AVClass is now a const, the rest are no-op.

* commit '5e555f93009f0605db120eec78262d0fe337e645':
  mpeg12enc: always write closed gops for intra only outputs
  h264: Add an AVClass pointer to H264Context
  libx264: Fix noise_reduction option assignment

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index a5fc3a053f..6d6629b043 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -520,7 +520,7 @@ typedef struct H264SliceContext {
  * H264Context
  */
 typedef struct H264Context {
-    AVClass *av_class;
+    const AVClass *class;
     AVCodecContext *avctx;
     VideoDSPContext vdsp;
     H264DSPContext h264dsp;