Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

In commit bebe72f4, the enum AV_PICTURE_TYPE_* was introduced. There are still places in the code where pict_type is used as an integer and there is a case where "pict_type = 0" with the explanation "let ffmpeg decide what to do". The new enum does not know a value of 0 and C++ will fail if compiling such programs anyway as it is refered as an int (and you cannot patch them properly).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  ac3enc: move ff_ac3_encode_frame() to ac3enc_template.c
  ac3enc: merge log2_tab() into normalize_samples()
  ac3enc: Remove bit allocation fallbacks.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This avoids using function pointers for quite a few small functions, most of
which just call DSP functions.

They introduce too much complexity for very little benefit. The result is that
encoding will be more likely to fail at extremely low bitrates where quality
would be awful anyway.

The previous code was erroneously assuming that the linesize was
equivalent to width*pixel_step, which is not always true.

* qatar/master:
  build: improve rules for test programs
  build: factor out the .c and .S compile commands as a macro
  swscale: remove unused xInc/srcW arguments from hScale().
  H.264: disable 2tap qpel with CODEC_FLAG2_FAST and >8-bit
  H.264: make filter_mb_fast support 4:4:4
  mpeg4videoenc: Remove disabled variant of mpeg4_encode_block().
  configure: allow post-fixed cpu strings for athlon64, k8, and opteron when setting the -march flag.
  Move some variable declarations below the proper #ifdefs.

Conflicts:
	Makefile
	ffplay.c
	libswscale/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This generates dependencies for the *-test.o files ensuring
rebuilds when necessary.
Signed-off-by: Mans Rullgard <mans@mansr.com>

These commands have the same form, and using a common macro allows
it to be used elsewhere without further duplication.
Signed-off-by: Mans Rullgard <mans@mansr.com>

2tap qpel isn't implemented yet for high bit depth, so it just breaks decoding.

As a nice sideeffect this fixes the following warning:
libavcodec/mpeg4videoenc.c:302:20: warning: variable ‘rl’ set but not used [-Wunused-but-set-variable]

when setting the -march flag.

This is to match gcc's {athlon64,k8,opteron}-sse3 -march flags.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>

This avoids warnings about set-but-unused variables.

In these cases it can't be guessed from the operands (at least
not necessarily), and it seems some clang versions refuse to
compiler it.
Fixes ticket #303.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

This reverts commit 89b5829d.

Conflicts:

	configure

This reverts commit a6213f3d.

This reverts commit 729f953f.

* qatar/master:
  ARM: silence some annoying armcc warnings
  ffplay: Remove unused-but-set channels variable from update_sample_display().
  build: Add DEP_LIBS dependency directly to the shared library build rule.
  build: Remove multiple inclusion guards from config.mak.
  build: Remove redundant config.mak includes from subdirectory Makefiles.
  aacenc: Mark psy_3gpp_window() as av_unused.

Conflicts:
	configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Use av_get_bytes_per_sample() instead.

Fix deprecation warning:
samplefmt.c: In function ‘av_samples_fill_arrays’:
samplefmt.c:88: warning: ‘av_get_bits_per_sample_fmt’ is deprecated (declared at samplefmt.c:76)

buffersink_filter is a strong requirement for compiling ffplay.
Fixes ffplay compilation with --disable-everything --disable-ffmpeg.

This silences warnings about pointer target sign mismatches as
already done for gcc with -Wno-pointer-sign.
Signed-off-by: Mans Rullgard <mans@mansr.com>

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

The dependency was added conditional to a variable that is always defined,
so it is safe to add it directly.

config.mak is no longer included multiple times; the guards are pointless.