diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-03-04 16:17:05 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-03-04 16:17:05 +0000 |
| commit | a38eadd7e93de69a060b68891466d82e626623ba (patch) | |
| tree | 27156cef4cc23567834b4aaf126943413206b854 | |
| parent | 063b26d35857f72b4f9bd24ea509808291f5d6b8 (diff) | |
| parent | 5e555f93009f0605db120eec78262d0fe337e645 (diff) | |
| download | ffmpeg-a38eadd7e93de69a060b68891466d82e626623ba.tar.gz | |
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>
| -rw-r--r-- | libavcodec/h264.h | 2 |
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; |