diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 22:03:20 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 22:03:20 +0300 |
| commit | 0b6f092ed31b83e01e980b596ef8bdd9db6cfff6 (patch) | |
| tree | 844a58a9d243b289647cb6693b9102bff7b4f6ec /libavcodec/wmv2enc.c | |
| parent | 59b009411fcc8531d661a381bbd2608e36c20bd0 (diff) | |
| parent | 4b6b1082a73907c7c3de2646c6398bc61320f2c6 (diff) | |
Merge commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6'
* commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6':
lavc: Deprecate avctx.me_method
Conflicts:
doc/encoders.texi
libavcodec/avcodec.h
libavcodec/libx264.c
libavcodec/motion_est.c
libavcodec/options_table.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/wmv2enc.c')
| -rw-r--r-- | libavcodec/wmv2enc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c index a6784eac57..ee2e51c306 100644 --- a/libavcodec/wmv2enc.c +++ b/libavcodec/wmv2enc.c @@ -227,6 +227,7 @@ AVCodec ff_wmv2_encoder = { .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_WMV2, .priv_data_size = sizeof(Wmv2Context), + .priv_class = &wmv2_class, .init = wmv2_encode_init, .encode2 = ff_mpv_encode_picture, .close = ff_mpv_encode_end, |