diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2007-05-05 18:31:34 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2007-05-05 18:31:34 +0000 |
| commit | 20c11e4cee9934069d3e85071f5ba70b1a0830f1 (patch) | |
| tree | 3376be418532f0aa04ea7f9b502d5e09b7d0c19b /libavcodec/cavs.c | |
| parent | 95dca03f7770da949777468c9e8fde266633ce36 (diff) | |
| download | ffmpeg-20c11e4cee9934069d3e85071f5ba70b1a0830f1.tar.gz | |
avoid a clash between two definitions of SEQ_START_CODE
Originally committed as revision 8903 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/cavs.c')
| -rw-r--r-- | libavcodec/cavs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c index 4672635d7c..f4f310a406 100644 --- a/libavcodec/cavs.c +++ b/libavcodec/cavs.c @@ -1352,7 +1352,7 @@ static int cavs_decode_frame(AVCodecContext * avctx,void *data, int *data_size, return FFMAX(0, buf_ptr - buf - s->parse_context.last_index); input_size = (buf_end - buf_ptr)*8; switch(stc) { - case SEQ_START_CODE: + case CAVS_START_CODE: init_get_bits(&s->gb, buf_ptr, input_size); decode_seq_header(h); break; |