diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-26 15:42:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-26 15:42:29 +0100 |
| commit | 8380fc88845ef92e16d54df582519284062b199d (patch) | |
| tree | 0e1b6bec69063c05fce5b457a903be6e9577bda0 /libavcodec/mjpegdec.c | |
| parent | 8ab97a60ef949f9f2cc0de768143c3ce89a1aabf (diff) | |
| parent | 7bcaeb408e3eb2d2f37a306009fa7fe7eb0f1d79 (diff) | |
| download | ffmpeg-streaming-8380fc88845ef92e16d54df582519284062b199d.zip ffmpeg-streaming-8380fc88845ef92e16d54df582519284062b199d.tar.gz | |
Merge commit '7bcaeb408e3eb2d2f37a306009fa7fe7eb0f1d79'
* commit '7bcaeb408e3eb2d2f37a306009fa7fe7eb0f1d79':
mjpegdec: fix indentation
rawdec: cosmetics, reformat
mimic: return meaningful error codes.
Conflicts:
libavcodec/mjpegdec.c
libavcodec/rawdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 6551b52..3042eb3 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1735,23 +1735,23 @@ eoi_parser: if (s->bottom_field == !s->interlace_polarity) break; } - *picture = *s->picture_ptr; - *got_frame = 1; - s->got_picture = 0; - - if (!s->lossless) { - picture->quality = FFMAX3(s->qscale[0], - s->qscale[1], - s->qscale[2]); - picture->qstride = 0; - picture->qscale_table = s->qscale_table; - memset(picture->qscale_table, picture->quality, - (s->width + 15) / 16); - if (avctx->debug & FF_DEBUG_QP) - av_log(avctx, AV_LOG_DEBUG, - "QP: %d\n", picture->quality); - picture->quality *= FF_QP2LAMBDA; - } + *picture = *s->picture_ptr; + *got_frame = 1; + s->got_picture = 0; + + if (!s->lossless) { + picture->quality = FFMAX3(s->qscale[0], + s->qscale[1], + s->qscale[2]); + picture->qstride = 0; + picture->qscale_table = s->qscale_table; + memset(picture->qscale_table, picture->quality, + (s->width + 15) / 16); + if (avctx->debug & FF_DEBUG_QP) + av_log(avctx, AV_LOG_DEBUG, + "QP: %d\n", picture->quality); + picture->quality *= FF_QP2LAMBDA; + } goto the_end; case SOS: |
