ffmpeg.git
5 years agolavc: add codec descriptors for TTF and OTF.
Nicolas George [Wed, 16 Apr 2014 21:01:52 +0000 (23:01 +0200)]
lavc: add codec descriptors for TTF and OTF.

5 years agolavc: add codec descriptors for deprecated ids.
Nicolas George [Wed, 16 Apr 2014 18:56:19 +0000 (20:56 +0200)]
lavc: add codec descriptors for deprecated ids.

5 years agolavc/codec_desc: add separation comment.
Nicolas George [Wed, 16 Apr 2014 21:00:27 +0000 (23:00 +0200)]
lavc/codec_desc: add separation comment.

5 years agotools/ffhash: implement base64 output.
Nicolas George [Mon, 21 Apr 2014 15:23:38 +0000 (17:23 +0200)]
tools/ffhash: implement base64 output.

Also fix usage string: the algorithm is not optional.

5 years agotools/ffhash: use av_hash_final_hex().
Nicolas George [Mon, 21 Apr 2014 15:22:22 +0000 (17:22 +0200)]
tools/ffhash: use av_hash_final_hex().

5 years agolavu/hash: add hash_final helpers.
Nicolas George [Mon, 21 Apr 2014 09:01:10 +0000 (11:01 +0200)]
lavu/hash: add hash_final helpers.

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

5 years agoffserver: do not ignore lseek() return
Reynaldo H. Verdejo Pinochet [Tue, 29 Apr 2014 03:48:36 +0000 (23:48 -0400)]
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>
5 years agoffserver: do not ignore getsockname() return
Reynaldo H. Verdejo Pinochet [Mon, 28 Apr 2014 18:02:11 +0000 (14:02 -0400)]
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>
5 years agoffserver: do not ignore send() return
Reynaldo H. Verdejo Pinochet [Mon, 28 Apr 2014 17:45:34 +0000 (13:45 -0400)]
ffserver: do not ignore send() return

Should fix Coverity Scan issue #732178

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
5 years agoffserver: do not ignore setsockopt return
Reynaldo H. Verdejo Pinochet [Mon, 28 Apr 2014 15:58:37 +0000 (11:58 -0400)]
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>
5 years agoffserver: do not ignore ff_socket_nonblock return
Reynaldo H. Verdejo Pinochet [Mon, 28 Apr 2014 15:46:57 +0000 (11:46 -0400)]
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>
5 years agoavcodec/vc1_parser: fix use of uinitialized memory
Michael Niedermayer [Tue, 29 Apr 2014 02:30:53 +0000 (04:30 +0200)]
avcodec/vc1_parser: fix use of uinitialized memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/log: fix memleak from 669a09fb372fa58ff913ebc326cb64bb3e8e7928
Michael Niedermayer [Tue, 29 Apr 2014 01:13:32 +0000 (03:13 +0200)]
avutil/log: fix memleak from 669a09fb372fa58ff913ebc326cb64bb3e8e7928

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg_dxva2: fix mixing of declarations and statements
Michael Niedermayer [Mon, 28 Apr 2014 23:54:42 +0000 (01:54 +0200)]
ffmpeg_dxva2: fix mixing of declarations and statements

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a'
Michael Niedermayer [Mon, 28 Apr 2014 23:32:04 +0000 (01:32 +0200)]
Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a'

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

Conflicts:
Makefile
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'
Michael Niedermayer [Mon, 28 Apr 2014 23:06:58 +0000 (01:06 +0200)]
Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'

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

Conflicts:
Makefile
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b2b4afe8115fe3c8b005d663610e5af06f110165'
Michael Niedermayer [Mon, 28 Apr 2014 23:02:58 +0000 (01:02 +0200)]
Merge commit 'b2b4afe8115fe3c8b005d663610e5af06f110165'

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

See: 0ad8f73f137dad1f3d0f818e22bdb2949186e9ec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ed4b757177f9b563412cdbc8ee3405d82e10fc05'
Michael Niedermayer [Mon, 28 Apr 2014 22:48:25 +0000 (00:48 +0200)]
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>
5 years agoMerge commit '2fcef90bee98bffeff1d95b7197738f50c450d86'
Michael Niedermayer [Mon, 28 Apr 2014 22:37:51 +0000 (00:37 +0200)]
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>
5 years agoffmpeg: print an error at the end if conversion failed
Michael Niedermayer [Mon, 31 Mar 2014 02:31:28 +0000 (04:31 +0200)]
ffmpeg: print an error at the end if conversion failed

Fixes Ticket3477

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix convertion typos
Michael Niedermayer [Mon, 28 Apr 2014 22:07:32 +0000 (00:07 +0200)]
Fix convertion typos

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: rework dxva in avconv handling
Anton Khirnov [Mon, 28 Apr 2014 21:00:38 +0000 (23:00 +0200)]
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.

5 years agoavconv: add support for DXVA2 decoding
Hendrik Leppkes [Tue, 22 Apr 2014 13:22:53 +0000 (15:22 +0200)]
avconv: add support for DXVA2 decoding

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoavcodec/hevc_cabac: decrease CABAC_MAX_BIN
Michael Niedermayer [Sun, 27 Apr 2014 21:43:41 +0000 (23:43 +0200)]
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>
5 years agohwaccel: fix dxva2 & vaapi loop filter parameters
Michael Niedermayer [Tue, 22 Apr 2014 13:22:52 +0000 (15:22 +0200)]
hwaccel: fix dxva2 & vaapi loop filter parameters

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agodxva2_h264: add a workaround for old Intel GPUs
Hendrik Leppkes [Tue, 22 Apr 2014 13:22:51 +0000 (15:22 +0200)]
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>
5 years agoconfigure: add support for new CPUs
James Almer [Mon, 28 Apr 2014 01:01:34 +0000 (22:01 -0300)]
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>
5 years agodxva2_h264: set the correct ref frame index in the long slice struct
Hendrik Leppkes [Tue, 22 Apr 2014 13:22:50 +0000 (15:22 +0200)]
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>
5 years agoavformat/utils: Set the average frame rate from the r_frame_rate if the stream appear...
Michael Niedermayer [Mon, 28 Apr 2014 16:04:38 +0000 (18:04 +0200)]
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>
5 years agoavformat/utils: Ensure that average fps is probed if requested by the user even if...
Michael Niedermayer [Mon, 28 Apr 2014 14:28:41 +0000 (16:28 +0200)]
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>
5 years agoMerge commit '1eb57e1d9b59db0aa63348c21bf3290bd3f5efcb'
Michael Niedermayer [Mon, 28 Apr 2014 14:21:30 +0000 (16:21 +0200)]
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>
5 years agoavformat/utils: prevent r frame rate from being set larger than 1/tb
Michael Niedermayer [Mon, 28 Apr 2014 13:40:23 +0000 (15:40 +0200)]
avformat/utils: prevent r frame rate from being set larger than 1/tb

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: add gif to tb_unreliable()
Michael Niedermayer [Mon, 28 Apr 2014 13:14:41 +0000 (15:14 +0200)]
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>
5 years agolavc: eliminate tb_unreliable()
Anton Khirnov [Fri, 25 Apr 2014 14:33:27 +0000 (16:33 +0200)]
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.

5 years agoavfilter/graphdump: Fix pointer to local outside scope
Michael Niedermayer [Mon, 28 Apr 2014 02:01:50 +0000 (04:01 +0200)]
avfilter/graphdump: Fix pointer to local outside scope

Fixes CID1194435
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpeg12enc: increase declared size of block function argument
Michael Niedermayer [Sun, 27 Apr 2014 23:11:04 +0000 (01:11 +0200)]
avcodec/mpeg12enc: increase declared size of block function argument

Fixes CID1047236
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg_filter: make *jpeg_formats static const
Michael Niedermayer [Sun, 27 Apr 2014 22:20:33 +0000 (00:20 +0200)]
ffmpeg_filter: make *jpeg_formats static const

Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: make type of shift unsigned to avoid undefined behavior
Michael Niedermayer [Sun, 27 Apr 2014 22:16:42 +0000 (00:16 +0200)]
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>
5 years agoavcodec/h264_cabac: fix indention
Michael Niedermayer [Sun, 27 Apr 2014 22:13:51 +0000 (00:13 +0200)]
avcodec/h264_cabac: fix indention

Fixes CID1087088
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/g729postfilter: avoid potential negative shift
Michael Niedermayer [Sun, 27 Apr 2014 21:12:42 +0000 (23:12 +0200)]
avcodec/g729postfilter: avoid potential negative shift

Fixes CID1194402

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/tiff: Support yuv 420 and 444
Michael Niedermayer [Sun, 27 Apr 2014 17:52:37 +0000 (19:52 +0200)]
avcodec/tiff: Support yuv 420 and 444

Fixes Ticket416
Trolled-by: jb
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/tiff: parse subsample factors
Michael Niedermayer [Sun, 27 Apr 2014 16:44:58 +0000 (18:44 +0200)]
avcodec/tiff: parse subsample factors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/fbdev_enc: fix not closed handles
Lukasz Marek [Sun, 27 Apr 2014 14:21:54 +0000 (16:21 +0200)]
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>
5 years agoavformat/mlvdec: close any additional .Mxx files
Peter Ross [Sun, 27 Apr 2014 02:44:16 +0000 (12:44 +1000)]
avformat/mlvdec: close any additional .Mxx files

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mlvdec: remove unused MlvContext.buffer
Peter Ross [Sun, 27 Apr 2014 02:43:45 +0000 (12:43 +1000)]
avformat/mlvdec: remove unused MlvContext.buffer

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix bistream typos
Michael Niedermayer [Sun, 27 Apr 2014 13:30:25 +0000 (15:30 +0200)]
Fix bistream typos

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofix bistream typos
Michael Niedermayer [Sun, 27 Apr 2014 13:21:48 +0000 (15:21 +0200)]
fix bistream typos

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix overriden typos
Michael Niedermayer [Sun, 27 Apr 2014 13:20:45 +0000 (15:20 +0200)]
Fix overriden typos

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix teh typos
Michael Niedermayer [Sun, 27 Apr 2014 13:16:13 +0000 (15:16 +0200)]
Fix teh typos

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix dont and doesnt typos
Michael Niedermayer [Sun, 27 Apr 2014 13:14:32 +0000 (15:14 +0200)]
Fix dont and doesnt typos

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sun, 27 Apr 2014 13:03:56 +0000 (15:03 +0200)]
Merge remote-tracking branch 'cehoyos/master'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/mpeg.h: Remove an unused definition.
Carl Eugen Hoyos [Sun, 27 Apr 2014 12:54:29 +0000 (14:54 +0200)]
lavf/mpeg.h: Remove an unused definition.

Fixes a warning when compiling mpegts.c.

5 years agoFix skiping typos
Michael Niedermayer [Sun, 27 Apr 2014 12:50:14 +0000 (14:50 +0200)]
Fix skiping typos

Found-by: Alessandro Ghedini <alessandro@ghedini.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mlvdec: print unsigned chunk size
Peter Ross [Sun, 27 Apr 2014 02:42:28 +0000 (12:42 +1000)]
avformat/mlvdec: print unsigned chunk size

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mlvdec: process ff_get_wav_header return value
Peter Ross [Sun, 27 Apr 2014 02:42:04 +0000 (12:42 +1000)]
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>
5 years agoavformat/mpegtsenc: Allow DTS audio copy to TS streams
goodthanks [Fri, 25 Apr 2014 04:23:41 +0000 (14:23 +1000)]
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>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sun, 27 Apr 2014 11:29:24 +0000 (13:29 +0200)]
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>
5 years agoavcodec/shorten: check bitshift
Michael Niedermayer [Sun, 27 Apr 2014 04:03:32 +0000 (06:03 +0200)]
avcodec/shorten: check bitshift

Fixes invalid shift
Fixes CID1194400

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoTry mov tags if the fourcc in V_MS/VFW mkv files cannot be found in bmp tags.
Carl Eugen Hoyos [Sun, 27 Apr 2014 07:34:13 +0000 (09:34 +0200)]
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.

5 years agoavfilter/curves: fix resource leaks.
Clément Bœsch [Sun, 27 Apr 2014 09:49:13 +0000 (11:49 +0200)]
avfilter/curves: fix resource leaks.

Fixes CID1206650

5 years agoavcodec/mjpegdec: Fix undefined shift
Michael Niedermayer [Sun, 27 Apr 2014 03:32:56 +0000 (05:32 +0200)]
avcodec/mjpegdec: Fix undefined shift

Fixes CID1194388

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/truemotion2: replace impossible condition by av_assert2
Michael Niedermayer [Sun, 27 Apr 2014 03:20:04 +0000 (05:20 +0200)]
avcodec/truemotion2: replace impossible condition by av_assert2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg_filter: fix pointer to local outside scope
Michael Niedermayer [Sun, 27 Apr 2014 01:45:12 +0000 (03:45 +0200)]
ffmpeg_filter: fix pointer to local outside scope

Fixes CID1206652
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_drawtext: fix resource leaks
Michael Niedermayer [Sat, 26 Apr 2014 23:54:32 +0000 (01:54 +0200)]
avfilter/vf_drawtext: fix resource leaks

Fixes CID1206649

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegtsenc: check avformat_new_stream() return
Michael Niedermayer [Sat, 26 Apr 2014 20:08:10 +0000 (22:08 +0200)]
avformat/mpegtsenc: check avformat_new_stream() return

Fixes CID1206645
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/matroskaenc: fix indention level
Michael Niedermayer [Sat, 26 Apr 2014 20:01:48 +0000 (22:01 +0200)]
avformat/matroskaenc: fix indention level

Fixes CID1206644
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/oggparsecelt: fix memleak
Michael Niedermayer [Sat, 26 Apr 2014 19:31:15 +0000 (21:31 +0200)]
avformat/oggparsecelt: fix memleak

Fixes: CID1108605

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/tee: print errors for each failed bitstream filter
Michael Niedermayer [Sat, 26 Apr 2014 19:08:44 +0000 (21:08 +0200)]
avformat/tee: print errors for each failed bitstream filter

Fixes CID1108584

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/apedec: tmpk==32 is not supported, prevent undefined behavior
Michael Niedermayer [Sat, 26 Apr 2014 18:56:31 +0000 (20:56 +0200)]
avcodec/apedec: tmpk==32 is not supported, prevent undefined behavior

Fixes CID1206639
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAdd AV_LOG_PRINT_LEVEL flag to include log severity in default log formatting.
tue46wsdgxfjrt [Fri, 28 Feb 2014 00:36:09 +0000 (16:36 -0800)]
Add AV_LOG_PRINT_LEVEL flag to include log severity in default log formatting.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agocmdutils: preserve unchanged log flags when setting AV_LOG_SKIP_REPEATED
tue46wsdgxfjrt [Fri, 28 Feb 2014 00:36:09 +0000 (16:36 -0800)]
cmdutils: preserve unchanged log flags when setting AV_LOG_SKIP_REPEATED

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavfi/avfilter: clarify avfilter_graph_get_filter() doxygen
Lukasz Marek [Thu, 24 Apr 2014 22:26:49 +0000 (00:26 +0200)]
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>
5 years agoavcodec/vc1dec: print debug message if a b frame without reference is skiped
Michael Niedermayer [Fri, 25 Apr 2014 23:41:31 +0000 (01:41 +0200)]
avcodec/vc1dec: print debug message if a b frame without reference is skiped

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cdf6eb5a9710566be217a3f17d3d94ac4e4d2662'
Michael Niedermayer [Fri, 25 Apr 2014 23:04:29 +0000 (01:04 +0200)]
Merge commit 'cdf6eb5a9710566be217a3f17d3d94ac4e4d2662'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffserver: fix missing frees at connection setup
Reynaldo H. Verdejo Pinochet [Fri, 25 Apr 2014 22:38:24 +0000 (19:38 -0300)]
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>
5 years agoffserver: free AVStream st before wiping context
Reynaldo H. Verdejo Pinochet [Fri, 25 Apr 2014 21:47:55 +0000 (18:47 -0300)]
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>
5 years agoffserver: free nacl as needed
Reynaldo H. Verdejo Pinochet [Fri, 25 Apr 2014 21:19:16 +0000 (18:19 -0300)]
ffserver: free nacl as needed

Should fix FFmpeg Coverity Scan issue #732268

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
5 years agolavfi/avfilter: fix typos in doxgens
Lukasz Marek [Fri, 25 Apr 2014 21:36:27 +0000 (23:36 +0200)]
lavfi/avfilter: fix typos in doxgens

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dpx: extract frame rate
Michael Niedermayer [Fri, 25 Apr 2014 21:13:17 +0000 (23:13 +0200)]
avcodec/dpx: extract frame rate

Fixes part of Ticket3511

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/movenc: dont store invalid tapt atom
Michael Niedermayer [Fri, 25 Apr 2014 19:47:25 +0000 (21:47 +0200)]
avformat/movenc: dont store invalid tapt atom

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '99e22b7859177f6d3ed6121040924b337dce5497'
Michael Niedermayer [Fri, 25 Apr 2014 19:08:29 +0000 (21:08 +0200)]
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>
5 years agoMerge commit '802385dbc2c57abd76f6a00e32f3df35e9526c08'
Michael Niedermayer [Fri, 25 Apr 2014 17:58:34 +0000 (19:58 +0200)]
Merge commit '802385dbc2c57abd76f6a00e32f3df35e9526c08'

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

See: 8a9b48bfa9156c79ca8a57130ea18465eb717d66
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/avidec: skip len=0 entries from the index
Don Moir [Fri, 25 Apr 2014 15:57:49 +0000 (17:57 +0200)]
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>
5 years agovc1: Do not return an error when skipping b frames
Alessandro Ghedini [Mon, 21 Apr 2014 17:10:52 +0000 (19:10 +0200)]
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>
5 years agomov: Emit the correct tags for clcp tracks
Miles Gould [Mon, 21 Apr 2014 13:46:22 +0000 (14:46 +0100)]
mov: Emit the correct tags for clcp tracks

Bug-Id: 664

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agomov: Write prof section of tapt tag
Aidan Skinner [Mon, 21 Apr 2014 13:47:38 +0000 (14:47 +0100)]
mov: Write prof section of tapt tag

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoswresample: add swri_resample_double_sse2
James Almer [Fri, 25 Apr 2014 07:52:31 +0000 (04:52 -0300)]
swresample: add swri_resample_double_sse2

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mdct_template: Use av_malloc_array()
Michael Niedermayer [Fri, 25 Apr 2014 13:07:31 +0000 (15:07 +0200)]
avcodec/mdct_template: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ttaenc: use av_malloc_array()
Michael Niedermayer [Fri, 25 Apr 2014 13:04:42 +0000 (15:04 +0200)]
avcodec/ttaenc: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: use av_malloc(z)_array()
Michael Niedermayer [Fri, 25 Apr 2014 13:03:26 +0000 (15:03 +0200)]
avcodec/utils: use av_malloc(z)_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6d69f9f37689c999815a65a2d99999fad3a41705'
Michael Niedermayer [Fri, 25 Apr 2014 11:55:37 +0000 (13:55 +0200)]
Merge commit '6d69f9f37689c999815a65a2d99999fad3a41705'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovp9: write uveob as 16-bit value for 16x16/32x32 transforms.
Ronald S. Bultje [Fri, 25 Apr 2014 11:51:39 +0000 (07:51 -0400)]
vp9: write uveob as 16-bit value for 16x16/32x32 transforms.

This fixes make fate-vp9-00-quantizer-01 THREADS=2.

5 years agovp9: use LOCAL_ALIGNED_32 for left/top intra_pred pointers
James Almer [Thu, 24 Apr 2014 17:11:24 +0000 (14:11 -0300)]
vp9: use LOCAL_ALIGNED_32 for left/top intra_pred pointers

This is needed for future AVX2 implementations

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavu: add LOCAL_ALIGNED_32
James Almer [Thu, 24 Apr 2014 02:53:36 +0000 (23:53 -0300)]
lavu: add LOCAL_ALIGNED_32

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/opencl: fix a segmentfault in libavutil/opencl.c
Y.C. Liu [Tue, 22 Apr 2014 14:24:22 +0000 (22:24 +0800)]
avutil/opencl: fix a segmentfault in libavutil/opencl.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: allow overriding ranlib
Michael Niedermayer [Tue, 22 Apr 2014 19:54:08 +0000 (21:54 +0200)]
configure: allow overriding ranlib

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovc-1: Optimise parser (with special attention to ARM)
Ben Avison [Wed, 23 Apr 2014 00:41:04 +0000 (01:41 +0100)]
vc-1: Optimise parser (with special attention to ARM)

The previous implementation of the parser made four passes over each input
buffer (reduced to two if the container format already guaranteed the input
buffer corresponded to frames, such as with MKV). But these buffers are
often 200K in size, certainly enough to flush the data out of L1 cache, and
for many CPUs, all the way out to main memory. The passes were:

1) locate frame boundaries (not needed for MKV etc)
2) copy the data into a contiguous block (not needed for MKV etc)
3) locate the start codes within each frame
4) unescape the data between start codes

After this, the unescaped data was parsed to extract certain header fields,
but because the unescape operation was so large, this was usually also
effectively operating on uncached memory. Most of the unescaped data was
simply thrown away and never processed further. Only step 2 - because it
used memcpy - was using prefetch, making things even worse.

This patch reorganises these steps so that, aside from the copying, the
operations are performed in parallel, maximising cache utilisation. No more
than the worst-case number of bytes needed for header parsing is unescaped.
Most of the data is, in practice, only read in order to search for a start
code, for which optimised implementations already existed in the H264 codec
(notably the ARM version uses prefetch, so we end up doing both remaining
passes at maximum speed). For MKV files, we know when we've found the last
start code of interest in a given frame, so we are able to avoid doing even
that one remaining pass for most of the buffer.

In some use-cases (such as the Raspberry Pi) video decode is handled by the
GPU, but the entire elementary stream is still fed through the parser to
pick out certain elements of the header which are necessary to manage the
decode process. As you might expect, in these cases, the performance of the
parser is significant.

To measure parser performance, I used the same VC-1 elementary stream in
either an MPEG-2 transport stream or a MKV file, and fed it through ffmpeg
with -c:v copy -c:a copy -f null. These are the gperftools counts for
those streams, both filtered to only include vc1_parse() and its callees,
and unfiltered (to include the whole binary). Lower numbers are better:

                Before          After
File  Filtered  Mean   StdDev   Mean   StdDev  Confidence  Change
M2TS  No        861.7  8.2      650.5  8.1     100.0%      +32.5%
MKV   No        868.9  7.4      731.7  9.0     100.0%      +18.8%
M2TS  Yes       250.0  11.2     27.2   3.4     100.0%      +817.9%
MKV   Yes       149.0  12.8     1.7    0.8     100.0%      +8526.3%

Yes, that last case shows vc1_parse() running 86 times faster! The M2TS
case does show a larger absolute improvement though, since it was worse
to begin with.

This patch has been tested with the FATE suite (albeit on x86 for speed).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovc-1: Add platform-specific start code search routine to VC1DSPContext.
Ben Avison [Wed, 16 Apr 2014 00:51:32 +0000 (01:51 +0100)]
vc-1: Add platform-specific start code search routine to VC1DSPContext.

Initialise VC1DSPContext for parser as well as for decoder.
Note, the VC-1 code doesn't actually use the function pointer yet.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264: Move search code search functions into separate source files.
Ben Avison [Wed, 16 Apr 2014 00:51:31 +0000 (01:51 +0100)]
h264: Move search code search functions into separate source files.

This permits re-use with parsers for codecs which use similar start codes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Thu, 24 Apr 2014 23:56:15 +0000 (01:56 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Enable muxing ac-3 in caf.
  Use correct msvc type specifiers for ptrdiff_t and size_t.
  Fix vf_eq.c and vf_eq2.c compilation with !HAVE_6REGS.
  Fix libpostproc compilation with !HAVE_6REGS.
  Never write 0 as maximum bitrate for asf files.

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