Commit by Michael Niedermayer on master :: r4e04e1b81e ffmpeg/: (link)

Merge remote-tracking branch 'qatar/master'

• qatar/master: swscale: convert yuv2yuvX() to using named arguments. swscale: rename "dstw" to "w" to prevent name collisions. swscale: use named registers in yuv2yuv1_plane() place. lavf: fix aspect ratio mismatch message. avconv: set AVFormatContext.duration from '-t' cljr: implement encode2. cljr: set the properties of the coded_frame, not input frame. dnxhdenc: switch to encode2. bmpenc: switch to encode2(). Conflicts: libavcodec/bmpenc.c libavcodec/cljr.c libavformat/utils.c tests/ref/vsynth1/cljr tests/ref/vsynth2/cljr Merged-by: Michael Niedermayer <michaelni at gmx dot at>

Commit by Reimar Döffinger on master :: rf51a072160 ffmpeg/libavcodec/x86/ (6 files): (link)

Fix compilation without HAVE_AVX.

%ifdef HAVE_AVX must now be %if HAVE_AVX.

Signed-off-by: Reimar Döffinger <Reimar dot Doeffinger at gmx dot de>

Commit by Andrey Utkin on master :: rb66b58f7b0 ffmpeg/libavformat/utils.c: (link)

Fix aspect ratio mismatch message

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

Commit by Andrey Utkin on master :: re3cc617263 ffmpeg/libavformat/utils.c: (link)

lavf: fix aspect ratio mismatch message.

Signed-off-by: Anton Khirnov <anton at khirnov dot net>

Commit by Reimar Döffinger on master :: r47e015e6f1 ffmpeg/libavformat/matroskadec.c: (link)

matroskadec: properly fall back to generic seek.

In particular, detect when the index is obviously broken.
This fixes the worst symptoms of trac issue #958 and makes
sense to allow seeking in files without index.
However it is possible that there still is an index parsing bug
with that file.

Signed-off-by: Reimar Döffinger <Reimar dot Doeffinger at gmx dot de>

Commit by Reimar Döffinger on master :: rc18899d432 ffmpeg/libavformat/matroskadec.c: (link)

matroskadec: reset num_levels on seek.

Otherwise when we run into levels beyond the max. allowed
playback will be permanently broken.

Signed-off-by: Reimar Döffinger <Reimar dot Doeffinger at gmx dot de>

Commit by Reimar Döffinger on master :: rc15f3bd3db ffmpeg/ffmpeg.c: (link)

Simplify: use local variable with same contents directly.

Signed-off-by: Reimar Döffinger <Reimar dot Doeffinger at gmx dot de>

Commit by Reimar Döffinger on master :: rff92549195 ffmpeg/libavformat/oggenc.c: (link)

Fix Theora-in-ogg keyframe handling.

To make seeking work correctly, we must write a new granule for
each keyframe.
Unfortunately we currently have no regression tests due to no
included Theora encoder.
A test based on -vcodec copy from a Theora FATE sample should
probably be added.

Signed-off-by: Reimar Döffinger <Reimar dot Doeffinger at gmx dot de>

Commit by Ronald S. Bultje on master :: r8c433d8a03 ffmpeg/libswscale/x86/output.asm: (link)

swscale: rename "dstw" to "w" to prevent name collisions.

"dstw" can collide with the word-version of the "dst" argument, causing
all kind of weird stuff down the pipe.

Commit by Ronald S. Bultje on master :: r3e23badd83 ffmpeg/libswscale/x86/output.asm: (link)

swscale: convert yuv2yuvX() to using named arguments.

Commit by Ronald S. Bultje on master :: ref66a0ed2e ffmpeg/libswscale/x86/output.asm: (link)

swscale: use named registers in yuv2yuv1_plane() place.

Most of the function had been converted before, but I forgot this
particular location.

Commit by Anton Khirnov on master :: r3dffa1b46c ffmpeg/libavcodec/cljr.c: (link)

cljr: implement encode2.

Commit by Anton Khirnov on master :: r177bb4bf50 ffmpeg/ (3 files in 3 dirs): (link)

cljr: set the properties of the coded_frame, not input frame.

Commit by Michael Niedermayer on master :: r18a7f7465e ffmpeg/libavcodec/pthread.c: (link)

threads: Perform the generic progress cleanup more carefully.

The cleanup is only done now when
a picture is returned (assuming that it has to be done when its returned)
a error is returned (assuming that there will be no further progress on the frame)
the codec is not h264 (this is still needed due to some deadlocks in realvideo)

This fixes a decoding regression with 00017.MTS

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

Commit by Michael Niedermayer on master :: r6be0960851 ffmpeg/libavcodec/pthread.c: (link)

threads: move state update after progress cleanup.

This order is more logic and might prevent a race.

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

Commit by Michael Niedermayer on master :: rf900d60178 ffmpeg/libavcodec/h264.c: (link)

h264: Mark previous field as done before throwing it away.

This fixes some deadlock without the generic cleanup code.

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

Commit by Anton Khirnov on master :: r89829242a6 ffmpeg/libavcodec/dnxhdenc.c: (link)

dnxhdenc: switch to encode2.

Commit by Anton Khirnov on master :: r3f77c41171 ffmpeg/libavcodec/bmpenc.c: (link)

bmpenc: switch to encode2().

Commit by Reimar Döffinger on master :: rb223035511 ffmpeg/ (4 files in 3 dirs): (link)

Detect and check for CMOV.

Some MMX-only CPUs do not have support for CMOV.
All SSE/MMX2 CPUs should be fine, thus no check was
added to those functions.
See also https://sourceforge.net/tracker/?func=detail&aid=3358347&group_id=205275&atid=992986

Signed-off-by: Reimar Döffinger <Reimar dot Doeffinger at gmx dot de>

Commit by Andrey Utkin on master :: rc22e2ec9d1 ffmpeg/avconv.c: (link)

avconv: set AVFormatContext.duration from '-t'

Set output files duration to recording_time option, if given.
Rationale: to save duration into metadata for file that is written to
non-seekable output, for formats like FLV (with metadata at beginning).

Signed-off-by: Anton Khirnov <anton at khirnov dot net>