Merge commit '5e555f93009f0605db120eec78262d0fe337e645'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Fri, 4 Mar 2016 16:17:05 +0000 (16:17 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Fri, 4 Mar 2016 16:17:05 +0000 (16:17 +0000)
commita38eadd7e93de69a060b68891466d82e626623ba
tree27156cef4cc23567834b4aaf126943413206b854
parent063b26d35857f72b4f9bd24ea509808291f5d6b8
parent5e555f93009f0605db120eec78262d0fe337e645
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>
libavcodec/h264.h