* qatar/master:
  nuv: K&R formatting cosmetics
  build: generalise rules and variable settings for av* programs
  nuv: check RTjpeg header for validity
  Revert "nuv: check per-frame header for validity."
  imc: remove unused field IMCContext.one_div_log2
  imc: fix size of a memset()
  imc: remove empty if() block
  fate: simplify variable setting filter.mak
  lavf: Declare an AVRational struct without a struct literal

Conflicts:
	Makefile
	configure
	libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

This simplifies adding extra flags for individual programs
and also allows more than one object file per program.
Signed-off-by: Mans Rullgard <mans@mansr.com>

This assert is no longer true since h264 error concealment needs
last_picture_ptr to be set.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

it now just checks uninitialized and unused data.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

CC: libav-stable@libav.org

The check is bogus since the nuv frameheader is already skipped
and the (decompressed) RTjpeg header is checked.

This reverts commit f6afacdb.

CC: libav-stable@libav.org

Signed-off-by: Mans Rullgard <mans@mansr.com>

IMCContext was changed from an array to a pointer in 66b84e4a,
but this memset() was not updated.
Signed-off-by: Mans Rullgard <mans@mansr.com>

Signed-off-by: Mans Rullgard <mans@mansr.com>

This removes some needless indirection and duplication.
Signed-off-by: Mans Rullgard <mans@mansr.com>

This seems to cause a crash on Windows.

The author of that patch was a random guy on IRC who wants to stay anonymous.

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

They are available in mpc.h
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

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

Signed-off-by: Paul B Mahol <onemda@gmail.com>

At this place, the normal way of initializing a struct works
fine, there's no need for a struct literal.
Signed-off-by: Martin Storsjö <martin@martin.st>

* qatar/master:
  x86: h264_idct: Rename x264_add8x4_idct_sse2 --> h264_add8x4_idct_sse2
  rational: add av_inv_q() returning the inverse of an AVRational
  dpx: Make start offset unsigned
  lavfi: properly signal out-of-memory error in ff_filter_samples
  cosmetics: Fix a few switched periods and linebreaks
  zerocodec: Fix memleak in decode_frame
  zerocodec: Cosmetics

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

The previous method of having to initialize it outside lead
to incorrect code: even if it was initialized, it usually was
only initialized once, thus a packet that could not be matched
to any stream would just be processed with the return values
from the previous call.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Also slightly more correct behaviour in case streams_left for
some reason is 0 from the start.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

This allows simplifying a few expressions.
Signed-off-by: Mans Rullgard <mans@mansr.com>

Some corrupted files would end up with a negative offset,
and segfault.

Fixes bug #177.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

We're now running some of this code through valgrind for the first
time, and a few warnings showed up stemming from two problems.

1) The ASS code assumes the subtitle header is null terminated, but
it wasn't, and passing the size down doesn't look like fun, so I
added a terminator

2) The code wasn't freeing all of its state.
Signed-off-by: Philip Langdale <philipl@overt.org>

Iam not sure this can happen, but its safer we check.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This patch implements support reading ALAC from Matroska files. The
only non-trivial thing about it is that only the ALAC magic cookie is
stored in Matroska's CodecPrivate element but not the "atom size",
"tag" and "tag version" fields that FFMPEG's ALAC decoder
expects. However, those are trivial to re-create.

Sample files are available:
http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska.mka
and the CoreAudio file it was created from with today's mkvmerge:
http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska-source.cafSigned-off-by: Michael Niedermayer <michaelni@gmx.at>