* commit '06e7301a':
  vf_interlace: do not process an already interlaced frame
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fix trac ticket #3006.

previously only codec_ids could be forced, which did not allow
forcing a specific implementation like libopenjpeg vs jpeg2000.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

previously only codec_ids could be forced, which did not allow
forcing a specific implementation like libopenjpeg vs jpeg2000.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Currently the code passes some nonsense values as
references instead, causing corruption with NVidia's
and assertion failures with Mesa's implementation.
For non-corrupted input this mostly happens in
interlaced bitstreams, e.g.
http://samples.mplayerhq.hu/V-codecs/WMV9/interlaced/480i30__codec_WVC1__mode_2__framerate_29.970__type_2__preproc_17.wmv.
The != VDP_INVALID handle assert does not trigger
(and probably is quite nonsense) because the frames
are initialized to 0.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

This fixes simple concatenated h264
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Ticket3008

Fate changes as PAL8 gets used instead of BGR8
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Signed-off-by: Anton Khirnov <anton@khirnov.net>

* qatar/master:
  rtmp: alias rtmp_listen to listen
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ad0560fe':
  mxf: Remove a typo

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

* commit 'cc41167a':
  asfdec: Check the return value of asf_read_stream_properties
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

Move it to the ATRAC common code, so it can be reused
in the umpcoming ATRAC3+ decoder.
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>

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>

Code copied from wmaprodec

Fixes null pointer dereference
Fixes Ticket3002
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Revert "Merge commit '61c31e4e'" (configure: Properly set zlib dependencies for all components)

The reverted commit introduced undefined behavior.
undefined in the sense that the evaluation order of the dependencies affects the results

Fixes Ticket2920

This reverts commit c32db6ad, reversing
changes made to 05f1b4e2.

Alternative solutions would be to change the dependency solver to handle non trivial
dependencies or to enable zlib by default before the dependency solver, this would
leave a zlib dependency in the libs though then even when no zlib is needed or used.

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

Signed-off-by: Marton Balint <cus@passwd.hu>

Signed-off-by: Marton Balint <cus@passwd.hu>

This should fix decoding the file in:
http://ffmpeg.gusari.org/viewtopic.php?f=16&t=1078
No i dont have the file so i cant test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Make it uniform with the other protocols.

Introduced in 93370d12

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

Before this commit, sws_init_context() failed with an error if no scaler
was explicitly set.

Defaulting to something reasonable is better behavior.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

That's the more proper place where the scaler options should be
documented.