ffmpeg.git
5 years agoavcodec/diracdec: allocate edges internally instead of depending on CODEC_FLAG_EMU_ED...
Michael Niedermayer [Mon, 20 Jan 2014 16:52:08 +0000 (17:52 +0100)]
avcodec/diracdec: allocate edges internally instead of depending on CODEC_FLAG_EMU_EDGE being not set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '024db24912a39316b0ef0b7d793307d62da038f4'
Michael Niedermayer [Mon, 20 Jan 2014 16:09:30 +0000 (17:09 +0100)]
Merge commit '024db24912a39316b0ef0b7d793307d62da038f4'

* commit '024db24912a39316b0ef0b7d793307d62da038f4':
  mpegvideo: allocate edges when encoding.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo_enc: disable direct mode in load_input_picture() for dimensions...
Michael Niedermayer [Mon, 20 Jan 2014 15:36:02 +0000 (16:36 +0100)]
avcodec/mpegvideo_enc: disable direct mode in load_input_picture() for dimensions%16 != 0

We currently read a whole 16x16 block from the input at a few places

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f7e85ee996b3886c2b13e928b83277382311af96'
Michael Niedermayer [Mon, 20 Jan 2014 14:07:45 +0000 (15:07 +0100)]
Merge commit 'f7e85ee996b3886c2b13e928b83277382311af96'

* commit 'f7e85ee996b3886c2b13e928b83277382311af96':
  lavc: allow the caller to override dimensions in ff_get_buffer()

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoexamples/muxing: remove redundant {}
Stefano Sabatini [Sun, 19 Jan 2014 17:38:53 +0000 (18:38 +0100)]
examples/muxing: remove redundant {}

5 years agoexamples/muxing: change error checks, from "ret != 0" to "ret < 0"
Stefano Sabatini [Sun, 19 Jan 2014 16:18:40 +0000 (17:18 +0100)]
examples/muxing: change error checks, from "ret != 0" to "ret < 0"

More consistent and more future-proof.

5 years agoexamples/muxing: factorize write_interleave code
Stefano Sabatini [Sun, 19 Jan 2014 16:17:14 +0000 (17:17 +0100)]
examples/muxing: factorize write_interleave code

Also log output packet information.

5 years agoexamples: add remuxing example
Stefano Sabatini [Sun, 19 Jan 2014 12:45:48 +0000 (13:45 +0100)]
examples: add remuxing example

Show how to perform streamcopy from one container to another.

5 years agompegvideo: allocate edges when encoding.
Anton Khirnov [Wed, 1 Jan 2014 19:04:53 +0000 (20:04 +0100)]
mpegvideo: allocate edges when encoding.

Allocating edges will be removed from generic code, so the encoder must
handle this explicitly.

5 years agolavc: allow the caller to override dimensions in ff_get_buffer()
Anton Khirnov [Wed, 1 Jan 2014 19:03:05 +0000 (20:03 +0100)]
lavc: allow the caller to override dimensions in ff_get_buffer()

This will be useful for allocating edges in the encoders.

5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Mon, 20 Jan 2014 03:23:57 +0000 (04:23 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Allow decoding of slightly broken Nikon avi files.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/dsp: add_int16_mmx / add_int16_sse2
Michael Niedermayer [Mon, 20 Jan 2014 02:51:21 +0000 (03:51 +0100)]
avcodec/x86/dsp: add_int16_mmx / add_int16_sse2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dsputil/huffyuv: move diff int16 and add int16 to dsputil
Michael Niedermayer [Mon, 20 Jan 2014 02:50:43 +0000 (03:50 +0100)]
avcodec/dsputil/huffyuv: move diff int16 and add int16 to dsputil

This also fixes masking the bits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAllow decoding of slightly broken Nikon avi files.
Carl Eugen Hoyos [Mon, 20 Jan 2014 00:44:07 +0000 (01:44 +0100)]
Allow decoding of slightly broken Nikon avi files.

Fixes ticket #3330.

5 years agovp8: remove redundant "equals 1" test
Peter Ross [Sat, 18 Jan 2014 15:38:45 +0000 (02:38 +1100)]
vp8: remove redundant "equals 1" test

mb_layout is either zero or non-zero.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf: add avformat_get_mov_video_tags() and avformat_get_mov_audio_tags()
wm4 [Sun, 19 Jan 2014 20:50:58 +0000 (21:50 +0100)]
lavf: add avformat_get_mov_video_tags() and avformat_get_mov_audio_tags()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 19 Jan 2014 20:53:13 +0000 (21:53 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  eac3: cosmetics, re-indent.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ade75fb811500f3e3f284737f123938d83be728f'
Michael Niedermayer [Sun, 19 Jan 2014 20:46:27 +0000 (21:46 +0100)]
Merge commit 'ade75fb811500f3e3f284737f123938d83be728f'

* commit 'ade75fb811500f3e3f284737f123938d83be728f':
  (e)ac3: clip surround mix level indexes.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c229f571fd3c7d7b567c27c87b2bbcdaee1b0e9f'
Michael Niedermayer [Sun, 19 Jan 2014 20:36:49 +0000 (21:36 +0100)]
Merge commit 'c229f571fd3c7d7b567c27c87b2bbcdaee1b0e9f'

* commit 'c229f571fd3c7d7b567c27c87b2bbcdaee1b0e9f':
  (e)ac3: parse and store the Lt/Rt and LFE mix levels.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1f604f96ea70503caa642f68a85be6074a5b3f46'
Michael Niedermayer [Sun, 19 Jan 2014 20:18:13 +0000 (21:18 +0100)]
Merge commit '1f604f96ea70503caa642f68a85be6074a5b3f46'

* commit '1f604f96ea70503caa642f68a85be6074a5b3f46':
  ac3: set default matrix encoding modes in parse_frame_header.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/matroskadec: identify SMI as SVQ3
Michael Niedermayer [Sun, 19 Jan 2014 19:13:38 +0000 (20:13 +0100)]
avformat/matroskadec: identify SMI as SVQ3

Fixes part of Ticket3256

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoeac3: cosmetics, re-indent.
Tim Walker [Fri, 17 Jan 2014 15:08:18 +0000 (16:08 +0100)]
eac3: cosmetics, re-indent.

5 years ago(e)ac3: clip surround mix level indexes.
Tim Walker [Fri, 17 Jan 2014 15:06:34 +0000 (16:06 +0100)]
(e)ac3: clip surround mix level indexes.

Values 0-2 are reserved, 3 (-1.5dB) should be used instead.

5 years ago(e)ac3: parse and store the Lt/Rt and LFE mix levels.
Tim Walker [Fri, 17 Jan 2014 14:57:40 +0000 (15:57 +0100)]
(e)ac3: parse and store the Lt/Rt and LFE mix levels.

5 years agoac3: set default matrix encoding modes in parse_frame_header.
Tim Walker [Fri, 17 Jan 2014 14:18:45 +0000 (15:18 +0100)]
ac3: set default matrix encoding modes in parse_frame_header.

Deduplicates some code.

5 years agoavformat/matroskadec: support QDM2 as generated by mkvtoolnix-6.7.0
Michael Niedermayer [Sun, 19 Jan 2014 17:35:33 +0000 (18:35 +0100)]
avformat/matroskadec: support QDM2 as generated by mkvtoolnix-6.7.0

Fixes part of Ticket3256

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/matroskadec: support SVQ3 as generated by mkvtoolnix-6.6.0
Michael Niedermayer [Sun, 19 Jan 2014 17:35:33 +0000 (18:35 +0100)]
avformat/matroskadec: support SVQ3 as generated by mkvtoolnix-6.6.0

Fixes part of Ticket3256

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Sun, 19 Jan 2014 16:48:02 +0000 (17:48 +0100)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavfi/dualinput: fix shortest option.
  lavfi/vf_tile: use av_make_q.
  lavfi/avf_concat: use av_make_q.
  lavfi/af_amerge: use av_make_q.
  lavu/rational: add syntactic sugar.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: Dont skip picture allocation if theres no picture allocated
Michael Niedermayer [Sun, 19 Jan 2014 15:44:58 +0000 (16:44 +0100)]
avcodec/mjpegdec: Dont skip picture allocation if theres no picture allocated

Fixes Ticket 3245

5 years agolavfi/dualinput: fix shortest option.
Nicolas George [Fri, 17 Jan 2014 23:34:17 +0000 (00:34 +0100)]
lavfi/dualinput: fix shortest option.

Fix trac ticket #3315.

5 years agolavfi/vf_tile: use av_make_q.
Nicolas George [Tue, 31 Dec 2013 14:55:45 +0000 (15:55 +0100)]
lavfi/vf_tile: use av_make_q.

5 years agolavfi/avf_concat: use av_make_q.
Nicolas George [Tue, 31 Dec 2013 14:55:44 +0000 (15:55 +0100)]
lavfi/avf_concat: use av_make_q.

5 years agolavfi/af_amerge: use av_make_q.
Nicolas George [Tue, 31 Dec 2013 14:55:43 +0000 (15:55 +0100)]
lavfi/af_amerge: use av_make_q.

5 years agolavu/rational: add syntactic sugar.
Nicolas George [Tue, 31 Dec 2013 13:07:25 +0000 (14:07 +0100)]
lavu/rational: add syntactic sugar.

Add a function to create a rational
and macros for common values.

5 years agodoc/muxers: add "Options", "Examples", "Syntax", etc. subsections
Timothy Gu [Thu, 9 Jan 2014 02:30:20 +0000 (18:30 -0800)]
doc/muxers: add "Options", "Examples", "Syntax", etc. subsections

More consistent with codec docs. Also some minor reorganization of sentences
to fit the new document hierarchy.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
5 years agodoc/encoders: add libx264rgb doc and supported pixfmts for libx264(rgb)
Timothy Gu [Thu, 2 Jan 2014 03:56:27 +0000 (19:56 -0800)]
doc/encoders: add libx264rgb doc and supported pixfmts for libx264(rgb)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
5 years agodoc/muxers/segment: fix formula for computing the segment_time_delta value
Stefano Sabatini [Sun, 19 Jan 2014 11:19:11 +0000 (12:19 +0100)]
doc/muxers/segment: fix formula for computing the segment_time_delta value

5 years agolavfi/vidstabtransform: apply various documentation/option minor fixes
Stefano Sabatini [Thu, 16 Jan 2014 12:08:36 +0000 (13:08 +0100)]
lavfi/vidstabtransform: apply various documentation/option minor fixes

Improve consistency with the rest of the documentation.

5 years agoavcodec/aacdec: Dont fail if channels arent known yet
Michael Niedermayer [Sun, 19 Jan 2014 05:20:46 +0000 (06:20 +0100)]
avcodec/aacdec: Dont fail if channels arent known yet

Fixes Ticket3312

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: Dont treat the lack of a startcode differently from end of the...
Michael Niedermayer [Sun, 19 Jan 2014 03:02:11 +0000 (04:02 +0100)]
avcodec/mjpegdec: Dont treat the lack of a startcode differently from end of the bitstream

Fixes Ticket3303

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: only run EOI emulation code when there was a scan
Michael Niedermayer [Sun, 19 Jan 2014 03:56:13 +0000 (04:56 +0100)]
avcodec/mjpegdec: only run EOI emulation code when there was a scan

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: update cur_scan also for non-LS jpeg
Michael Niedermayer [Sun, 19 Jan 2014 03:55:01 +0000 (04:55 +0100)]
avcodec/mjpegdec: update cur_scan also for non-LS jpeg

This should make no difference but the variable will be used in a subsequent commit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dnxhdenc: return meaningful return codes
Timothy Gu [Sat, 18 Jan 2014 22:05:31 +0000 (14:05 -0800)]
avcodec/dnxhdenc: return meaningful return codes

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 18 Jan 2014 22:07:36 +0000 (23:07 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: check that an IDR NAL only contains I slices

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9ecabd7892ff073ae60ded3fc0a1290f5914ed5c'
Michael Niedermayer [Sat, 18 Jan 2014 21:58:15 +0000 (22:58 +0100)]
Merge commit '9ecabd7892ff073ae60ded3fc0a1290f5914ed5c'

* commit '9ecabd7892ff073ae60ded3fc0a1290f5914ed5c':
  h264: reset num_reorder_frames if it is invalid

Note, num_reorder_frames is not used in the failure case

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0652e024c680420d298cdf3719d0a0c030173fe3'
Michael Niedermayer [Sat, 18 Jan 2014 21:47:49 +0000 (22:47 +0100)]
Merge commit '0652e024c680420d298cdf3719d0a0c030173fe3'

* commit '0652e024c680420d298cdf3719d0a0c030173fe3':
  h264: reset ref count if decoding the slice header fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '98cc9efc5f6b4dc847ed3b9b60b1c3bcd14e6791'
Michael Niedermayer [Sat, 18 Jan 2014 21:07:54 +0000 (22:07 +0100)]
Merge commit '98cc9efc5f6b4dc847ed3b9b60b1c3bcd14e6791'

* commit '98cc9efc5f6b4dc847ed3b9b60b1c3bcd14e6791':
  h264: prevent two matching fields from being both a short/long ref combination

See: 92002db3eb437414281ad4fb6e84e34862f7fc92
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '00dbff4c3e048b4abd01bf805725aabff0fa5ee1'
Michael Niedermayer [Sat, 18 Jan 2014 20:45:58 +0000 (21:45 +0100)]
Merge commit '00dbff4c3e048b4abd01bf805725aabff0fa5ee1'

* commit '00dbff4c3e048b4abd01bf805725aabff0fa5ee1':
  h264: do not call field_end if we do not have a current picture

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7f0e81db3c4ee6f8ce15058bafa72ce928a89f3f'
Michael Niedermayer [Sat, 18 Jan 2014 20:37:39 +0000 (21:37 +0100)]
Merge commit '7f0e81db3c4ee6f8ce15058bafa72ce928a89f3f'

* commit '7f0e81db3c4ee6f8ce15058bafa72ce928a89f3f':
  h264: limit allowed pred modes in ff_h264_check_intra_pred_mode() to 3

Conflicts:
libavcodec/h264.c

See: d6a33f5d20b6ef2eae2cbb959b001cb125a564b7
See: 2005fddcbb4e18e8f7c34326e40609e4a2d83c31
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd1b3fabe6945e511bb20fc9ca52b47eb952526ee'
Michael Niedermayer [Sat, 18 Jan 2014 20:21:09 +0000 (21:21 +0100)]
Merge commit 'd1b3fabe6945e511bb20fc9ca52b47eb952526ee'

* commit 'd1b3fabe6945e511bb20fc9ca52b47eb952526ee':
  h264: reset first_field if frame_start() fails for missing refs

See: d7599bd8e240b923486bd130a33d38f66bb14eae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '210881110d3e22cca36edeaca118b5e22c998266'
Michael Niedermayer [Sat, 18 Jan 2014 20:13:36 +0000 (21:13 +0100)]
Merge commit '210881110d3e22cca36edeaca118b5e22c998266'

* commit '210881110d3e22cca36edeaca118b5e22c998266':
  Prepare for 10_alpha2 Release

Conflicts:
RELEASE

Not merged

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264: check that an IDR NAL only contains I slices
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: check that an IDR NAL only contains I slices

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

5 years agoh264: reset num_reorder_frames if it is invalid
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: reset num_reorder_frames if it is invalid

An invalid VUI is not considered a fatal error, so the SPS containing it
may still be used. Leaving an invalid value of num_reorder_frames there
can result in writing over the bounds of H264Context.delayed_pic.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

5 years agoh264: reset ref count if decoding the slice header fails
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: reset ref count if decoding the slice header fails

Otherwise the ER code might try to use some already freed references.

Fixes possible access to freed memory.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

5 years agoh264: prevent two matching fields from being both a short/long ref combination
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: prevent two matching fields from being both a short/long ref combination

Fixes possible access to freed memory.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

5 years agoh264: do not call field_end if we do not have a current picture
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: do not call field_end if we do not have a current picture

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

5 years agoh264: limit allowed pred modes in ff_h264_check_intra_pred_mode() to 3
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: limit allowed pred modes in ff_h264_check_intra_pred_mode() to 3

Higher modes are not allowed for 16x16/chroma, which is what this
function is used for. Otherwise this function would return 0 (vertical
prediction) for invalid higher modes, which could result in invalid
reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

5 years agoh264: reset first_field if frame_start() fails for missing refs
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: reset first_field if frame_start() fails for missing refs

In this case we may not have a current frame, while first_field being
set implies we do.

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

5 years agoswresample: Add arm&x86 clobber tests
Martin Storsjö [Sat, 18 Jan 2014 17:17:54 +0000 (18:17 +0100)]
swresample: Add arm&x86 clobber tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovp9/x86: rename ff_avg[48]_sse to ff_avg[48]_mmxext
James Almer [Sat, 18 Jan 2014 05:29:22 +0000 (02:29 -0300)]
vp9/x86: rename ff_avg[48]_sse to ff_avg[48]_mmxext

pavgb is an sse integer instruction, so the mmxext flag is enough

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 agoPrepare for 10_alpha2 Release
Reinhard Tartler [Sat, 18 Jan 2014 15:27:27 +0000 (10:27 -0500)]
Prepare for 10_alpha2 Release

5 years agoavcodec/mpegvideo_enc: fix custom matrixes with jpeg
Michael Niedermayer [Sat, 18 Jan 2014 04:10:48 +0000 (05:10 +0100)]
avcodec/mpegvideo_enc: fix custom matrixes with jpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86inc: speed up compilation with yasm
Loren Merritt [Thu, 16 Jan 2014 21:34:46 +0000 (13:34 -0800)]
x86inc: speed up compilation with yasm

Work around yasm's inefficiency with handling large numbers of variables
in the global scope.

5 years agoffmpeg: change ost->finished to an enum
Michael Niedermayer [Fri, 17 Jan 2014 22:52:55 +0000 (23:52 +0100)]
ffmpeg: change ost->finished to an enum

Idea-by: ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: update statistics only when a packet is actually muxed
Michael Niedermayer [Wed, 15 Jan 2014 16:19:54 +0000 (17:19 +0100)]
ffmpeg: update statistics only when a packet is actually muxed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg/flush_encoders: dont mux packets once ost->finished has been set
Michael Niedermayer [Wed, 15 Jan 2014 16:07:26 +0000 (17:07 +0100)]
ffmpeg/flush_encoders: dont mux packets once ost->finished has been set

Fixes muxing frames after av_interleaved_write_frame() failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: properly close down muxers on av_interleaved_write_frame() failure
Michael Niedermayer [Tue, 14 Jan 2014 03:33:12 +0000 (04:33 +0100)]
ffmpeg: properly close down muxers on av_interleaved_write_frame() failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: check ost->finished in check_output_constraints()
Michael Niedermayer [Tue, 14 Jan 2014 03:32:05 +0000 (04:32 +0100)]
ffmpeg: check ost->finished in check_output_constraints()

No testcase but it seems logic to stop when finished is set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: check ost->finished in reap_filters()
Michael Niedermayer [Tue, 14 Jan 2014 03:31:29 +0000 (04:31 +0100)]
ffmpeg: check ost->finished in reap_filters()

This avoids finished output streams continuing to receive frames

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/metadata: allow ff_metadata_conv() to be called with NULL saftely
Michael Niedermayer [Fri, 17 Jan 2014 21:51:07 +0000 (22:51 +0100)]
avformat/metadata: allow ff_metadata_conv() to be called with NULL saftely

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_elbg: Fixed seed range of elbg filter
João Bernardo [Fri, 17 Jan 2014 20:17:43 +0000 (21:17 +0100)]
avfilter/vf_elbg: Fixed seed range of elbg filter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dnxhdenc: check that qmax is within the supported range
Michael Niedermayer [Fri, 17 Jan 2014 19:58:43 +0000 (20:58 +0100)]
avcodec/dnxhdenc: check that qmax is within the supported range

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodnxhdenc: fix mb_rc size
Michael Niedermayer [Fri, 17 Jan 2014 19:09:48 +0000 (20:09 +0100)]
dnxhdenc: fix mb_rc size

Fixes out of array access with RC_VARIANCE set to 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/riff: fix demuxing of h264 INMC
Michael Niedermayer [Fri, 17 Jan 2014 16:58:36 +0000 (17:58 +0100)]
avformat/riff: fix demuxing of h264 INMC

Its said that there was a mpeg4 sample with the same fourcc, but noone has it
if someone finds it please tell me so i can fix detection of both.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Fri, 17 Jan 2014 15:57:45 +0000 (16:57 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix libxvid crash on failing initialisation.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 17 Jan 2014 15:45:11 +0000 (16:45 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avisynth: fix setting packet properties

See: 4cb9c2013662b46e8101d6fdf6c69d41668c8b9a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '104a97beaffa6348e6fd2c2d07d67c1402322bb3'
Michael Niedermayer [Fri, 17 Jan 2014 15:38:10 +0000 (16:38 +0100)]
Merge commit '104a97beaffa6348e6fd2c2d07d67c1402322bb3'

* commit '104a97beaffa6348e6fd2c2d07d67c1402322bb3':
  buffersrc: handle non-refcounted frames in av_buffersrc_add_frame() correctly

Conflicts:
libavfilter/buffersrc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5ef11b8dcc054b230deb9b20493255c14a80597d'
Michael Niedermayer [Fri, 17 Jan 2014 15:18:27 +0000 (16:18 +0100)]
Merge commit '5ef11b8dcc054b230deb9b20493255c14a80597d'

* commit '5ef11b8dcc054b230deb9b20493255c14a80597d':
  yuv4mpeg: set average frame rate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2ce8bca51f7264b47027f69d50dd8e49aa2fd683'
Michael Niedermayer [Fri, 17 Jan 2014 15:11:53 +0000 (16:11 +0100)]
Merge commit '2ce8bca51f7264b47027f69d50dd8e49aa2fd683'

* commit '2ce8bca51f7264b47027f69d50dd8e49aa2fd683':
  avconv: print a warning when falling back to default 25fps

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '33018907bd07b34e0e70d5ae12097265eb3734d7'
Michael Niedermayer [Fri, 17 Jan 2014 14:31:18 +0000 (15:31 +0100)]
Merge commit '33018907bd07b34e0e70d5ae12097265eb3734d7'

* commit '33018907bd07b34e0e70d5ae12097265eb3734d7':
  mp3enc: allow omitting the id3v2 header with -id3v2_version 0

Conflicts:
doc/muxers.texi
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd'
Michael Niedermayer [Fri, 17 Jan 2014 14:23:11 +0000 (15:23 +0100)]
Merge commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd'

* commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd':
  mp3enc: add an option for disabling the Xing frame.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '045654f422e74be8ed09a0819d39051d67633a09'
Michael Niedermayer [Fri, 17 Jan 2014 14:05:17 +0000 (15:05 +0100)]
Merge commit '045654f422e74be8ed09a0819d39051d67633a09'

* commit '045654f422e74be8ed09a0819d39051d67633a09':
  doxy: Document better the available AVFrame flags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ff23c4e4935e96e62d8ff2212a1955a43add88e1'
Michael Niedermayer [Fri, 17 Jan 2014 13:45:11 +0000 (14:45 +0100)]
Merge commit 'ff23c4e4935e96e62d8ff2212a1955a43add88e1'

* commit 'ff23c4e4935e96e62d8ff2212a1955a43add88e1':
  doxy: Add AVFrame to the structured modules

Conflicts:
libavutil/frame.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix libxvid crash on failing initialisation.
Carl Eugen Hoyos [Fri, 17 Jan 2014 12:09:57 +0000 (13:09 +0100)]
Fix libxvid crash on failing initialisation.

Fixes ticket #3297.

5 years agoMerge commit '87acd33c092ab9e7d73686627e9105d99c1e4928'
Michael Niedermayer [Fri, 17 Jan 2014 13:38:30 +0000 (14:38 +0100)]
Merge commit '87acd33c092ab9e7d73686627e9105d99c1e4928'

* commit '87acd33c092ab9e7d73686627e9105d99c1e4928':
  aviocat: Add support for specifying the input duration

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '03f2de5856ec8571fcf5f4cf6dccc713294af545'
Michael Niedermayer [Fri, 17 Jan 2014 13:31:13 +0000 (14:31 +0100)]
Merge commit '03f2de5856ec8571fcf5f4cf6dccc713294af545'

* commit '03f2de5856ec8571fcf5f4cf6dccc713294af545':
  aviocat: Check the argv array length before reading element i+1

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovp9/x86: add ff_vp9_loop_filter_[vh]_16_16_sse2().
James Almer [Fri, 17 Jan 2014 06:55:44 +0000 (03:55 -0300)]
vp9/x86: add ff_vp9_loop_filter_[vh]_16_16_sse2().

Similar gains in performance as the SSSE3 version

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavisynth: fix setting packet properties
Michael Niedermayer [Mon, 13 Jan 2014 15:09:26 +0000 (10:09 -0500)]
avisynth: fix setting packet properties

Reviewed-by: Stephen Hutchinson <qyot27@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agobuffersrc: handle non-refcounted frames in av_buffersrc_add_frame() correctly
Anton Khirnov [Thu, 16 Jan 2014 10:06:02 +0000 (11:06 +0100)]
buffersrc: handle non-refcounted frames in av_buffersrc_add_frame() correctly

5 years agoyuv4mpeg: set average frame rate
Anton Khirnov [Wed, 15 Jan 2014 20:14:46 +0000 (21:14 +0100)]
yuv4mpeg: set average frame rate

5 years agoavconv: print a warning when falling back to default 25fps
Anton Khirnov [Wed, 15 Jan 2014 20:32:38 +0000 (21:32 +0100)]
avconv: print a warning when falling back to default 25fps

5 years agomp3enc: allow omitting the id3v2 header with -id3v2_version 0
Anton Khirnov [Tue, 14 Jan 2014 21:06:03 +0000 (22:06 +0100)]
mp3enc: allow omitting the id3v2 header with -id3v2_version 0

5 years agomp3enc: add an option for disabling the Xing frame.
Anton Khirnov [Tue, 14 Jan 2014 20:47:45 +0000 (21:47 +0100)]
mp3enc: add an option for disabling the Xing frame.

5 years agodoxy: Document better the available AVFrame flags
Luca Barbato [Thu, 16 Jan 2014 00:04:57 +0000 (01:04 +0100)]
doxy: Document better the available AVFrame flags

5 years agodoxy: Add AVFrame to the structured modules
Luca Barbato [Thu, 16 Jan 2014 00:04:35 +0000 (01:04 +0100)]
doxy: Add AVFrame to the structured modules

5 years agoaviocat: Add support for specifying the input duration
Martin Storsjö [Thu, 16 Jan 2014 08:01:03 +0000 (10:01 +0200)]
aviocat: Add support for specifying the input duration

This avoids the caller having to calculate the byte rate if wanting
to push a file in a rate resembling realtime.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoaviocat: Check the argv array length before reading element i+1
Martin Storsjö [Thu, 16 Jan 2014 07:58:03 +0000 (09:58 +0200)]
aviocat: Check the argv array length before reading element i+1

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavcodec: make "bitrate tolerance too small for bitrate" error more verbose
Michael Niedermayer [Fri, 17 Jan 2014 02:10:42 +0000 (03:10 +0100)]
avcodec: make "bitrate tolerance too small for bitrate" error more verbose

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/kgv1dec: fix memleak, reintroduce lost decode_flush() call
Michael Niedermayer [Fri, 17 Jan 2014 01:43:26 +0000 (02:43 +0100)]
avcodec/kgv1dec: fix memleak, reintroduce lost decode_flush() call

fixes regression since 80d44190c4d909e9685d04bcde693da3e2441dfd and 1a0370ad94de094a5ac754e790d4ec8d8d0d9ee7
this reverts the buggy changes in these 2 commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/huffyuv: fix median prediction for >8bps
Michael Niedermayer [Thu, 16 Jan 2014 17:33:17 +0000 (18:33 +0100)]
avcodec/huffyuv: fix median prediction for >8bps

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