* commit 'f5d2c597':
  build: fix library installation on cygwin
  mpc8: add a flush function
  mpc8: set packet duration and stream start time instead of tracking frames

Conflicts:
	libavformat/mpc8.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Patch readapted by Stefano Sabatini, color values proposed by Tim
Nicholson <nichot20@yahoo.com>.

Address trac ticket #1462.

See thread:
Subject: [FFmpeg-devel] [PATCH] smptebars filter
Date: Wed, 20 Jun 2012 01:54:58 +0000
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Make add_{audio,video}_stream return the found codec, and pass it to
avcodec_open2() through open_{audio,video} functions.

Fix failure:
No codec provided to avcodec_open2().
could not open codec

This is also consistent with the use of the avcodec_open2() API in the
codebase.

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

Fixes out of array reads
Fixes Ticket1330
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This installs libraries using the proper names and locations,
generates an import lib for the DLL, and drops no longer needed
linker flags.
Signed-off-by: Mans Rullgard <mans@mansr.com>

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

Found-by: David Rice

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

The assert can be false with some invalid inputs, the check is
too expensive to always do though for just a warning message.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

It is possible in various error pathes as well as gap handling
that this has already been allocated. Its not clear why that
would be a problem with the current code, thus disable the
assert to avoid common assert failure when asserts are enabled.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* 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>

Ensures that the next frame decoded after seeking will be decoded as a
keyframe.

Fixes mpc8 timestamps.

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>