summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/mpeg12data.h
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2002-07-15 19:42:40 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2002-07-15 19:42:40 +0000
commit01ef70db6c2a280d96ddce6e6272a4813e047c9b (patch)
tree38a5cf0a9b7500f5b06dbe5de93548985dcb0185 /src/libffmpeg/libavcodec/mpeg12data.h
parentc6b394300792eb277b16b25bfca864c8bcbed7db (diff)
downloadxine-lib-01ef70db6c2a280d96ddce6e6272a4813e047c9b.tar.gz
xine-lib-01ef70db6c2a280d96ddce6e6272a4813e047c9b.tar.bz2
update to ffmpeg cvs
CVS patchset: 2277 CVS date: 2002/07/15 19:42:40
Diffstat (limited to 'src/libffmpeg/libavcodec/mpeg12data.h')
-rw-r--r--src/libffmpeg/libavcodec/mpeg12data.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libffmpeg/libavcodec/mpeg12data.h b/src/libffmpeg/libavcodec/mpeg12data.h
index cfb6e1d0f..041708fd1 100644
--- a/src/libffmpeg/libavcodec/mpeg12data.h
+++ b/src/libffmpeg/libavcodec/mpeg12data.h
@@ -2,7 +2,7 @@
* MPEG1/2 tables
*/
-INT16 default_intra_matrix[64] = {
+INT16 ff_mpeg1_default_intra_matrix[64] = {
8, 16, 19, 22, 26, 27, 29, 34,
16, 16, 22, 24, 27, 29, 34, 37,
19, 22, 26, 27, 29, 34, 34, 38,
@@ -13,7 +13,7 @@ INT16 default_intra_matrix[64] = {
27, 29, 35, 38, 46, 56, 69, 83
};
-INT16 default_non_intra_matrix[64] = {
+INT16 ff_mpeg1_default_non_intra_matrix[64] = {
16, 16, 16, 16, 16, 16, 16, 16,
16, 16, 16, 16, 16, 16, 16, 16,
16, 16, 16, 16, 16, 16, 16, 16,