diff options
| author | Stefan Gehrer <stefan.gehrer@gmx.de> | 2009-02-10 16:34:45 +0000 |
|---|---|---|
| committer | Stefan Gehrer <stefan.gehrer@gmx.de> | 2009-02-10 16:34:45 +0000 |
| commit | d934de5c5d9ff1d228d0113e31e182efe2a853aa (patch) | |
| tree | 751cba974356863816fb07bfacd2f43e77553c3d /libavcodec | |
| parent | 9fc88d7e2025e5df0bced8a175978408a1d9eb9a (diff) | |
| download | ffmpeg-d934de5c5d9ff1d228d0113e31e182efe2a853aa.tar.gz | |
do not check for minimum slice start code, 0x00000100 is valid
Originally committed as revision 17133 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/cavs.h | 1 | ||||
| -rw-r--r-- | libavcodec/cavs_parser.c | 2 | ||||
| -rw-r--r-- | libavcodec/cavsdec.c | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/cavs.h b/libavcodec/cavs.h index 885a2cda9e..8d07aed0ac 100644 --- a/libavcodec/cavs.h +++ b/libavcodec/cavs.h @@ -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 diff --git a/libavcodec/cavs_parser.c b/libavcodec/cavs_parser.c index 6604b1bbcc..6d19e1fd82 100644 --- a/libavcodec/cavs_parser.c +++ b/libavcodec/cavs_parser.c @@ -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; diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 4092f88f2a..dbbe2d9e09 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -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); } |