mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
do not check for minimum slice start code, 0x00000100 is valid
Originally committed as revision 17133 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
9fc88d7e20
commit
d934de5c5d
@ -25,7 +25,6 @@
|
||||
#include "dsputil.h"
|
||||
#include "mpegvideo.h"
|
||||
|
||||
#define SLICE_MIN_START_CODE 0x00000101
|
||||
#define SLICE_MAX_START_CODE 0x000001af
|
||||
#define EXT_START_CODE 0x000001b5
|
||||
#define USER_START_CODE 0x000001b2
|
||||
|
@ -60,7 +60,7 @@ static int cavs_find_frame_end(ParseContext *pc, const uint8_t *buf,
|
||||
for(; i<buf_size; i++){
|
||||
state= (state<<8) | buf[i];
|
||||
if((state&0xFFFFFF00) == 0x100){
|
||||
if(state < SLICE_MIN_START_CODE || state > SLICE_MAX_START_CODE){
|
||||
if(state > SLICE_MAX_START_CODE){
|
||||
pc->frame_start_found=0;
|
||||
pc->state=-1;
|
||||
return i-3;
|
||||
|
@ -678,8 +678,7 @@ static int cavs_decode_frame(AVCodecContext * avctx,void *data, int *data_size,
|
||||
//mpeg_decode_user_data(avctx,buf_ptr, input_size);
|
||||
break;
|
||||
default:
|
||||
if (stc >= SLICE_MIN_START_CODE &&
|
||||
stc <= SLICE_MAX_START_CODE) {
|
||||
if (stc <= SLICE_MAX_START_CODE) {
|
||||
init_get_bits(&s->gb, buf_ptr, input_size);
|
||||
decode_slice_header(h, &s->gb);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user