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

* commit 'cb8f70c9':
  vf_fps: use double constants for default/min/max for start_time

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

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

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

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

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

Also return and pass on error codes where needed for this
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

When using AV_NOPTS_VALUE (which expands to INT64_C(0x8000000000000000))
as union initializer for a double field, the c99 converter needs to
interpret this constant when filling the union initializer, and it is
interpreted as a positive value.

When converting AV_NOPTS_VALUE to a double, MSVC 2010 ends up with
the same positive value as the c99 converter, while MSVC 2012 gets
a negative value.

This results in an infite loop in various FATE tests on MSVC 2012.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

* qatar/master:
  doc: document the asf demuxer

Conflicts:
	doc/demuxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0ce1a759':
  vf_interlace: fix file permissions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ef51692a':
  Revert "w32pthread: help compiler figure out undeeded code"
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4332bf98':
  w32threads: Don't use function pointers when linking directly to newer APIs
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '310cc4bf':
  smoothstreamingenc: Write to a temp file while updating the manifest
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b1f9cdc3':
  ac3: Return proper error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '818d1f1a':
  ac3: Clean up the error paths
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6258d362':
  ac3: Do not clash with normal AVERROR
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f4634ae8':
  flv: Fix the help string
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '21015109':
  doc: Document the flv demuxer

Conflicts:
	doc/demuxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f812eeda':
  matroskaenc: Fix writing TRACKDEFAULTFLAG

Conflicts:
	libavformat/matroskaenc.c
	tests/fate/wavpack.mak
	tests/ref/lavf/mkv
	tests/ref/seek/lavf-mkv
Merged-by: Michael Niedermayer <michaelni@gmx.at>

And drop a typo from the previous FLV entry.

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

Signed-off-by: Diego Biurrun <diego@biurrun.de>

This reverts commit 4622f11f.

The compiler should be able to do the dead code elimination now
without this when the cond_* names point directly to the real
functions instead of to local function pointers.
Signed-off-by: Martin Storsjö <martin@martin.st>

This reduces the call overhead slightly. More noticeably, it
restores the earlier (unintended?) feature that condition variable
functions work just fine even if w32thread_init() hasn't been called.
This was broken as a side effect of 4622f11f, if explicitly targeting
Vista+.

This makes w32threading work in VP8 again, if targeting Vista+.
Signed-off-by: Martin Storsjö <martin@martin.st>

If a client tries to read the file while it's being updated, the client
would get an incomplete manifest. Instead write to a separate temp file
and atomically rename it to replace the previous one.
Signed-off-by: Martin Storsjö <martin@martin.st>

The parsing function return AVERROR and AAC_AC3_PARSE_ERROR values,
make sure they are not misunderstood.

programs using ffmpeg that are compiled with -Wshorten-64-to-32
gives a warning when using header files common.h and rational.h

cast 64-bit truncated values to (uint32_t) to avoid the warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The element was only being written when the value == 1.  But the default
value of this element is 1, so this has no useful effect.  This element
needs to be written when the value == 0.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

* qatar/master:
  movenc: Check for errors from mov_create_chapter_track
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2bbad1f9':
  movenc: Properly free allocated data on failures in mov_write_header

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

* commit '3559fb97':
  movenc: Check that tracks->enc exists before trying to free extradata

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

* commit '4d122b01':
  movenc: Check for allocation failures in mov_create_chapter_track
Merged-by: Michael Niedermayer <michaelni@gmx.at>