diff options
| author | Marko Kreen <marko@l-t.ee> | 2002-07-10 21:01:45 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-07-10 21:01:45 +0000 |
| commit | adc09b2eab2933d1fe75f09f4f81b2d0f3d1ed1c (patch) | |
| tree | 644388704ddbb7cbbca5a10d192da8b8f6aea695 /libavcodec/mpeg12.c | |
| parent | 9d076823059f3d1f84ab2575b94fc9c325584dc2 (diff) | |
| download | ffmpeg-adc09b2eab2933d1fe75f09f4f81b2d0f3d1ed1c.tar.gz | |
adding ff prefix to avoid global name conficts with xvid (patch by Marko Kreen <marko at l-t.ee>)
Originally committed as revision 739 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 53c4e32668..7b2bb99159 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1540,7 +1540,7 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx, #endif } else { for(i=0;i<64;i++) { - v = default_intra_matrix[i]; + v = ff_mpeg1_default_intra_matrix[i]; s->intra_matrix[i] = v; s->chroma_intra_matrix[i] = v; } @@ -1560,7 +1560,7 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx, #endif } else { for(i=0;i<64;i++) { - v = default_non_intra_matrix[i]; + v = ff_mpeg1_default_non_intra_matrix[i]; s->inter_matrix[i] = v; s->chroma_inter_matrix[i] = v; } |