generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adding ff prefix to avoid global name conficts with xvid (patch by Marko Kreen <marko at l-t.ee>)

Browse Source 
Originally committed as revision 739 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Marko Kreen
2002-07-10 21:01:45 +00:00
committed by Michael Niedermayer
parent 9d07682305
commit adc09b2eab
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mpeg12.c
View File

@@ -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;
}