virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-16 22:42:38 +02:00
Code Issues Releases Activity

lavc/mjpegdec: replace number with marker name

Browse Source 
Make it easier to read.

Signed-off-by: Zhong Li <zhong.li@intel.com>
This commit is contained in:
Zhong Li
2019-06-27 16:58:23 +08:00
parent 4dc3d93880
commit a6c648f2b4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mjpegdec.c
View File

@ -2115,7 +2115,7 @@ static int find_marker(const uint8_t **pbuf_ptr, const uint8_t *buf_end)
while (buf_end - buf_ptr > 1) { while (buf_end - buf_ptr > 1) {
v = *buf_ptr++; v = *buf_ptr++;
v2 = *buf_ptr; v2 = *buf_ptr;
if ((v == 0xff) && (v2 >= 0xc0) && (v2 <= 0xfe) && buf_ptr < buf_end) { if ((v == 0xff) && (v2 >= SOF0) && (v2 <= COM) && buf_ptr < buf_end) {
val = *buf_ptr++; val = *buf_ptr++;
goto found; goto found;
} }
@ -2180,7 +2180,7 @@ int ff_mjpeg_find_marker(MJpegDecodeContext *s,
src--; src--;
} }
if (x < 0xd0 || x > 0xd7) { if (x < RST0 || x > RST7) {
copy_data_segment(1); copy_data_segment(1);
if (x) if (x)
break; break;
@ -2319,7 +2319,7 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
av_log(avctx, AV_LOG_DEBUG, "startcode: %X\n", start_code); av_log(avctx, AV_LOG_DEBUG, "startcode: %X\n", start_code);
/* process markers */ /* process markers */
if (start_code >= 0xd0 && start_code <= 0xd7) { if (start_code >= RST0 && start_code <= RST7) {
av_log(avctx, AV_LOG_DEBUG, av_log(avctx, AV_LOG_DEBUG,
"restart marker: %d\n", start_code & 0x0f); "restart marker: %d\n", start_code & 0x0f);
/* APP fields */ /* APP fields */