diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 21:14:34 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 21:25:21 +0200 |
commit | dbf172e6f44d1736d27a84fa117dcd6b8460bd4b (patch) | |
tree | 673fee9ea042991f7ce1891389f3426efcf21c61 /libavcodec/flvenc.c | |
parent | 1189af429211ac650aac730368a6cf5b23756605 (diff) | |
parent | f1fa1eed2abdc8dfb0af318a43f5d293b81141bd (diff) | |
download | ffmpeg-dbf172e6f44d1736d27a84fa117dcd6b8460bd4b.tar.gz |
Merge commit 'f1fa1eed2abdc8dfb0af318a43f5d293b81141bd'
* commit 'f1fa1eed2abdc8dfb0af318a43f5d293b81141bd':
mpegvideo: Expand macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flvenc.c')
-rw-r--r-- | libavcodec/flvenc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/flvenc.c b/libavcodec/flvenc.c index c1ff45056d..a2cd39955e 100644 --- a/libavcodec/flvenc.c +++ b/libavcodec/flvenc.c @@ -91,7 +91,12 @@ void ff_flv2_encode_ac_esc(PutBitContext *pb, int slevel, int level, } } -FF_MPV_GENERIC_CLASS(flv) +static const AVClass flv_class = { + .class_name = "flv encoder", + .item_name = av_default_item_name, + .option = ff_mpv_generic_options, + .version = LIBAVUTIL_VERSION_INT, +}; AVCodec ff_flv_encoder = { .name = "flv", |