Merge commit 'f1fa1eed2abdc8dfb0af318a43f5d293b81141bd'

* commit 'f1fa1eed2abdc8dfb0af318a43f5d293b81141bd':
  mpegvideo: Expand macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-06-12 21:14:34 +02:00
8 changed files with 61 additions and 18 deletions

View File

@@ -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",