ffmpeg.git
5 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Fri, 2 May 2014 16:46:20 +0000 (18:46 +0200)]
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd/xv: reident after previous commits
  lavf/mux: pass options to nested structs of priv data
  lavu/opt: add av_opt_set_dict2() function
  lavd/opengl_enc: fix window size correction code
  lavd/opengl_enc: add window size param
  lavd/opengl_enc: use flag to mark inited context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/xv: reident after previous commits
Lukasz Marek [Fri, 2 May 2014 15:52:57 +0000 (17:52 +0200)]
lavd/xv: reident after previous commits

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavf/mux: pass options to nested structs of priv data
Lukasz Marek [Tue, 29 Apr 2014 22:00:44 +0000 (00:00 +0200)]
lavf/mux: pass options to nested structs of priv data

This commit allows to benefit from implementing child_next
callback for muxers' AVClasses.
Without that, options cannot be set in nested structs.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavu/opt: add av_opt_set_dict2() function
Lukasz Marek [Tue, 29 Apr 2014 21:57:24 +0000 (23:57 +0200)]
lavu/opt: add av_opt_set_dict2() function

Existing av_opt_set_dict doesn't accept flags.
It doesn't allow to pass options to nested structs.
New function alllows that.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/opengl_enc: fix window size correction code
Lukasz Marek [Thu, 1 May 2014 22:28:27 +0000 (00:28 +0200)]
lavd/opengl_enc: fix window size correction code

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/opengl_enc: add window size param
Lukasz Marek [Thu, 1 May 2014 22:16:25 +0000 (00:16 +0200)]
lavd/opengl_enc: add window size param

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/opengl_enc: use flag to mark inited context
Lukasz Marek [Thu, 1 May 2014 22:06:38 +0000 (00:06 +0200)]
lavd/opengl_enc: use flag to mark inited context

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoavcodec/mpegvideo: fix gray*() parameter types
Michael Niedermayer [Fri, 2 May 2014 15:12:26 +0000 (17:12 +0200)]
avcodec/mpegvideo: fix gray*() parameter types

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo: support disabling motion compensation
Michael Niedermayer [Fri, 2 May 2014 13:57:59 +0000 (15:57 +0200)]
avcodec/mpegvideo: support disabling motion compensation

This allows analyzing videos without having prior and current frames mixed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoEnable opencl wihtout pthreads.
Matt Oliver [Fri, 2 May 2014 02:49:23 +0000 (12:49 +1000)]
Enable opencl wihtout pthreads.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_yadif: fix filtering a single image
Michael Niedermayer [Fri, 2 May 2014 00:08:19 +0000 (02:08 +0200)]
avfilter/vf_yadif: fix filtering a single image

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libxvid: improve return codes
Michael Niedermayer [Thu, 1 May 2014 21:08:01 +0000 (23:08 +0200)]
avcodec/libxvid: improve return codes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils/ff_init_buffer_info factor avctx->internal->pkt; out
Michael Niedermayer [Thu, 1 May 2014 20:59:59 +0000 (22:59 +0200)]
avcodec/utils/ff_init_buffer_info factor avctx->internal->pkt; out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: merge ff_decode_frame_props() and ff_init_buffer_info()
Michael Niedermayer [Thu, 1 May 2014 19:40:42 +0000 (21:40 +0200)]
avcodec/utils: merge ff_decode_frame_props() and ff_init_buffer_info()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: ff_decode_frame_props: set pkt_size
Michael Niedermayer [Thu, 1 May 2014 19:18:57 +0000 (21:18 +0200)]
avcodec/utils: ff_decode_frame_props: set pkt_size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: put the sizeof() second in av_malloc_array()
Michael Niedermayer [Thu, 1 May 2014 19:02:45 +0000 (21:02 +0200)]
ffmpeg: put the sizeof() second in av_malloc_array()

This is purely a cosmetic change
Suggested-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoopencl: add support for non-pthread locking
Matt Oliver [Thu, 1 May 2014 09:21:29 +0000 (19:21 +1000)]
opencl: add support for non-pthread locking

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/wtvdec: ignore mpeg2 extradata
Peter Ross [Thu, 1 May 2014 12:22:09 +0000 (22:22 +1000)]
avformat/wtvdec: ignore mpeg2 extradata

Files produced by windows media center contain meaningless mpeg1 sequence
header. The mpeg2 decoder detects the presence mpeg1 sequence header start
codes and attempts to decode the stream as mpeg1. (This problem introduced
in 73a2d16b.)

Fixes ticket #3601.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ba71c74017c287681153ec8f6f1cba650d797275'
Michael Niedermayer [Thu, 1 May 2014 16:04:39 +0000 (18:04 +0200)]
Merge commit 'ba71c74017c287681153ec8f6f1cba650d797275'

* commit 'ba71c74017c287681153ec8f6f1cba650d797275':
  lavc: deprecate AVCodecContext.codec_name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e7fc9796d82abc99ef0af71027fb9aaa5311d137'
Michael Niedermayer [Thu, 1 May 2014 16:00:27 +0000 (18:00 +0200)]
Merge commit 'e7fc9796d82abc99ef0af71027fb9aaa5311d137'

* commit 'e7fc9796d82abc99ef0af71027fb9aaa5311d137':
  lavc: do not use AVCodecContext.codec_name in avcodec_string()

Conflicts:
libavcodec/utils.c

See: d2d7b7134fc387837d51aa1d7f3dbe090d35e8b4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca'
Michael Niedermayer [Thu, 1 May 2014 15:49:38 +0000 (17:49 +0200)]
Merge commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca'

* commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca':
  rmdec: do not export anything to AVCodecContext.codec_name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d'
Michael Niedermayer [Thu, 1 May 2014 15:40:14 +0000 (17:40 +0200)]
Merge commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d'

* commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d':
  asfenc: use codec descriptors instead of AVCodecs to write codec info

Conflicts:
tests/ref/lavf/asf
tests/ref/seek/lavf-asf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '92e4b643dfdafdb6528f1baffdbea2b9a028d7c0'
Michael Niedermayer [Thu, 1 May 2014 15:25:50 +0000 (17:25 +0200)]
Merge commit '92e4b643dfdafdb6528f1baffdbea2b9a028d7c0'

* commit '92e4b643dfdafdb6528f1baffdbea2b9a028d7c0':
  oggparseskeleton: do not use AVCodecContext.codec_name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '18f2514c4037befd37b02e4d4f10c159edf3b26f'
Michael Niedermayer [Thu, 1 May 2014 15:13:05 +0000 (17:13 +0200)]
Merge commit '18f2514c4037befd37b02e4d4f10c159edf3b26f'

* commit '18f2514c4037befd37b02e4d4f10c159edf3b26f':
  mov: export stsd Compressorname in metadata

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a2941c8cb216bdc144953cace64973f5600ffa2d'
Michael Niedermayer [Thu, 1 May 2014 15:03:59 +0000 (17:03 +0200)]
Merge commit 'a2941c8cb216bdc144953cace64973f5600ffa2d'

* commit 'a2941c8cb216bdc144953cace64973f5600ffa2d':
  lavc: move CODEC_FLAG_MV0 to mpegvideo

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400'
Michael Niedermayer [Thu, 1 May 2014 14:56:40 +0000 (16:56 +0200)]
Merge commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400'

* commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400':
  lavc: make the xvid-specific "gmc" flag a private option of libxvid

Conflicts:
libavcodec/libxvid.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683'
Michael Niedermayer [Thu, 1 May 2014 14:46:38 +0000 (16:46 +0200)]
Merge commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683'

* commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683':
  lavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideo

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd'
Michael Niedermayer [Thu, 1 May 2014 14:41:41 +0000 (16:41 +0200)]
Merge commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd'

* commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd':
  lavc: deprecate CODEC_FLAG_INPUT_PRESERVED

Conflicts:
doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/vobsub: use av_make_q().
Clément Bœsch [Thu, 1 May 2014 14:18:12 +0000 (16:18 +0200)]
avformat/vobsub: use av_make_q().

5 years agoavformat/vobsub: remove pointless FAIL macro.
Clément Bœsch [Thu, 1 May 2014 14:16:38 +0000 (16:16 +0200)]
avformat/vobsub: remove pointless FAIL macro.

5 years agoMerge commit '141fdc763c2841b572d29a2ad78513e8d5325870'
Michael Niedermayer [Thu, 1 May 2014 13:59:01 +0000 (15:59 +0200)]
Merge commit '141fdc763c2841b572d29a2ad78513e8d5325870'

* commit '141fdc763c2841b572d29a2ad78513e8d5325870':
  matroska: add the Opus mapping

Conflicts:
libavformat/matroska.c

See: 30549294ef0f796d48b1ffa482bd9315d4dbb83c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a1aa37dd0b96710d4a17718198a3f56aea2040c1'
Michael Niedermayer [Thu, 1 May 2014 13:02:44 +0000 (15:02 +0200)]
Merge commit 'a1aa37dd0b96710d4a17718198a3f56aea2040c1'

* commit 'a1aa37dd0b96710d4a17718198a3f56aea2040c1':
  matroskaenc: write CodecDelay

Conflicts:
libavformat/matroskaenc.c
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv

This is largely not merged as it causes assertion failures and av sync errors
Further investigation of this is warranted if the changes are found to
fix/improve something in relation to d92b1b1babe69268971863649c225e1747358a74

See: d92b1b1babe69268971863649c225e1747358a74
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e'
Michael Niedermayer [Thu, 1 May 2014 12:14:10 +0000 (14:14 +0200)]
Merge commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e'

* commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e':
  lavfi: add Bauer stereo-to-binaural audio filter

Conflicts:
Changelog
configure
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavfi/subtitles: introduce stream_index
ValdikSS [Thu, 1 May 2014 10:51:17 +0000 (14:51 +0400)]
lavfi/subtitles: introduce stream_index

Signed-off-by: ValdikSS <iam@valdikss.org.ru>
5 years agolavc: deprecate AVCodecContext.codec_name
Anton Khirnov [Tue, 29 Apr 2014 14:44:08 +0000 (16:44 +0200)]
lavc: deprecate AVCodecContext.codec_name

It is undocumented and has no real use.

5 years agolavc: do not use AVCodecContext.codec_name in avcodec_string()
Anton Khirnov [Tue, 29 Apr 2014 14:42:07 +0000 (16:42 +0200)]
lavc: do not use AVCodecContext.codec_name in avcodec_string()

That field will be deprecated.

5 years agormdec: do not export anything to AVCodecContext.codec_name
Anton Khirnov [Tue, 29 Apr 2014 14:40:55 +0000 (16:40 +0200)]
rmdec: do not export anything to AVCodecContext.codec_name

That field will be deprecated and the value that is written there is not
particularly useful.

5 years agoasfenc: use codec descriptors instead of AVCodecs to write codec info
Anton Khirnov [Tue, 29 Apr 2014 14:13:38 +0000 (16:13 +0200)]
asfenc: use codec descriptors instead of AVCodecs to write codec info

Also, stop using AVCodecContext.codec_name as fallback, since it will be
deprecated.

Changes the result of the lavf-asf test (and its associated seektest),
since 'msmpeg4v3' gets written instead of just 'msmpeg4'.

5 years agooggparseskeleton: do not use AVCodecContext.codec_name
Anton Khirnov [Tue, 29 Apr 2014 13:42:38 +0000 (15:42 +0200)]
oggparseskeleton: do not use AVCodecContext.codec_name

That field is undocumented, of dubious use, and will be deprecated.

5 years agomov: export stsd Compressorname in metadata
Anton Khirnov [Tue, 29 Apr 2014 13:37:52 +0000 (15:37 +0200)]
mov: export stsd Compressorname in metadata

Stop using the undocumented to-be-deprecated AVCodecContext.codec_name
field.

5 years agolavc: move CODEC_FLAG_MV0 to mpegvideo
Anton Khirnov [Tue, 29 Apr 2014 06:00:03 +0000 (08:00 +0200)]
lavc: move CODEC_FLAG_MV0 to mpegvideo

5 years agolavc: make the xvid-specific "gmc" flag a private option of libxvid
Anton Khirnov [Tue, 29 Apr 2014 06:08:43 +0000 (08:08 +0200)]
lavc: make the xvid-specific "gmc" flag a private option of libxvid

5 years agolavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideo
Anton Khirnov [Tue, 29 Apr 2014 06:00:03 +0000 (08:00 +0200)]
lavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideo

5 years agolavc: deprecate CODEC_FLAG_INPUT_PRESERVED
Anton Khirnov [Tue, 29 Apr 2014 05:50:16 +0000 (07:50 +0200)]
lavc: deprecate CODEC_FLAG_INPUT_PRESERVED

The addition of reference-counted frames makes it pointless.

5 years agomatroska: add the Opus mapping
Anton Khirnov [Sun, 27 Apr 2014 11:40:11 +0000 (13:40 +0200)]
matroska: add the Opus mapping

5 years agomatroskaenc: write CodecDelay
Anton Khirnov [Tue, 29 Apr 2014 10:26:38 +0000 (12:26 +0200)]
matroskaenc: write CodecDelay

5 years agolavfi: add Bauer stereo-to-binaural audio filter
Alessandro Ghedini [Tue, 29 Apr 2014 16:53:16 +0000 (18:53 +0200)]
lavfi: add Bauer stereo-to-binaural audio filter

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoavformat/avidec: set average frame rate from header
Michael Niedermayer [Thu, 1 May 2014 03:40:00 +0000 (05:40 +0200)]
avformat/avidec: set average frame rate from header

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'eb3b5501e8b85bfea09d533314cb6920efc42639'
Michael Niedermayer [Thu, 1 May 2014 02:27:17 +0000 (04:27 +0200)]
Merge commit 'eb3b5501e8b85bfea09d533314cb6920efc42639'

* commit 'eb3b5501e8b85bfea09d533314cb6920efc42639':
  matroskadec: read the CodecDelay element

Conflicts:
libavformat/matroska.h
libavformat/matroskadec.c

See: d6f86d74edfa6e1464ddc613726559269bf1dc7b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: use av_malloc_array()
Michael Niedermayer [Thu, 1 May 2014 00:23:08 +0000 (02:23 +0200)]
ffmpeg: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/nut: support storing RFC 3389 comfort noise
Michael Niedermayer [Thu, 1 May 2014 00:13:31 +0000 (02:13 +0200)]
avformat/nut: support storing RFC 3389 comfort noise

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMove av_find_best_pix_fmt_of_2() from avcodec to avutil
Michael Niedermayer [Sat, 26 Apr 2014 16:22:12 +0000 (18:22 +0200)]
Move av_find_best_pix_fmt_of_2() from avcodec to avutil

This avoids a dependancy of libavfilter on libavcodec

See Ticket 3592
Fixes Ticket2784

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/opengl_enc: fix pixel data alignment
Lukasz Marek [Wed, 30 Apr 2014 18:49:52 +0000 (20:49 +0200)]
lavd/opengl_enc: fix pixel data alignment

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate/hevc: update with new sequences from jctvc(cherry picked from commit de6d9c586bd...
Mickaël Raulet [Tue, 29 Apr 2014 20:35:29 +0000 (22:35 +0200)]
fate/hevc: update with new sequences from jctvc(cherry picked from commit de6d9c586bd3852dfbe629a88ccc8c0f0a2bfcbb)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7d027b9d6d6290557cc5d4fc56f4b9ed630a7feb'
Michael Niedermayer [Wed, 30 Apr 2014 19:43:53 +0000 (21:43 +0200)]
Merge commit '7d027b9d6d6290557cc5d4fc56f4b9ed630a7feb'

* commit '7d027b9d6d6290557cc5d4fc56f4b9ed630a7feb':
  librtmp: Map native options to librtmp ones when possible

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7266e24f176389d2e81bfc7c829934f7c8ae361c'
Michael Niedermayer [Wed, 30 Apr 2014 19:29:04 +0000 (21:29 +0200)]
Merge commit '7266e24f176389d2e81bfc7c829934f7c8ae361c'

* commit '7266e24f176389d2e81bfc7c829934f7c8ae361c':
  hls: Sync the file number with the start sequence

Conflicts:
libavformat/hlsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a16431034d9bd44182bf844d6bbde2c98bc4e6b5'
Michael Niedermayer [Wed, 30 Apr 2014 19:14:56 +0000 (21:14 +0200)]
Merge commit 'a16431034d9bd44182bf844d6bbde2c98bc4e6b5'

* commit 'a16431034d9bd44182bf844d6bbde2c98bc4e6b5':
  hls: Factor the sequence computation

Conflicts:
libavformat/hlsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomatroskadec: read the CodecDelay element
Anton Khirnov [Tue, 29 Apr 2014 10:03:13 +0000 (12:03 +0200)]
matroskadec: read the CodecDelay element

5 years agoMerge commit 'c7603b3c243331057300337a61464e6ac4a605cb'
Michael Niedermayer [Wed, 30 Apr 2014 18:52:58 +0000 (20:52 +0200)]
Merge commit 'c7603b3c243331057300337a61464e6ac4a605cb'

* commit 'c7603b3c243331057300337a61464e6ac4a605cb':
  hls: Print start_number as first sequence value

Conflicts:
libavformat/hlsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '87a3ea3192bf5e4aafa08bca8686a2b577eae818'
Michael Niedermayer [Wed, 30 Apr 2014 18:12:17 +0000 (20:12 +0200)]
Merge commit '87a3ea3192bf5e4aafa08bca8686a2b577eae818'

* commit '87a3ea3192bf5e4aafa08bca8686a2b577eae818':
  segment: Report the current media sequence

Conflicts:
libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 agolibrtmp: Map native options to librtmp ones when possible
Luca Barbato [Sat, 26 Apr 2014 11:32:03 +0000 (13:32 +0200)]
librtmp: Map native options to librtmp ones when possible

Makes the two protocols nearly seamless.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
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: Sync the file number with the start sequence
Luca Barbato [Tue, 29 Apr 2014 16:20:17 +0000 (18:20 +0200)]
hls: Sync the file number with the start sequence

5 years agohls: Factor the sequence computation
Luca Barbato [Tue, 29 Apr 2014 16:37:01 +0000 (18:37 +0200)]
hls: Factor the sequence computation

5 years agohls: Print start_number as first sequence value
Luca Barbato [Tue, 29 Apr 2014 08:13:34 +0000 (10:13 +0200)]
hls: Print start_number as first sequence value

The option now behaves as expected.

5 years agosegment: Report the current media sequence
Luca Barbato [Tue, 29 Apr 2014 08:28:11 +0000 (10:28 +0200)]
segment: Report the current media sequence

Useful for debugging mostly.

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>