Merge commit 'ed7922faac4ea4c893efc3cdf8102ebc49fcc011'

* commit 'ed7922faac4ea4c893efc3cdf8102ebc49fcc011':
  mux: drop one of the hacks comprising compute_pkt_fields2()

Conflicts:
libavformat/mux.c

Not merged as -async drop / -vsync drop depends on this code

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

avcodec/libvorbisenc: do not attempt to flush if no data was input

this prevents the creation of a packet even though no single sample has ever
been input, which some confusion in the timestamp generation

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

avcodec/libmp3lame: do not attempt to flush lame if no data was input

this prevents the creation of a packet even though no single sample has ever
been input, which some confusion in the timestamp generation

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

avformat/mpegtsenc: fix dts for chained muxing aac in mpegts

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

ffmpeg: set dts for subtitles

dts is not optional, its required for muxing,
previously it was set from AVStream.pts

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

ffmpeg: add last_mux_dts_plus_duration

Fixes 1 frame error in the duration and derived values,
introduced by not using AVStream.pts in the previous commit

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

Merge commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0'

* commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0':
  avconv: do not use poorly defined and undocumented AVStream.pts

Conflicts:
ffmpeg.c

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

Merge commit 'c9f8809ee4c576d5833865039bc1c85754448f67'

* commit 'c9f8809ee4c576d5833865039bc1c85754448f67':
  hevc/intra_pred: simplify neighboring sample derivation

Conflicts:
libavcodec/hevcpred_template.c

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

Merge commit '25bb7eaf9eb14e6e00264bf584aa4d380d3bc29f'

* commit '25bb7eaf9eb14e6e00264bf584aa4d380d3bc29f':
  hevc/intra_pred: drop unnecessary conditions in loops

Conflicts:
libavcodec/hevcpred_template.c

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

Merge commit '4c390b1ba98e6aec787aa0e7ea57ed7cb38283b7'

* commit '4c390b1ba98e6aec787aa0e7ea57ed7cb38283b7':
  hevc/intra_pred: optimize EXTEND_()*

Conflicts:
libavcodec/hevcpred_template.c

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

Merge commit 'a1c2b48018b09d2613f075ec0748c95bd520ac00'

* commit 'a1c2b48018b09d2613f075ec0748c95bd520ac00':
  hevc: templatize intra_pred

Conflicts:
libavcodec/hevc.h

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

Merge commit '04db5794cd97e4b33ec2f963ef7f967722a456eb'

* commit '04db5794cd97e4b33ec2f963ef7f967722a456eb':
  hevc: templatize pred_planar

Conflicts:
libavcodec/hevcpred_template.c

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

mux: drop one of the hacks comprising compute_pkt_fields2()

All encoders should output proper timestamps now.

avconv: do not use poorly defined and undocumented AVStream.pts

Use OutputStream.last_mux_dts as an approximation of 'current' output
time instead.

hevc/intra_pred: simplify neighboring sample derivation

hevc/intra_pred: drop unnecessary conditions in loops

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

hevc/intra_pred: optimize EXTEND_()*

Process 4 pixels at once.

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

hevc: templatize intra_pred

hevc: templatize pred_planar

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

avcodec/diracdec: move mc buffer allocation to per frame

Fixes out of array accesses for non default buffers with large strides

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

ffmpeg: Use av_gettime_relative()

Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.

Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Set dwSuggestBufferSize to largest chunk size for every stream in avi.

Fixes playback with WMP 9 for files with large (rawvideo) frames
as explained in ticket #2145.

Fixes ticket #2818.

x86/hevc_deblock: remove some duplicated instructions

Also remove a couple unnecessary cmps

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffmpeg: prefix encoder with "Lavc " in bitexact mode

This avoids misleading encoder names like "encoder = prores"

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

Merge commit '0ba5299a805e9ccaef1a757381fc2ada4d54b8a1'

* commit '0ba5299a805e9ccaef1a757381fc2ada4d54b8a1':
  movenc: use the "encoder" metadata tag to write stsd Compressorname

Conflicts:
libavformat/movenc.c
libavformat/movenc.h

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

ffmpeg: Skip writing the version when -flags bitexact is used

Alternatively every fate test could be changed to pass both fflags and flags +bitexact

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

Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'

* commit '6656370b858329ca07a60a2de954d5e90daa0206':
  avconv: set the "encoder" tag when transcoding

Conflicts:
ffmpeg.c
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv

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

Merge commit 'd246231e4714119faac6c7acd881d3b687bb8b11'

* commit 'd246231e4714119faac6c7acd881d3b687bb8b11':
  wavenc: use codec descriptors to get the codec name

Conflicts:
libavformat/wavenc.c

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

Merge commit '968a62a9d9e3a785ce1f79b80facfe09c6c14544'

* commit '968a62a9d9e3a785ce1f79b80facfe09c6c14544':
  doc/APIchanges: mark the release 10 branch point

Conflicts:
doc/APIchanges

Not merged, as there was no such branch in ffmpeg

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

Merge commit '33082af7560a18179b52734665ef66f812902d33'

* commit '33082af7560a18179b52734665ef66f812902d33':
  doc/APIchanges: fill in missing hashes and dates

Conflicts:
doc/APIchanges

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

movenc: use the "encoder" metadata tag to write stsd Compressorname

This mirrors the demuxer behaviour and avoids accessing
AVCodecContext.codec, which should not be done in muxers.

avconv: set the "encoder" tag when transcoding

wavenc: use codec descriptors to get the codec name

Also, return a proper error code.

ffprobe: fix crash happening because of new streams occuring

Fix trac ticket #3603.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

x86: hevc_mc: specify coefficients registers

By default, macro EPEL_FILTER loads the coefficients inconditionally
into m14/m15. This forces an unneeded higher register count.

Reduce that count by making them parameters of EPEL_FILTER.

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

lavd: Use av_gettime_relative()

Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.

Since v4l2 is compiled only on Linux where av_gettime_relative()
is monotonic, a small wrapper function av_gettime_monotonic() is used
(should be inlined the compiler) to put emphasis on that fact.

Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/wmv2enc: allocate padding for extradata and check malloc failure

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

avcodec/movtextenc: allocate padding for extradata

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

avcodec/ffv1enc: allocate padding for extradata

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

avcodec/crystalhd: allocate padding for extradata

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

Merge commit '79f2c426fde6e71c40b29504112d0528b85be623'

* commit '79f2c426fde6e71c40b29504112d0528b85be623':
  dv: do not set codec timebase

Conflicts:
libavformat/dv.c

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

Merge commit '93afb6c98df876b15e3d911a9450ad55f92080ce'

* commit '93afb6c98df876b15e3d911a9450ad55f92080ce':
  avconv: set output avg_frame_rate when known

Conflicts:
ffmpeg.c

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

Merge commit '7a5f4f6853047eea74a6443d73f4d74d52b2799f'

* commit '7a5f4f6853047eea74a6443d73f4d74d52b2799f':
  lavf: extend avg_frame_rate documentation.

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

Merge commit 'c3311d472a7528c67f76d0d061704ae70a99b32e'

* commit 'c3311d472a7528c67f76d0d061704ae70a99b32e':
  avienc: sanitize variable naming in write_header()

Conflicts:
libavformat/avienc.c

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

Merge commit 'ab3fdaa7131e2fd8e33006daea25a282724c01f0'

* commit 'ab3fdaa7131e2fd8e33006daea25a282724c01f0':
  yop: only set extradata size after it has been successfully allocated

Conflicts:
libavformat/yop.c

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

Merge commit 'b513bf6f69e26e724de6d5dca642c3582dcd0517'

* commit 'b513bf6f69e26e724de6d5dca642c3582dcd0517':
  yuv4mpegdec: do not set coded_frame properties

Conflicts:
libavformat/yuv4mpegdec.c

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

Merge commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37'

* commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37':
  yuv4mpeg: split the demuxer and muxer into separate files

Conflicts:
libavformat/yuv4mpegdec.c

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

Merge commit '3ef6c5264b2590781b4ed556443ff49709dd45fb'

* commit '3ef6c5264b2590781b4ed556443ff49709dd45fb':
  a64: check that extradata exists before reading from it

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

Merge commit 'b136564909adec2043be4c94ade08b67ad443124'

* commit 'b136564909adec2043be4c94ade08b67ad443124':
  a64: remove unneeded struct qualifier

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

Merge commit 'd256ed78ffe202a4dcc8d625becffc716bfa3977'

* commit 'd256ed78ffe202a4dcc8d625becffc716bfa3977':
  4xm: allocate extradata properly.

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

Merge commit 'fd056029f45a9f6d213d9fce8165632042511d4f'

* commit 'fd056029f45a9f6d213d9fce8165632042511d4f':
  lavc: add avcodec_free_context().

Conflicts:
doc/APIchanges
libavcodec/version.h

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

Merge commit 'e1b66778b6ee82a192b5895e23c4e135f7269326'

* commit 'e1b66778b6ee82a192b5895e23c4e135f7269326':
  lavc: remove the locking code in avcodec_close()

Conflicts:
libavcodec/utils.c

Note, if someone knows of a external codec lib/API, hwaccel or other that requires
locking on its close/free side, please contact ffmpeg-devel.

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

doc/APIchanges: mark the release 10 branch point

doc/APIchanges: fill in missing hashes and dates

dv: do not set codec timebase

It is not supposed to be set from outside of libavcodec.
Set average framerate instead.

avconv: set output avg_frame_rate when known

lavf: extend avg_frame_rate documentation.

avienc: sanitize variable naming in write_header()

Do not call an AVCodecContext 'stream', that is highly confusing.
Also, add a local variable for the current AVStream in the loop over all
streams.

yop: only set extradata size after it has been successfully allocated

Do not leave a non-zero extradata_size set on failure

yuv4mpegdec: do not set coded_frame properties

coded_frame is not meant to be changed from outside of lavc, and is not
used for decoding.
Set AVCodecContext.field_order instead.

yuv4mpeg: split the demuxer and muxer into separate files

a64: check that extradata exists before reading from it

a64: remove unneeded struct qualifier

4xm: allocate extradata properly.

Pad it with the required amount of zeros, check for malloc failure.

lavc: add avcodec_free_context().

Right now, the caller has to manually manage some allocated
AVCodecContext fields, like extradata or subtitle_header. This is
fragile and prone to leaks, especially if we want to add more such
fields in the future.

The only reason for this behaviour is so that the AVStream codec context
can be reused for decoding. Such reuse is discouraged anyway, so this
commit is the first step to deprecating it.

lavc: remove the locking code in avcodec_close()

This function should not modify any global state, so there should be no
reason for any locking.

avformat/framehash: switch to AVFMT_FLAG_BITEXACT

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

avformat/mmf: switch to AVFMT_FLAG_BITEXACT

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

avformat/matroskaenc: switch to AVFMT_FLAG_BITEXACT

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

avformat/mp3enc: switch to AVFMT_FLAG_BITEXACT

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

avformat/nutenc: switch to AVFMT_FLAG_BITEXACT

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

avformat/rtpenc: switch to AVFMT_FLAG_BITEXACT

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

avformat/aviobuf/ff_get_line: also accept \r as end of line character

Fixes Ticket3108

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

ffplay: Use av_gettime_relative()

Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.

Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '584f88409062f7a134e7391887899e8e723ab6ff'

* commit '584f88409062f7a134e7391887899e8e723ab6ff':
  riff: Pass block_align to estimate frame duration

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

lavf: Use av_gettime_relative()

Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.

Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

configure: make vp9 decoder select the parser.

The parser is needed. FATE breaks if not present.

configure: make sure pkg-config flags are populated in FT test.

tools: Use av_gettime_relative()

Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.

Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavc: Use av_gettime_relative()

Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.

Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavu: add av_gettime_relative()

These functions are using the POSIX clock_gettime() function with the
CLOCK_MONOTONIC clock id. If these are not present on the targeted
platform, the new functions will fallback on using the original realtime functions
av_gettime() and av_usleep().

Monotonic support can be added on other platforms with their
equivalent native system API eventually if possible.

Whenever time is requested to measure relative time, the monotonic clock,
when available, is superior to the system realtime clock because it is
not affected by discontinuous jumps in the system time

In a future step, offering the flexibility to let the user choose between
rt and monotonic clock for avdevices packets will be investigated.

It is very easy to experience the issues that this patch attempt to address
by rewinding back in the past the system time while ffmpeg is running.

this is breaking the ffmpeg report printing (ffmepg.c:print_report()) and
the the rate emulator functionality (-re) without the patch.

Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

riff: Pass block_align to estimate frame duration

Fix incorrect wSamplesPerBlock(=0) written for ADPCM_IMA_WAV

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix compilation of libavcodec/x86/hevc_deblock.asm with nasm.

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

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: add support for toggling between multiple video filters with the w key
  ffplay: fix typo in docs
  ffplay: try multiple sample rates if audio open fails
  cmdutils: replace usages of "#ifdef __MINGW32__" with "#ifdef _WIN32" because MSVC only defines _WIN32
  ffplay: fix compilation with Visual Studio
  ffplay: increase AV_SYNC_THRESHOLD_MIN to 0.04

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

avfilter/edgedetect: reuse already defined ctx.

ffplay: add support for toggling between multiple video filters with the w key

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

ffplay: fix typo in docs

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

ffplay: try multiple sample rates if audio open fails

Should fix ticket #3509.

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

cmdutils: replace usages of "#ifdef __MINGW32__" with "#ifdef _WIN32" because MSVC only defines _WIN32

With the previous patch, this should fix ticket #3580 as well.

Signed-off-by: John Peebles <johnpeeb@gmail.com>

ffplay: fix compilation with Visual Studio

Based on a patch by achristensen from trac.ffmpeg.org.

Partially fixes ticket #3580.

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

ffplay: increase AV_SYNC_THRESHOLD_MIN to 0.04

Less than 0.04 sec delays should not be noticable, and it helps us with 50fps
content where some timing errors can cause a frame dup where it is not really
necessary.

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

Fix compilation of libavcodec/x86/hevc_deblock.asm with nasm.

Suggested-by: Reimar

Fix alaw and mulaw muxing in caf.

Fixes ticket #3644.

x86/hevc_deblock: use movhps instead of shuffling values

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

x86/hevc_deblock: fix label names

Also remove some unnecessary jmps

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

x86/hevc_deblock: fix usage of ABS1

The second argument is a temp register for non-SSSE3 cases

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

x86/hevc_deblock: merge movs with other instructions

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

doc/filters: fix typo

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

Merge commit '34e2ce5dde073244ccb2b62f930e96fe612690f7'

* commit '34e2ce5dde073244ccb2b62f930e96fe612690f7':
  hlsenc: Set the default codecs to AAC and H264

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

hevc: fix key_frame as an IRAP

it was always 1 before with ISOBMFF(cherry picked from commit fb1402b1ec78d80acd6ced76bf78d65560965c4c)

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