ffmpeg.git
5 years agoMerge commit '344f7b5a7e0d50573dec402dfe6228676f3889d9'
Michael Niedermayer [Wed, 30 Apr 2014 18:02:42 +0000 (20:02 +0200)]
Merge commit '344f7b5a7e0d50573dec402dfe6228676f3889d9'

* commit '344f7b5a7e0d50573dec402dfe6228676f3889d9':
  hls: Report the current media sequence

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/flacenc: Use av_malloc_array()
Michael Niedermayer [Wed, 30 Apr 2014 16:28:40 +0000 (18:28 +0200)]
avcodec/flacenc: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ivi_common: Use av_mallocz_array()
Michael Niedermayer [Wed, 30 Apr 2014 16:27:51 +0000 (18:27 +0200)]
avcodec/ivi_common: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: use av_mallocz_array()
Michael Niedermayer [Wed, 30 Apr 2014 16:26:28 +0000 (18:26 +0200)]
avcodec/mjpegdec: use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohls: Report the current media sequence
Luca Barbato [Tue, 29 Apr 2014 08:07:03 +0000 (10:07 +0200)]
hls: Report the current media sequence

Useful for debugging mostly.

5 years agoavcodec/tiff: Support 410 and 440 YCbCr
Michael Niedermayer [Wed, 30 Apr 2014 15:41:31 +0000 (17:41 +0200)]
avcodec/tiff: Support 410 and 440 YCbCr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoff_put_wav_header: add flag to force WAVEFORMATEX
Daniel Verkamp [Wed, 30 Apr 2014 02:26:05 +0000 (19:26 -0700)]
ff_put_wav_header: add flag to force WAVEFORMATEX

Partially undoes commit 2c4e08d89327595f7f4be57dda4b3775e1198d5e:

    riff: always generate a proper WAVEFORMATEX structure in
    ff_put_wav_header

A new flag, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX, is added to force the
use of WAVEFORMATEX rather than PCMWAVEFORMAT even for PCM codecs.

This flag is used in the Matroska muxer (the cause of the original
change) and in the ASF muxer, because the specifications for
these formats indicate explicitly that WAVEFORMATEX should be used.

Muxers for other formats will return to the original behavior of writing
PCMWAVEFORMAT when writing a header for raw PCM.

In particular, this causes raw PCM in WAV to generate the canonical
44-byte header expected by some tools.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Wed, 30 Apr 2014 12:34:55 +0000 (14:34 +0200)]
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd/pulse_audio_enc: respect minreq while checking buffer fullness
  lavd/pulse_audio_enc: signal that buffer is still writable after write
  lavd/pulse_audio_enc: add pointer checks
  lavd/pulse_audio_enc: add more buffer attributes
  lavd/fbdev_dec: implement fbdev_get_device_list callback
  lavd/fbdev_enc: move list device code to fbdev_common
  lavd/fbdev_enc: remove redundant assignments

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agosws: dont use the optimized 410->420 unscaled conversion when height%4
Michael Niedermayer [Wed, 30 Apr 2014 04:21:58 +0000 (06:21 +0200)]
sws: dont use the optimized 410->420 unscaled conversion when height%4

Fixes Ticket3594
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vorbisdec: use av_malloc(z)_array()
Michael Niedermayer [Wed, 30 Apr 2014 03:01:53 +0000 (05:01 +0200)]
avcodec/vorbisdec: use av_malloc(z)_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vorbisdec: try to workaround libvorbisenc bug
Michael Niedermayer [Wed, 30 Apr 2014 02:12:29 +0000 (04:12 +0200)]
avcodec/vorbisdec: try to workaround libvorbisenc bug

Fixes Ticket3590

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a7c5fddac8137654cb503295c4dfb6492df43643'
Michael Niedermayer [Tue, 29 Apr 2014 22:46:20 +0000 (00:46 +0200)]
Merge commit 'a7c5fddac8137654cb503295c4dfb6492df43643'

* commit 'a7c5fddac8137654cb503295c4dfb6492df43643':
  avconv_dxva2: define all used GUIDs directly instead of relying on the dxva2api.h header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521'
Michael Niedermayer [Tue, 29 Apr 2014 22:38:13 +0000 (00:38 +0200)]
Merge commit '9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521'

* commit '9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521':
  h264: drop commented out cruft

Conflicts:
libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/pulse_audio_enc: respect minreq while checking buffer fullness
Lukasz Marek [Tue, 29 Apr 2014 22:30:17 +0000 (00:30 +0200)]
lavd/pulse_audio_enc: respect minreq while checking buffer fullness

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/pulse_audio_enc: signal that buffer is still writable after write
Lukasz Marek [Tue, 29 Apr 2014 22:25:13 +0000 (00:25 +0200)]
lavd/pulse_audio_enc: signal that buffer is still writable after write

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/pulse_audio_enc: add pointer checks
Lukasz Marek [Tue, 29 Apr 2014 22:23:14 +0000 (00:23 +0200)]
lavd/pulse_audio_enc: add pointer checks

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/pulse_audio_enc: add more buffer attributes
Lukasz Marek [Mon, 28 Apr 2014 19:33:23 +0000 (21:33 +0200)]
lavd/pulse_audio_enc: add more buffer attributes

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/fbdev_dec: implement fbdev_get_device_list callback
Lukasz Marek [Mon, 28 Apr 2014 00:24:16 +0000 (02:24 +0200)]
lavd/fbdev_dec: implement fbdev_get_device_list callback

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/fbdev_enc: move list device code to fbdev_common
Lukasz Marek [Sun, 27 Apr 2014 23:34:18 +0000 (01:34 +0200)]
lavd/fbdev_enc: move list device code to fbdev_common

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/fbdev_enc: remove redundant assignments
Lukasz Marek [Sun, 27 Apr 2014 23:23:01 +0000 (01:23 +0200)]
lavd/fbdev_enc: remove redundant assignments

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoMerge commit 'c1f92d13589d431e576d719dd44427486a5e05cd'
Michael Niedermayer [Tue, 29 Apr 2014 22:28:47 +0000 (00:28 +0200)]
Merge commit 'c1f92d13589d431e576d719dd44427486a5e05cd'

* commit 'c1f92d13589d431e576d719dd44427486a5e05cd':
  mpegvideo: remove unused MpegEncContext.b4_stride

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6a13505c069890cb0e2a07e29fd819a0cf2e73c1'
Michael Niedermayer [Tue, 29 Apr 2014 22:22:53 +0000 (00:22 +0200)]
Merge commit '6a13505c069890cb0e2a07e29fd819a0cf2e73c1'

* commit '6a13505c069890cb0e2a07e29fd819a0cf2e73c1':
  mpegvideo: move the MpegEncContext fields used from arm asm to the beginning

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: dont print "Conversion failed" if conversion has never started
Michael Niedermayer [Tue, 29 Apr 2014 21:45:22 +0000 (23:45 +0200)]
ffmpeg: dont print "Conversion failed" if conversion has never started

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc: fix no output of prior pics and pic output flags(cherry picked from...
gcocherel [Tue, 29 Apr 2014 09:29:16 +0000 (11:29 +0200)]
avcodec/hevc: fix no output of prior pics and pic output flags(cherry picked from commit e99b96dff1d76d74cb5633aa9702828d863050e2)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agocmdutils: omit deprecated codec ids in help output
Michael Niedermayer [Tue, 29 Apr 2014 19:55:59 +0000 (21:55 +0200)]
cmdutils: omit deprecated codec ids in help output

These ids should be meaningless for the end user and would only
confuse

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/xwma: fix memleak of dpds_table
Michael Niedermayer [Tue, 29 Apr 2014 18:48:03 +0000 (20:48 +0200)]
avformat/xwma: fix memleak of dpds_table

Fixes CID1087092
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/xwma: improve error codes
Michael Niedermayer [Tue, 29 Apr 2014 18:44:07 +0000 (20:44 +0200)]
avformat/xwma: improve error codes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/xwma: use NULL instead of 0 for pointers
Michael Niedermayer [Tue, 29 Apr 2014 18:41:58 +0000 (20:41 +0200)]
avformat/xwma: use NULL instead of 0 for pointers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Tue, 29 Apr 2014 17:29:44 +0000 (19:29 +0200)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavfi/drawtext: allow to format pts as HH:MM:SS.mmm.
  lavf/concatdec: implement automatic conversions.
  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.
  lavc: minor bump and APIchanges for AVCodecDescriptor.mime_types.
  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.
  tools/ffhash: use av_hash_final_hex().
  lavu/hash: add hash_final helpers.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2_alias_pix: fix 2 unused variable warnings
Michael Niedermayer [Tue, 29 Apr 2014 16:47:27 +0000 (18:47 +0200)]
avformat/img2_alias_pix: fix 2 unused variable warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/tiff: support 4:2:2 and 4:1:1 YCbCr
Michael Niedermayer [Tue, 29 Apr 2014 16:39:24 +0000 (18:39 +0200)]
avcodec/tiff: support 4:2:2 and 4:1:1 YCbCr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavconv_dxva2: define all used GUIDs directly instead of relying on the dxva2api.h...
Hendrik Leppkes [Mon, 28 Apr 2014 21:38:05 +0000 (23:38 +0200)]
avconv_dxva2: define all used GUIDs directly instead of relying on the dxva2api.h header

This avoids issues with inconsistent headers with different versions of mingw-w64 and older MSVC variants.

Fixes FATE builds of MSVC 2010.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoMerge commit '5a70a783f04919514efec7751d710b64d8975fd7'
Michael Niedermayer [Tue, 29 Apr 2014 14:37:22 +0000 (16:37 +0200)]
Merge commit '5a70a783f04919514efec7751d710b64d8975fd7'

* commit '5a70a783f04919514efec7751d710b64d8975fd7':
  hls: Add an option to prepend a baseurl to the playlist entries

Conflicts:
doc/muxers.texi
libavformat/hlsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f'
Michael Niedermayer [Tue, 29 Apr 2014 13:42:04 +0000 (15:42 +0200)]
Merge commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f'

* commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f':
  segment: Add an option to prepend a string to the list entries

Conflicts:
doc/muxers.texi
libavformat/segment.c

See: 5e278c19c752d65fdc1da1ceb599b091f71a4b4b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo: fix null pointer dereference
Michael Niedermayer [Tue, 29 Apr 2014 12:50:46 +0000 (14:50 +0200)]
avcodec/mpegvideo: fix null pointer dereference

Fixes: 111342.ogm with ffplay
Found-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264: drop commented out cruft
Anton Khirnov [Tue, 29 Apr 2014 09:13:43 +0000 (11:13 +0200)]
h264: drop commented out cruft

5 years agompegvideo: remove unused MpegEncContext.b4_stride
Anton Khirnov [Thu, 5 Dec 2013 20:17:00 +0000 (21:17 +0100)]
mpegvideo: remove unused MpegEncContext.b4_stride

5 years agompegvideo: move the MpegEncContext fields used from arm asm to the beginning
Anton Khirnov [Thu, 5 Dec 2013 20:14:40 +0000 (21:14 +0100)]
mpegvideo: move the MpegEncContext fields used from arm asm to the beginning

This should reduce the frequency with which the offsets need to be
updated.

5 years agolavfi/drawtext: allow to format pts as HH:MM:SS.mmm.
Nicolas George [Fri, 25 Apr 2014 12:01:43 +0000 (14:01 +0200)]
lavfi/drawtext: allow to format pts as HH:MM:SS.mmm.

5 years agolavf/concatdec: implement automatic conversions.
Nicolas George [Mon, 14 Apr 2014 11:49:12 +0000 (13:49 +0200)]
lavf/concatdec: implement automatic conversions.

5 years agolavf/concatdec: reindent after last commit.
Nicolas George [Mon, 14 Apr 2014 09:58:17 +0000 (11:58 +0200)]
lavf/concatdec: reindent after last commit.

5 years agolavf/concatdec: always do stream matching.
Nicolas George [Mon, 14 Apr 2014 09:57:28 +0000 (11:57 +0200)]
lavf/concatdec: always do stream matching.

5 years agolavf/concatdec: check match_streams() return value.
Nicolas George [Mon, 14 Apr 2014 08:38:36 +0000 (10:38 +0200)]
lavf/concatdec: check match_streams() return value.

5 years agolavf/concatdec: use a structure for each stream.
Nicolas George [Mon, 14 Apr 2014 08:34:53 +0000 (10:34 +0200)]
lavf/concatdec: use a structure for each stream.

5 years agoffprobe: use the codec descriptor if no decoder was found.
Nicolas George [Wed, 16 Apr 2014 22:22:14 +0000 (00:22 +0200)]
ffprobe: use the codec descriptor if no decoder was found.

5 years agolavf/matroska: add "binary" pseudo-MIME type.
Nicolas George [Wed, 16 Apr 2014 17:39:41 +0000 (19:39 +0200)]
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.

5 years agolavc: minor bump and APIchanges for AVCodecDescriptor.mime_types.
Nicolas George [Thu, 17 Apr 2014 07:36:44 +0000 (09:36 +0200)]
lavc: minor bump and APIchanges for AVCodecDescriptor.mime_types.

The minor bump also covers AV_CODEC_ID_BIN_DATA.

5 years agolavc: add a mime_types field to codec descriptors.
Nicolas George [Wed, 16 Apr 2014 21:36:55 +0000 (23:36 +0200)]
lavc: add a mime_types field to codec descriptors.

5 years agolavc: add AV_CODEC_ID_BIN_DATA.
Nicolas George [Wed, 16 Apr 2014 17:34:24 +0000 (19:34 +0200)]
lavc: add AV_CODEC_ID_BIN_DATA.

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 agohls: Add an option to prepend a baseurl to the playlist entries
Luca Barbato [Tue, 18 Mar 2014 20:19:00 +0000 (21:19 +0100)]
hls: Add an option to prepend a baseurl to the playlist entries

Useful to generate playlists with absolute paths.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agosegment: Add an option to prepend a string to the list entries
Enrique Arizón Benito [Tue, 18 Mar 2014 20:18:59 +0000 (21:18 +0100)]
segment: Add an option to prepend a string to the list entries

Useful to generate lists with absolute urls.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
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>