Commit 4be0cdc7 authored by Sam Hocevar's avatar Sam Hocevar

* Remove old .cvsignore files.

  * Rename configure.in to configure.ac.
  * Remove useless autotools/Makefile.*.
parent 10954626
SUBDIRS = autotools include libmpeg2 libvo doc src vc++ test
SUBDIRS = include libmpeg2 libvo doc src vc++ test
EXTRA_DIST = bootstrap CodingStyle
.*.sw[po]
*~
*.diff
*.patch
*.lo
*.o
Makefile
Makefile.in
.deps
.libs
config.guess
config.sub
depcomp
install-sh
ltconfig
ltmain.sh
missing
mkinstalldirs
compile
#! /bin/sh
set -x
# bootstrap: the ultimate bootstrap/autogen.sh script for autotools projects
# Copyright (c) 2002, 2003, 2004, 2005, 2006 Sam Hocevar <sam@zoy.org>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the Do What The Fuck You Want To
# Public License, Version 2, as published by Sam Hocevar. See
# http://sam.zoy.org/wtfpl/COPYING for more details.
#
# The latest version of this script can be found at the following place:
# http://sam.zoy.org/autotools/
# Die if an error occurs
set -e
# Guess whether we are using configure.ac or configure.in
if test -f configure.ac; then
conffile="configure.ac"
elif test -f configure.in; then
conffile="configure.in"
else
echo "$0: could not find configure.ac or configure.in"
exit 1
fi
# Check for needed features
auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *( *\([^ )]*\).*/\1/p' $conffile`"
libtool="`grep -q '^[ \t]*A._PROG_LIBTOOL' $conffile && echo yes || echo no`"
header="`grep -q '^[ \t]*A._CONFIG_HEADER' $conffile && echo yes || echo no`"
# Check for automake
amvers="no"
for v in "-1.9" "19" "-1.8" "18" "-1.7" "17" "-1.6" "16" "-1.5" "15"; do
......@@ -21,7 +48,6 @@ if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then
fi
if test "$amvers" = "no"; then
set +x
echo "$0: you need automake version 1.5 or later"
exit 1
fi
......@@ -36,45 +62,60 @@ for v in "" "259" "253"; do
done
if test "$acvers" = "no"; then
set +x
echo "$0: you need autoconf"
exit 1
fi
# Check for libtool
libtoolize="no"
if glibtoolize --version >/dev/null 2>&1; then
if test "$libtool" = "yes"; then
libtoolize="no"
if glibtoolize --version >/dev/null 2>&1; then
libtoolize="glibtoolize"
else
else
for v in "16" "15" "" "14"; do
if libtoolize${v} --version >/dev/null 2>&1; then
libtoolize="libtoolize${v}"
break
fi
done
fi
fi
if test "$libtoolize" = "no"; then
set +x
if test "$libtoolize" = "no"; then
echo "$0: you need libtool"
exit 1
fi
fi
# Remove old cruft
set +x; for x in aclocal.m4 configure config.guess config.log config.sub config.cache config.h.in config.h compile libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh; do rm -f $x autotools/$x; done; rm -Rf autom4te.cache; set -x
if test ! -d autotools; then mkdir autotools; fi
for x in aclocal.m4 configure config.guess config.log config.sub config.cache config.h.in config.h compile libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh; do rm -f $x autotools/$x; if test -n "$auxdir"; then rm -f "$auxdir/$x"; fi; done
rm -Rf autom4te.cache
if test -n "$auxdir" -a ! -d "$auxdir"; then mkdir "$auxdir"; fi
# Explain what we are doing from now
set -x
# Bootstrap package
${libtoolize} --copy --force
if test -f "ltmain.sh"; then
if test "$libtool" = "yes"; then
${libtoolize} --copy --force
if test -n "$auxdir" -a -f "ltmain.sh"; then
echo "$0: working around a minor libtool issue"
mv ltmain.sh autotools/
mv ltmain.sh "$auxdir/"
fi
fi
aclocal${amvers} -I autotools
if test -n "$auxdir"; then
aclocal${amvers} -I autotools
else
aclocal${amvers}
fi
autoconf${acvers}
autoheader${acvers}
if test "$header" = "yes"; then
autoheader${acvers}
fi
#add --include-deps if you want to bootstrap with any other compiler than gcc
#automake${amvers} --add-missing --copy --include-deps
automake${amvers} --add-missing --copy
automake${amvers} --foreign --add-missing --copy
# Remove cruft that we no longer want
rm -Rf autom4te.cache
......@@ -3,7 +3,7 @@ AC_PREREQ(2.54)
AC_INIT
AC_CONFIG_SRCDIR([src/mpeg2dec.c])
AC_CONFIG_AUX_DIR(autotools)
AC_CONFIG_FILES([Makefile autotools/Makefile include/Makefile test/Makefile
AC_CONFIG_FILES([Makefile include/Makefile test/Makefile
doc/Makefile src/Makefile libmpeg2/Makefile libmpeg2/convert/Makefile
libvo/Makefile vc++/Makefile
libmpeg2/libmpeg2.pc libmpeg2/convert/libmpeg2convert.pc])
......
.*.sw[po]
*~
*.diff
*.patch
*.lo
*.o
Makefile
Makefile.in
.deps
.libs
sample1
sample2
sample3
sample4
sample5
sample6
.*.sw[po]
*~
*.diff
*.patch
*.lo
*.o
Makefile
Makefile.in
.deps
.libs
config.h
config.h.in
inttypes.h
stamp-h*
.*.sw[po]
*~
*.diff
*.patch
*.lo
*.o
Makefile
Makefile.in
.deps
.libs
libmpeg2*.la
libmpeg2.pc
.*.sw[po]
*~
*.diff
*.patch
*.lo
*.o
Makefile
Makefile.in
.deps
.libs
libmpeg2convert*.la
libmpeg2convert.pc
......@@ -585,7 +585,7 @@ int mpeg2_header_picture (mpeg2dec_t * mpeg2dec)
/* XXXXXX decode extra_information_picture as well */
mpeg2dec->q_scale_type = 0;
decoder->q_scale_type = 0;
decoder->intra_dc_precision = 7;
decoder->frame_pred_frame_dct = 1;
decoder->concealment_motion_vectors = 0;
......@@ -631,7 +631,7 @@ static int picture_coding_ext (mpeg2dec_t * mpeg2dec)
decoder->top_field_first = buffer[3] >> 7;
decoder->frame_pred_frame_dct = (buffer[3] >> 6) & 1;
decoder->concealment_motion_vectors = (buffer[3] >> 5) & 1;
mpeg2dec->q_scale_type = buffer[3] & 16;
decoder->q_scale_type = buffer[3] & 16;
decoder->intra_vlc_format = (buffer[3] >> 3) & 1;
decoder->scan = (buffer[3] & 4) ? mpeg2_scan_alt : mpeg2_scan_norm;
if (!(buffer[4] & 0x80))
......@@ -867,10 +867,10 @@ static void prescale (mpeg2dec_t * mpeg2dec, int index)
int i, j, k;
mpeg2_decoder_t * decoder = &(mpeg2dec->decoder);
if (mpeg2dec->scaled[index] != mpeg2dec->q_scale_type) {
mpeg2dec->scaled[index] = mpeg2dec->q_scale_type;
if (mpeg2dec->scaled[index] != decoder->q_scale_type) {
mpeg2dec->scaled[index] = decoder->q_scale_type;
for (i = 0; i < 32; i++) {
k = mpeg2dec->q_scale_type ? non_linear_scale[i] : (i << 1);
k = decoder->q_scale_type ? non_linear_scale[i] : (i << 1);
for (j = 0; j < 64; j++)
decoder->quantizer_prescale[index][i][j] =
k * mpeg2dec->quantizer_matrix[index][j];
......
......@@ -146,6 +146,9 @@ struct mpeg2_decoder_s {
int second_field;
int mpeg1;
/* XXX: stuff due to xine shit */
int8_t q_scale_type;
};
typedef struct {
......@@ -213,7 +216,8 @@ struct mpeg2dec_s {
int16_t display_offset_x, display_offset_y;
int copy_matrix;
int8_t q_scale_type, scaled[4];
int8_t scaled[4]; /* XXX: MOVED */
//int8_t q_scale_type, scaled[4];
uint8_t quantizer_matrix[4][64];
uint8_t new_quantizer_matrix[4][64];
};
......
.*.sw[po]
*~
*.diff
*.patch
*.lo
*.o
Makefile
Makefile.in
.deps
.libs
libvo.la
.*.sw[po]
*~
*.diff
*.patch
*.lo
*.o
Makefile
Makefile.in
.deps
.libs
mpeg2dec
extract_mpeg2
corrupt_mpeg2
seed
.*.sw[po]
*~
*.diff
*.patch
*.lo
*.o
Makefile
Makefile.in
configure
.deps
.libs
.*.sw[po]
*~
*.diff
*.patch
*.lo
*.o
Makefile
Makefile.in
Debug
Release
*.ncb
*.plg
*.opt
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment