diff options
author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-07-16 09:47:55 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-16 12:18:30 +0200 |
commit | 8dad213143e34b477f034ada4addf2ed2b1c983d (patch) | |
tree | 9bc4101735fa4a55d58003abf00f662b09d76c87 /libavcodec/mjpegdec.c | |
parent | 7aafac976fe2806c9519d4154b5f0d5b6767fbe2 (diff) |
lavc: Add properties field to AVCodecContext.
The new field can hold information about losslessness and closed captions for now.
Diffstat (limited to 'libavcodec/mjpegdec.c')
-rw-r--r-- | libavcodec/mjpegdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 8094274ff6..cc82a43c3b 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2059,6 +2059,7 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, goto fail; break; case SOF3: + s->avctx->properties |= FF_CODEC_PROPERTY_LOSSLESS; s->lossless = 1; s->ls = 0; s->progressive = 0; @@ -2066,6 +2067,7 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, goto fail; break; case SOF48: + s->avctx->properties |= FF_CODEC_PROPERTY_LOSSLESS; s->lossless = 1; s->ls = 1; s->progressive = 0; |