imgconvert: add avcodec_find_best_pix_fmt_of_2()

and deprecate avcodec_find_best_pix_fmt2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg_filter: use avcodec_find_best_pix_fmt_of_2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfiltergraph: use avcodec_find_best_pix_fmt_of_2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
configure: add switch to enable debian/libav compatible ABI

needed for avcodec_find_best_pix_fmt2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavc: support building with the forks ABI for avcodec_find_best_pix_fmt2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
filmstripdec: add new line to error message

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
flic: use AV_LOG_ERROR for error message

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Rename missed cases of FF_OPT_TYPE_* to AV_OPT_TYPE_*

Signed-off-by: Martin Storsjö <martin@martin.st>
crypto: Remove a stray double space

Signed-off-by: Martin Storsjö <martin@martin.st>
swr/resample: update SSSE3 flag to new name

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
fate-utvideoenc: remove unneeded -f avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
matroskadec, matroskadec, srtenc: Read/Write duration for subtitles.

After much discussion and back-and-forth, we reached the conclusion
that matroska uses convergence_duration for subtitle duration because
a 32bit value isn't large enough to store the duration if sub-micro-second
timebases are used. Matroska may not be the only one that supports these
timebases, but it's certainly the only one that ffmpeg attempts to support
in this way.

The long term solution that we seemed to reach was that if we encounter
a matroska file with a sub-micro-second timebase, we should internally
scale it up to at least micro-second, and then duration can be used
normally. This suggests that on the encode side, we should not allow
generation of files with sub-micro-second timebases, but that's a separate
issue.

That being a non-trivial change, and the subtitle interoperability breakage
being very real, I'm re-submitting this small change for consideration.

In this diff, we make sure that duration is populated by the matroska
demuxer, and that convergence_duration is respected in matroskaenc and
srtenc, but that duration is used otherwise. This ends up being a strict
improvement - pipelines that use convergence duration are unchanged, and
ones that are currently broken due to the duration mismatch will start
working - except for the ones with the extreme timebases, but those were
already broken.

Signed-off-by: Philip Langdale <philipl@overt.org>
libavfilter: Support the forks ABI for buffer sinks

With this change avconv compiled against libav and linked to ffmpegs libs
will run through the whole fate testsuite without any crashes.
857 tests pass, the remaining tests fail one way or another, which is
to be expected as avconv is not a drop in replacement for ffmpeg
The testsuite used was the ffmpeg fate testsuite, not libavs.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avoid ambigous buffersink names

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavfi/mp: remove decimate wrapper

It was natively integrated into libavfilter.
cpia: move reget_buffer after header check

If the header is invalid, there is no need to get at buffer.
Do it after the header has been checked.
Suggested by Reimar Döffinger
Merge branch 'master' of git://source.ffmpeg.org/ffmpeg
Fix compilation with yasm-0.6.2.
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  crypto: Remove a stray double space
  Rename missed cases of FF_OPT_TYPE_* to AV_OPT_TYPE_*

Conflicts:
	libavfilter/vf_delogo.c
	libavfilter/vf_lut.c
	libavfilter/vsrc_testsrc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'stev47/master'

* stev47/master:
  cpia: move reget_buffer after header check

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