lavf/concatdec: reindent after last commit.

lavf/concatdec: always do stream matching.

lavf/concatdec: check match_streams() return value.

lavf/concatdec: use a structure for each stream.

ffprobe: use the codec descriptor if no decoder was found.

lavf/matroska: add "binary" pseudo-MIME type.

Avoid long scan and "Could not find codec parameters for stream"
error when an attachment has this type.

lavc: minor bump and APIchanges for AVCodecDescriptor.mime_types.

The minor bump also covers AV_CODEC_ID_BIN_DATA.

lavc: add a mime_types field to codec descriptors.

lavc: add AV_CODEC_ID_BIN_DATA.

lavc: add codec descriptors for TTF and OTF.

lavc: add codec descriptors for deprecated ids.

lavc/codec_desc: add separation comment.

tools/ffhash: implement base64 output.

Also fix usage string: the algorithm is not optional.

tools/ffhash: use av_hash_final_hex().

lavu/hash: add hash_final helpers.

The helpers use local memory to compute the final hash,
making AV_HASH_MAX_SIZE safe to use.

ffserver: do not ignore lseek() return

Should fix FFmpeg Coverity Scan issue #732177

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

ffserver: do not ignore getsockname() return

Should fix FFmpeg Coverity Scan issue #732176

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

ffserver: do not ignore send() return

Should fix Coverity Scan issue #732178

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

ffserver: do not ignore setsockopt return

Should fix FFmpeg Coverity Scan issue #732181

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

ffserver: do not ignore ff_socket_nonblock return

Should fix FFmpeg Coverity Scan issues #732180 & #732182

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

avcodec/vc1_parser: fix use of uinitialized memory

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

avutil/log: fix memleak from 669a09fb372fa58ff913ebc326cb64bb3e8e7928

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

ffmpeg_dxva2: fix mixing of declarations and statements

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

Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a'

* commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a':
  configure: rework dxva in avconv handling

Conflicts:
Makefile
configure

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

Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'

* commit '35177ba77ff60a8b8839783f57e44bcc4214507a':
  avconv: add support for DXVA2 decoding

Conflicts:
Makefile
configure

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

Merge commit 'b2b4afe8115fe3c8b005d663610e5af06f110165'

* commit 'b2b4afe8115fe3c8b005d663610e5af06f110165':
  hwaccel: fix dxva2 & vaapi loop filter parameters

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

Merge commit 'ed4b757177f9b563412cdbc8ee3405d82e10fc05'

* commit 'ed4b757177f9b563412cdbc8ee3405d82e10fc05':
  dxva2_h264: add a workaround for old Intel GPUs

Conflicts:
doc/APIchanges
libavcodec/version.h

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

Merge commit '2fcef90bee98bffeff1d95b7197738f50c450d86'

* commit '2fcef90bee98bffeff1d95b7197738f50c450d86':
  dxva2_h264: set the correct ref frame index in the long slice struct

Conflicts:
libavcodec/dxva2_h264.c

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

ffmpeg: print an error at the end if conversion failed

Fixes Ticket3477

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

Fix convertion typos

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

configure: rework dxva in avconv handling

Move the dxva check after the dependencies have been detected, make sure
the ole32 library exists.

Fixes build on non-Windows.

avconv: add support for DXVA2 decoding

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

avcodec/hevc_cabac: decrease CABAC_MAX_BIN

Prevents shifts with undefined behavior

Fixes CID1206634
Fixes CID1206635
Fixed CID1206636

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

hwaccel: fix dxva2 & vaapi loop filter parameters

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

dxva2_h264: add a workaround for old Intel GPUs

Old Intel GPUs expect the reference frame index to the actual surface,
instead of the index into RefFrameList as specified by the spec.

This workaround should be set when using one of the "ClearVideo" decoder
devices.

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

configure: add support for new CPUs

Add new -march values for Intel CPUs (introduced with GCC 4.9.x), add support
for the missing AMD btver* CPUs, and improve SunCC flags accordingly.

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

dxva2_h264: set the correct ref frame index in the long slice struct

The latest H.264 DXVA specification states that the index in this
structure should refer to a valid entry in the RefFrameList of the picture
parameter structure, and not to the actual surface index.

Fixes H.264 DXVA2 decoding on recent Intel GPUs (tested on Sandy and Ivy)

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

avformat/utils: Set the average frame rate from the r_frame_rate if the stream appears to be cfr

This permits the average fps to be set in more cases

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

avformat/utils: Ensure that average fps is probed if requested by the user even if tb_unreliable() is 0

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

Merge commit '1eb57e1d9b59db0aa63348c21bf3290bd3f5efcb'

* commit '1eb57e1d9b59db0aa63348c21bf3290bd3f5efcb':
  lavc: eliminate tb_unreliable()

Conflicts:
libavformat/utils.c

tb_unreliable() is used in several other parts of libavformat and thus isnt removed
The remaining change is a removial of a call to tb_unreliable() which would cause
a practically unconditional delay of about 1 second in startup for live streams.
I will implement what the commit message claims the change should do in the next
commit

This is thus, not merged

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

avformat/utils: prevent r frame rate from being set larger than 1/tb

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

avformat/utils: add gif to tb_unreliable()

This improves the used timebases when gif is the source

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

lavc: eliminate tb_unreliable()

If framerate estimation is enabled, it makes sense to always apply it,
instead of limiting it to a few specific cases.

avfilter/graphdump: Fix pointer to local outside scope

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

avcodec/mpeg12enc: increase declared size of block function argument

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

ffmpeg_filter: make *jpeg_formats static const

Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/mjpegdec: make type of shift unsigned to avoid undefined behavior

Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/h264_cabac: fix indention

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

avcodec/g729postfilter: avoid potential negative shift

Fixes CID1194402

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

avcodec/tiff: Support yuv 420 and 444

Fixes Ticket416
Trolled-by: jb
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/tiff: parse subsample factors

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

lavd/fbdev_enc: fix not closed handles

Fixes CID 1206651

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/mlvdec: close any additional .Mxx files

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/mlvdec: remove unused MlvContext.buffer

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fix bistream typos

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

fix bistream typos

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

Fix overriden typos

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

Fix teh typos

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

Fix dont and doesnt typos

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavf/mpeg.h: Remove an unused definition.

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

lavf/mpeg.h: Remove an unused definition.

Fixes a warning when compiling mpegts.c.

Fix skiping typos

Found-by: Alessandro Ghedini <alessandro@ghedini.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/mlvdec: print unsigned chunk size

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/mlvdec: process ff_get_wav_header return value

Fixes CID1206640.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/mpegtsenc: Allow DTS audio copy to TS streams

This doesn't allow encoding of DTS or TrueHD. It just sets the correct
stream ID in the TS output file when a DTS or TrueHD audio stream is copied.

Fixes ticket #1398

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Try mov tags if the fourcc in V_MS/VFW mkv files cannot be found in bmp tags.

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

avcodec/shorten: check bitshift

Fixes invalid shift
Fixes CID1194400

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

Try mov tags if the fourcc in V_MS/VFW mkv files cannot be found in bmp tags.

Fixes decoding of broken mkv files containing ProRes video from ticket #3434.

avfilter/curves: fix resource leaks.

Fixes CID1206650

avcodec/mjpegdec: Fix undefined shift

Fixes CID1194388

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

avcodec/truemotion2: replace impossible condition by av_assert2

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

ffmpeg_filter: fix pointer to local outside scope

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

avfilter/vf_drawtext: fix resource leaks

Fixes CID1206649

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

avformat/mpegtsenc: check avformat_new_stream() return

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

avformat/matroskaenc: fix indention level

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

avformat/oggparsecelt: fix memleak

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

avformat/tee: print errors for each failed bitstream filter

Fixes CID1108584

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

avcodec/apedec: tmpk==32 is not supported, prevent undefined behavior

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

Add AV_LOG_PRINT_LEVEL flag to include log severity in default log formatting.

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

cmdutils: preserve unchanged log flags when setting AV_LOG_SKIP_REPEATED

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

lavfi/avfilter: clarify avfilter_graph_get_filter() doxygen

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/vc1dec: print debug message if a b frame without reference is skiped

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

Merge commit 'cdf6eb5a9710566be217a3f17d3d94ac4e4d2662'

* commit 'cdf6eb5a9710566be217a3f17d3d94ac4e4d2662':
  vc1: Do not return an error when skipping b frames

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

ffserver: fix missing frees at connection setup

Should fix FFmpeg Coverity Scan issue #732266 and some of #732265

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

ffserver: free AVStream st before wiping context

Should fix FFmpeg Coverity Scan issue #732269

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

ffserver: free nacl as needed

Should fix FFmpeg Coverity Scan issue #732268

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

lavfi/avfilter: fix typos in doxgens

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/dpx: extract frame rate

Fixes part of Ticket3511

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

avformat/movenc: dont store invalid tapt atom

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

Merge commit '99e22b7859177f6d3ed6121040924b337dce5497'

* commit '99e22b7859177f6d3ed6121040924b337dce5497':
  mov: Emit the correct tags for clcp tracks

Conflicts:
libavformat/movenc.c

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

Merge commit '802385dbc2c57abd76f6a00e32f3df35e9526c08'

* commit '802385dbc2c57abd76f6a00e32f3df35e9526c08':
  mov: Write prof section of tapt tag

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

avformat/avidec: skip len=0 entries from the index

Reduces cpu & memory requirements for the index
See Ticket 3531

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

vc1: Do not return an error when skipping b frames

This caused mpv (and possibly others) to fallback to software decoding after
seeking a VC1 stream.

Bug-Id: 667

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

mov: Emit the correct tags for clcp tracks

Bug-Id: 664

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

mov: Write prof section of tapt tag

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

swresample: add swri_resample_double_sse2

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

avcodec/mdct_template: Use av_malloc_array()

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

avcodec/ttaenc: use av_malloc_array()

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

avcodec/utils: use av_malloc(z)_array()

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

Merge commit '6d69f9f37689c999815a65a2d99999fad3a41705'

* commit '6d69f9f37689c999815a65a2d99999fad3a41705':
  vp9: write uveob as 16-bit value for 16x16/32x32 transforms.

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