diff options
| author | Mark Thompson <sw@jkqxz.net> | 2018-09-18 23:30:53 +0100 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2018-09-23 14:42:34 +0100 |
| commit | 525de2000b018c659c5dd472610305cb2ffb9edc (patch) | |
| tree | 768ee329ca9a4bbd24b611b64ab46336377785ad /libavcodec/cbs.c | |
| parent | 852c7ba3f81f28b8b8b0930cf2cf2e10d7e9c4b0 (diff) | |
| download | ffmpeg-525de2000b018c659c5dd472610305cb2ffb9edc.tar.gz | |
lavc/cbs: Add JPEG support
Diffstat (limited to 'libavcodec/cbs.c')
| -rw-r--r-- | libavcodec/cbs.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c index be6c043b58..bb3ce95971 100644 --- a/libavcodec/cbs.c +++ b/libavcodec/cbs.c @@ -35,6 +35,9 @@ static const CodedBitstreamType *cbs_type_table[] = { #if CONFIG_CBS_H265 &ff_cbs_type_h265, #endif +#if CONFIG_CBS_JPEG + &ff_cbs_type_jpeg, +#endif #if CONFIG_CBS_MPEG2 &ff_cbs_type_mpeg2, #endif @@ -50,6 +53,9 @@ const enum AVCodecID ff_cbs_all_codec_ids[] = { #if CONFIG_CBS_H265 AV_CODEC_ID_H265, #endif +#if CONFIG_CBS_JPEG + AV_CODEC_ID_MJPEG, +#endif #if CONFIG_CBS_MPEG2 AV_CODEC_ID_MPEG2VIDEO, #endif |