RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Derek Buitenhuis 2016-03-04 16:17:05 +00:00
parent 063b26d358 5e555f9300
commit a38eadd7e9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.h
View File

@ -520,7 +520,7 @@ typedef struct H264SliceContext {
* H264Context * H264Context
*/ */
typedef struct H264Context { typedef struct H264Context {
AVClass *av_class; const AVClass *class;
AVCodecContext *avctx; AVCodecContext *avctx;
VideoDSPContext vdsp; VideoDSPContext vdsp;
H264DSPContext h264dsp; H264DSPContext h264dsp;