ffmpeg.git
4 years agodoc/ffmpeg.texi: document the new -start_at_zero option
Rodger Combs [Tue, 21 Oct 2014 06:23:55 +0000 (01:23 -0500)]
doc/ffmpeg.texi: document the new -start_at_zero option

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavfi/concat: accept a single segment
Stefano Sabatini [Tue, 21 Oct 2014 09:45:30 +0000 (11:45 +0200)]
lavfi/concat: accept a single segment

Simplify scripting operations, so that n=1 is not to be considered as a
special case.

4 years agolavfi/afade: fix cur_sample computation
Stefano Sabatini [Tue, 21 Oct 2014 09:43:56 +0000 (11:43 +0200)]
lavfi/afade: fix cur_sample computation

Use the correct timebase conversion.

4 years agolavf/mov.c: Prevent memory leak in case of invalid metadata reads.
Thilo Borgmann [Tue, 21 Oct 2014 08:10:55 +0000 (10:10 +0200)]
lavf/mov.c: Prevent memory leak in case of invalid metadata reads.

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rtsp: Use ff_rtsp_averror()
Andrey Utkin [Fri, 17 Oct 2014 20:24:03 +0000 (00:24 +0400)]
avformat/rtsp: Use ff_rtsp_averror()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rtspcodes: introduce ff_rtsp_averror()
Andrey Utkin [Fri, 17 Oct 2014 20:24:02 +0000 (00:24 +0400)]
avformat/rtspcodes: introduce ff_rtsp_averror()

Currently this is another name for ff_http_averror()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg_opt: Add -start_at_zero option.
Rodger Combs [Mon, 20 Oct 2014 23:50:12 +0000 (18:50 -0500)]
ffmpeg_opt: Add -start_at_zero option.

This automatically shifts input timestamps to start at 0 instead of the file's
starting timestamp when using -copyts.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/libutvideodec: print extradata size if unsupported
Michael Niedermayer [Sun, 19 Oct 2014 12:33:20 +0000 (14:33 +0200)]
avcodec/libutvideodec: print extradata size if unsupported

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd2771a1dc0a3695e8873adc16d068077f2417eea'
Michael Niedermayer [Mon, 20 Oct 2014 21:03:36 +0000 (23:03 +0200)]
Merge commit 'd2771a1dc0a3695e8873adc16d068077f2417eea'

* commit 'd2771a1dc0a3695e8873adc16d068077f2417eea':
  rtpproto: Free the addrinfo pointer on failure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '96bfb677478514db73d1b63b4213c97ad4269e8f'
Michael Niedermayer [Mon, 20 Oct 2014 20:35:15 +0000 (22:35 +0200)]
Merge commit '96bfb677478514db73d1b63b4213c97ad4269e8f'

* commit '96bfb677478514db73d1b63b4213c97ad4269e8f':
  nutdec: Prevent a memory corruption

Conflicts:
libavformat/nutdec.c

See: 05dd5368a92718f3a25f97f4697acffbabc7458f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '350ed1829268d343b791208c8fd1cddd44d52a8e'
Michael Niedermayer [Mon, 20 Oct 2014 20:24:37 +0000 (22:24 +0200)]
Merge commit '350ed1829268d343b791208c8fd1cddd44d52a8e'

* commit '350ed1829268d343b791208c8fd1cddd44d52a8e':
  rtpdec_hevc: drop unnecessary check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '322b571d5591978efd6f6fee12181ac8900079fe'
Michael Niedermayer [Mon, 20 Oct 2014 20:08:04 +0000 (22:08 +0200)]
Merge commit '322b571d5591978efd6f6fee12181ac8900079fe'

* commit '322b571d5591978efd6f6fee12181ac8900079fe':
  rtmpproto: remove dead code

See: 3a8b66af6cf6af9da5ff97a5930d10a7a4568558
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04'
Michael Niedermayer [Mon, 20 Oct 2014 19:59:24 +0000 (21:59 +0200)]
Merge commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04'

* commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04':
  vf_format: check input validity

See: ee16e0cacc16ea60c35a66796410012755263c3c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavd: export all symbols with av_ prefix
Lukasz Marek [Mon, 20 Oct 2014 10:12:20 +0000 (12:12 +0200)]
lavd: export all symbols with av_ prefix

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
4 years agoMerge commit '7b48bf95242ebf95366d24d32e4cfca6aa77c5e2'
Michael Niedermayer [Mon, 20 Oct 2014 19:52:12 +0000 (21:52 +0200)]
Merge commit '7b48bf95242ebf95366d24d32e4cfca6aa77c5e2'

* commit '7b48bf95242ebf95366d24d32e4cfca6aa77c5e2':
  wtv: clean memory on error

See: e47024d72f326f7a76c9df90da861663fc5d5fc2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9fbc613f0df1628e7e78bca791fa8833846f8210'
Michael Niedermayer [Mon, 20 Oct 2014 19:42:45 +0000 (21:42 +0200)]
Merge commit '9fbc613f0df1628e7e78bca791fa8833846f8210'

* commit '9fbc613f0df1628e7e78bca791fa8833846f8210':
  wtv: check seek_by_sector return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2'
Michael Niedermayer [Mon, 20 Oct 2014 19:23:41 +0000 (21:23 +0200)]
Merge commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2'

* commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2':
  aviobuf: check context before using it

See: 7441d1ec330da810a0ffd44a02b2fc60add5b719
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '02484d1a9316a9309fc1830825345ab79f6a8d60'
Michael Niedermayer [Mon, 20 Oct 2014 19:16:20 +0000 (21:16 +0200)]
Merge commit '02484d1a9316a9309fc1830825345ab79f6a8d60'

* commit '02484d1a9316a9309fc1830825345ab79f6a8d60':
  avio: fix sizeof argument

See: a96577df38469e5075caa416d3374576d9ab64ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8ab3b71e4b343cec3fa369a880ab4496d7345154'
Michael Niedermayer [Mon, 20 Oct 2014 18:58:03 +0000 (20:58 +0200)]
Merge commit '8ab3b71e4b343cec3fa369a880ab4496d7345154'

* commit '8ab3b71e4b343cec3fa369a880ab4496d7345154':
  idcin: fix return check

See: ee884c30233856b69fb87345944b4cdfe666fc0f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: fix bug to ensure that HAVE_VSX is only enabled when HAVE_ALTIVEC is enabl...
Rong Yan [Mon, 13 Oct 2014 06:40:30 +0000 (06:40 +0000)]
configure: fix bug to ensure that HAVE_VSX is only enabled when HAVE_ALTIVEC is enabled and in LE environment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/mov.c: Allocate buffer in case of long metadata entries.
Thilo Borgmann [Mon, 20 Oct 2014 11:42:28 +0000 (13:42 +0200)]
lavf/mov.c: Allocate buffer in case of long metadata entries.

Fixes ticket #4018

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agov4l2: Make use of the VIDIOC_ENUM_FRAMESIZES ioctl on OpenBSD
Brad Smith [Mon, 20 Oct 2014 04:09:55 +0000 (00:09 -0400)]
v4l2: Make use of the VIDIOC_ENUM_FRAMESIZES ioctl on OpenBSD

Make use of the V4L2 VIDIOC_ENUM_FRAMESIZES ioctl on OpenBSD.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_idet: add both multiple and single frame detection metadata
Kevin Mitchell [Sun, 19 Oct 2014 20:32:56 +0000 (13:32 -0700)]
avfilter/vf_idet: add both multiple and single frame detection metadata

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agortpproto: Free the addrinfo pointer on failure
Luca Barbato [Sat, 18 Oct 2014 15:58:41 +0000 (16:58 +0100)]
rtpproto: Free the addrinfo pointer on failure

CC: libav-stable@libav.org
Bug-Id: CID 1238797

4 years agonutdec: Prevent a memory corruption
Luca Barbato [Sat, 18 Oct 2014 15:58:47 +0000 (16:58 +0100)]
nutdec: Prevent a memory corruption

Chapters do not have an event_flags field.

Bug-Id: CID 1231990

4 years agortpdec_hevc: drop unnecessary check
Vittorio Giovara [Sat, 18 Oct 2014 15:58:42 +0000 (16:58 +0100)]
rtpdec_hevc: drop unnecessary check

len is always >=1 in that case.

Bug-Id: CID 1238784

4 years agortmpproto: remove dead code
Vittorio Giovara [Sat, 18 Oct 2014 15:58:44 +0000 (16:58 +0100)]
rtmpproto: remove dead code

Expression already evaluated before, redundant since
053386864219eccbcca1886c55f902f9555428a5.

Bug-Id: CID 732199

4 years agovf_format: check input validity
Vittorio Giovara [Sat, 18 Oct 2014 15:10:35 +0000 (16:10 +0100)]
vf_format: check input validity

CC: libav-stable@libav.org
4 years agowtv: clean memory on error
Vittorio Giovara [Sat, 18 Oct 2014 00:12:18 +0000 (01:12 +0100)]
wtv: clean memory on error

CC: libav-stable@libav.org
Bug-Id: CID 718002

4 years agowtv: check seek_by_sector return value
Vittorio Giovara [Sat, 18 Oct 2014 00:12:19 +0000 (01:12 +0100)]
wtv: check seek_by_sector return value

CC: libav-stable@libav.org
Bug-Id: CID 1198258

4 years agoaviobuf: check context before using it
Vittorio Giovara [Sat, 18 Oct 2014 00:12:13 +0000 (01:12 +0100)]
aviobuf: check context before using it

Avoid a possible null pointer dereference.

CC: libav-stable@libav.org
Bug-Id: CID 1135769

4 years agoavio: fix sizeof argument
Michael Niedermayer [Sat, 18 Oct 2014 00:12:12 +0000 (01:12 +0100)]
avio: fix sizeof argument

CC: libav-stable@libav.org
Bug-Id: CID 732284

4 years agoidcin: fix return check
Vittorio Giovara [Sat, 18 Oct 2014 00:12:11 +0000 (01:12 +0100)]
idcin: fix return check

CC: libav-stable@libav.org
Bug-Id: CID 732198

4 years agoavutil/cast5: Fix off by one error
Michael Niedermayer [Mon, 20 Oct 2014 03:41:26 +0000 (05:41 +0200)]
avutil/cast5: Fix off by one error

Fixes fate-cast5 on alpha

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/http: Use ff_http_averror()
Andrey Utkin [Fri, 17 Oct 2014 20:24:01 +0000 (00:24 +0400)]
avformat/http: Use ff_http_averror()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/http: Introduce ff_http_averror()
Andrey Utkin [Fri, 17 Oct 2014 20:24:00 +0000 (00:24 +0400)]
avformat/http: Introduce ff_http_averror()

int ff_http_averror(int status_code, int default_averror)

This helper function returns AVERROR_ value from 3-digit HTTP status
code.

Second argument, default_averror, is used if no specific AVERROR_ is
available. It is introduced because in different places of code
different return codes are used - -1, AVERROR(EIO), AVERROR_INVALIDDATA.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/snowenc: remove redundant FF_MPV_OFFSET()
Michael Niedermayer [Mon, 20 Oct 2014 02:09:43 +0000 (04:09 +0200)]
avcodec/snowenc: remove redundant FF_MPV_OFFSET()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ass: add ASS trailing \r\n in one single place
Clément Bœsch [Sun, 19 Oct 2014 19:19:07 +0000 (21:19 +0200)]
avcodec/ass: add ASS trailing \r\n in one single place

4 years agoavcodec/ass: assume raw=0 in ff_ass_add_rect_bprint
Clément Bœsch [Sun, 19 Oct 2014 19:03:57 +0000 (21:03 +0200)]
avcodec/ass: assume raw=0 in ff_ass_add_rect_bprint

4 years agoavutil/error: Introduce new error codes for 4XX and 5XX replies from remote servers
Andrey Utkin [Fri, 17 Oct 2014 20:23:59 +0000 (00:23 +0400)]
avutil/error: Introduce new error codes for 4XX and 5XX replies from remote servers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffprobe: Add support for color_trc/color_pri/chroma_loc
Michael Niedermayer [Fri, 10 Oct 2014 02:36:03 +0000 (04:36 +0200)]
ffprobe: Add support for color_trc/color_pri/chroma_loc

Idea from: a2c00d22e71d13b72828147be86aa9e961c6cae6
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agortmpproto: Don't mistake app for playpath.
Kacper Michajłow [Sun, 19 Oct 2014 16:16:17 +0000 (18:16 +0200)]
rtmpproto: Don't mistake app for playpath.

For URLs "rtmp://server[:port]/foo" determine what `foo` refers to. If
application name has been defined by the user assume that `foo` is a
playpath, otherwise assume application name.

Signed-off-by: Kacper Michajłow <kasper93@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavfi: added option to vf_perspective to specify transformation by giving destinati...
Nicholas Robbins [Sun, 19 Oct 2014 13:20:22 +0000 (09:20 -0400)]
libavfi: added option to vf_perspective to specify transformation by giving destinations of corners of source.

Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_idet: add counts to frame metadata
Kevin Mitchell [Sun, 19 Oct 2014 11:11:25 +0000 (04:11 -0700)]
avfilter/vf_idet: add counts to frame metadata

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/riff: Add UGY2
Michael Niedermayer [Sun, 19 Oct 2014 12:34:50 +0000 (14:34 +0200)]
avformat/riff: Add UGY2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/filters: fix localtime drawtext example.
Simon Thelen [Tue, 9 Sep 2014 22:01:19 +0000 (00:01 +0200)]
doc/filters: fix localtime drawtext example.

The colon after the localtime function call needs an additional layer of
escaping or else everything until the next colon is treated as a
fontfile.

Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat: Add format_whitelist
Michael Niedermayer [Tue, 30 Sep 2014 21:25:39 +0000 (23:25 +0200)]
avformat: Add format_whitelist

This allows restricting demuxers to a list of needed ones for improved security
Note, some demuxers themselfs open other demuxers, these are only restricted if
AVOptions are forwarded to them. Please check that your code does that.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec: add codec_whitelist
Michael Niedermayer [Tue, 30 Sep 2014 21:24:52 +0000 (23:24 +0200)]
avcodec: add codec_whitelist

This allows restricting decoders to a list of needed ones for improved security

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/utils: Display pixel format information as none ... if unknown instead of...
Michael Niedermayer [Fri, 10 Oct 2014 01:16:50 +0000 (03:16 +0200)]
avcodec/utils: Display pixel format information as none ... if unknown instead of omitting it

This is similar to 20a5956b8daeee4cb59d6fa00ec809b02c04d7f8

The difference this change makes affects only rather few files
but looks like:
Stream #0:1: Video: mjpeg, 90k tbr, 90k tbn, 90k tbc
vs.
Stream #0:1: Video: mjpeg, none(bt470bg/unknown/unknown), 90k tbr, 90k tbn, 90k tbc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/libvpxenc: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Sun, 19 Oct 2014 01:03:04 +0000 (03:03 +0200)]
avcodec/libvpxenc: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegaudiodec_template: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Sun, 19 Oct 2014 01:03:04 +0000 (03:03 +0200)]
avcodec/mpegaudiodec_template: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/nellymoserenc: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Sun, 19 Oct 2014 01:03:04 +0000 (03:03 +0200)]
avcodec/nellymoserenc: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0034314a69e76a53534a74cceef865cfcb7b42cc'
Michael Niedermayer [Sat, 18 Oct 2014 21:48:02 +0000 (23:48 +0200)]
Merge commit '0034314a69e76a53534a74cceef865cfcb7b42cc'

* commit '0034314a69e76a53534a74cceef865cfcb7b42cc':
  rtmp: Always call rtmp_close() on rtmp_open() failure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'fc1eda543c6ef043300612db90da5cfd972af650'
Michael Niedermayer [Sat, 18 Oct 2014 21:39:56 +0000 (23:39 +0200)]
Merge commit 'fc1eda543c6ef043300612db90da5cfd972af650'

* commit 'fc1eda543c6ef043300612db90da5cfd972af650':
  swscale: fix sign extensions in yuv planar conversion

Conflicts:
libswscale/rgb2rgb_template.c

See: a07e9d72a1d97dc6a4d57e1f7b708e54e7db83f5
See: a30972609ca39b791ce1e4e5cc6c3dd6cb9c9b12
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b7c77912b62163b3b46ce93fe42fff3c83604c82'
Michael Niedermayer [Sat, 18 Oct 2014 21:13:00 +0000 (23:13 +0200)]
Merge commit 'b7c77912b62163b3b46ce93fe42fff3c83604c82'

* commit 'b7c77912b62163b3b46ce93fe42fff3c83604c82':
  oss_audio: use a macro to simplify ioctl() error checking

Conflicts:
libavdevice/oss_audio.c

See: 69c7aad494683953e833e8622776e3bbcc7921ed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '963f76144897d3f7684d82ec21e51dd50ea1106e'
Michael Niedermayer [Sat, 18 Oct 2014 20:21:05 +0000 (22:21 +0200)]
Merge commit '963f76144897d3f7684d82ec21e51dd50ea1106e'

* commit '963f76144897d3f7684d82ec21e51dd50ea1106e':
  avresample: Make sure the even check does not overflow

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '088eca28164c8cd3b72b0c3d3f9e3fe5ee5cb28f'
Michael Niedermayer [Sat, 18 Oct 2014 20:13:30 +0000 (22:13 +0200)]
Merge commit '088eca28164c8cd3b72b0c3d3f9e3fe5ee5cb28f'

* commit '088eca28164c8cd3b72b0c3d3f9e3fe5ee5cb28f':
  avresample: prevent theoretical division by zero

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0d989dbfc4bc5bc1d563e967449116a7a9865258'
Michael Niedermayer [Sat, 18 Oct 2014 20:01:44 +0000 (22:01 +0200)]
Merge commit '0d989dbfc4bc5bc1d563e967449116a7a9865258'

* commit '0d989dbfc4bc5bc1d563e967449116a7a9865258':
  af_resample: check av_opt_set_dict return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '6d96c7ea89600655b1f18a3b12f3f041fa714152'
Michael Niedermayer [Sat, 18 Oct 2014 19:46:28 +0000 (21:46 +0200)]
Merge commit '6d96c7ea89600655b1f18a3b12f3f041fa714152'

* commit '6d96c7ea89600655b1f18a3b12f3f041fa714152':
  vf_showinfo: Forward the av_image_get_linesize error

Conflicts:
libavfilter/vf_showinfo.c

See: 2aecfd4f209688a8365f18b351f0ecf12fe5f873
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f401792595dd7760f531e8a3bd2336e9033bd45a'
Michael Niedermayer [Sat, 18 Oct 2014 19:31:08 +0000 (21:31 +0200)]
Merge commit 'f401792595dd7760f531e8a3bd2336e9033bd45a'

* commit 'f401792595dd7760f531e8a3bd2336e9033bd45a':
  vf_drawtext: Do not leak the mmapped textfile

Conflicts:
libavfilter/vf_drawtext.c

See: 6956b048d8198dce5126c8942dece21cfb1a7978
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/wmv2enc: add priv_class
Michael Niedermayer [Sat, 18 Oct 2014 18:06:29 +0000 (20:06 +0200)]
avcodec/wmv2enc: add priv_class

Fixes ratecontrol code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/snowenc: add FF_MPV_COMMON_OPTS
Michael Niedermayer [Sat, 18 Oct 2014 17:41:48 +0000 (19:41 +0200)]
avcodec/snowenc: add FF_MPV_COMMON_OPTS

This fixes the ratecontrol code with snow
adding FF_MPV_COMMON_OPTS is needed as the generic rate control options
are currently in the (unrelated) MpegEncContext

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45'
Michael Niedermayer [Sat, 18 Oct 2014 17:23:00 +0000 (19:23 +0200)]
Merge commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45'

* commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45':
  lavc: make lmax/lmin into private options of mpegvideo encoders

Conflicts:
libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mjpegenc: add priv_class to encoders
Michael Niedermayer [Sat, 18 Oct 2014 17:13:20 +0000 (19:13 +0200)]
avcodec/mjpegenc: add priv_class to encoders

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agortmp: Always call rtmp_close() on rtmp_open() failure
Alexander Drozdov [Sat, 18 Oct 2014 14:02:32 +0000 (16:02 +0200)]
rtmp: Always call rtmp_close() on rtmp_open() failure

Prevent possible memory leaks.

Connect to nginx and request a non-existent resource to
trigger the issue.

CC: libav-stable@libav.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Uwe L. Korn <uwelk@xhochy.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoswscale: fix sign extensions in yuv planar conversion
Vittorio Giovara [Fri, 17 Oct 2014 13:31:35 +0000 (14:31 +0100)]
swscale: fix sign extensions in yuv planar conversion

Casting the left-most byte to unsigned avoids an undefined
result of the shift by 24 if bit 7 is set.

yuvPlanartouyvy_c and yuvPlanartoyuy2_c are affected.

CC: libav-stable@libav.org
Bug-Id: CID 732281 / CID 732282

4 years agooss_audio: use a macro to simplify ioctl() error checking
Timothy Gu [Wed, 15 Oct 2014 16:32:54 +0000 (17:32 +0100)]
oss_audio: use a macro to simplify ioctl() error checking

Also add a note about SNDCTL_DSP_GETFMTS which may fail even if OSS is
available.

CC: libav-stable@libav.org
Bug-Id: CID 1238992
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoavresample: Make sure the even check does not overflow
Luca Barbato [Wed, 15 Oct 2014 16:32:57 +0000 (17:32 +0100)]
avresample: Make sure the even check does not overflow

CC: libav-stable@libav.org
Bug-Id: CID 732225

4 years agoavresample: prevent theoretical division by zero
Vittorio Giovara [Wed, 15 Oct 2014 16:33:00 +0000 (17:33 +0100)]
avresample: prevent theoretical division by zero

CC: libav-stable@libav.org
Bug-Id: CID 1231986

4 years agoaf_resample: check av_opt_set_dict return value
Vittorio Giovara [Fri, 17 Oct 2014 09:07:11 +0000 (10:07 +0100)]
af_resample: check av_opt_set_dict return value

CC: libav-stable@libav.org
Bug-Id: CID 1087076

4 years agovf_showinfo: Forward the av_image_get_linesize error
Vittorio Giovara [Fri, 17 Oct 2014 09:07:09 +0000 (10:07 +0100)]
vf_showinfo: Forward the av_image_get_linesize error

CC: libav-stable@libav.org
Bug-Id: CID 1087086

4 years agovf_drawtext: Do not leak the mmapped textfile
Luca Barbato [Fri, 17 Oct 2014 09:07:10 +0000 (10:07 +0100)]
vf_drawtext: Do not leak the mmapped textfile

And validate its size while at it.

CC: libav-stable@libav.org
Bug-Id: CID 1244189

4 years agolibavutil: Add missing av_free() to cast5 selftest
Giorgio Vazzana [Sat, 18 Oct 2014 14:50:59 +0000 (16:50 +0200)]
libavutil: Add missing av_free() to cast5 selftest

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40'
Michael Niedermayer [Sat, 18 Oct 2014 13:58:52 +0000 (15:58 +0200)]
Merge commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40'

* commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40':
  lavc: make border_masking into private options of mpegvideo encoders

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866'
Michael Niedermayer [Sat, 18 Oct 2014 13:42:29 +0000 (15:42 +0200)]
Merge commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866'

* commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866':
  lavc: deprecate unused mb_threshold field

Conflicts:
libavcodec/options_table.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '685be3d1aecf965281128f3b631ed965bcfa754d'
Michael Niedermayer [Sat, 18 Oct 2014 13:33:57 +0000 (15:33 +0200)]
Merge commit '685be3d1aecf965281128f3b631ed965bcfa754d'

* commit '685be3d1aecf965281128f3b631ed965bcfa754d':
  libvpxenc: add static-thresh private option

Conflicts:
libavcodec/libvpxenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283'
Michael Niedermayer [Sat, 18 Oct 2014 13:04:42 +0000 (15:04 +0200)]
Merge commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283'

* commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283':
  lavc: deprecate unused me_threshold field

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6'
Michael Niedermayer [Sat, 18 Oct 2014 12:17:41 +0000 (14:17 +0200)]
Merge commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6'

* commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6':
  lavc: make rc_buffer_aggressivity/rc_initial_cplx into private options of mpegvideo encoders

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a75c2eb25a62105c09b48521aef429dc8a231637'
Michael Niedermayer [Sat, 18 Oct 2014 12:06:15 +0000 (14:06 +0200)]
Merge commit 'a75c2eb25a62105c09b48521aef429dc8a231637'

* commit 'a75c2eb25a62105c09b48521aef429dc8a231637':
  lavc: make rc_eq into private options of mpegvideo encoders

Conflicts:
libavcodec/options_table.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '946f95354ba76ef73c9b66889d86ab5fba4fb486'
Michael Niedermayer [Sat, 18 Oct 2014 11:51:59 +0000 (13:51 +0200)]
Merge commit '946f95354ba76ef73c9b66889d86ab5fba4fb486'

* commit '946f95354ba76ef73c9b66889d86ab5fba4fb486':
  lavc: make rc_qmod_* into private options of mpegvideo encoders

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf'
Michael Niedermayer [Sat, 18 Oct 2014 11:30:38 +0000 (13:30 +0200)]
Merge commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf'

* commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf':
  lavc: make rc_qsquish a private option of mpegvideo encoders

Conflicts:
libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '6cbbf0592f4f3940aac7f687850d1b726a2ea836'
Michael Niedermayer [Sat, 18 Oct 2014 10:46:37 +0000 (12:46 +0200)]
Merge commit '6cbbf0592f4f3940aac7f687850d1b726a2ea836'

* commit '6cbbf0592f4f3940aac7f687850d1b726a2ea836':
  resample: Avoid off-by-1 errors in PTS calcs.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotests/fate/mpeg4: add -sws_flags +bitexact
Michael Niedermayer [Sat, 18 Oct 2014 10:30:00 +0000 (12:30 +0200)]
tests/fate/mpeg4: add -sws_flags +bitexact

Should fix fate-mpeg4-resolution-change tests

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'fb238f8230c1b0314985482207add548c68f83cf'
Michael Niedermayer [Sat, 18 Oct 2014 10:15:50 +0000 (12:15 +0200)]
Merge commit 'fb238f8230c1b0314985482207add548c68f83cf'

* commit 'fb238f8230c1b0314985482207add548c68f83cf':
  urlprotocol: remove unused url_interrupt_cb declaration

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavc: make lmax/lmin into private options of mpegvideo encoders
Anton Khirnov [Sun, 27 Oct 2013 12:51:16 +0000 (13:51 +0100)]
lavc: make lmax/lmin into private options of mpegvideo encoders

4 years agolavc: make border_masking into private options of mpegvideo encoders
Anton Khirnov [Sun, 27 Oct 2013 12:51:16 +0000 (13:51 +0100)]
lavc: make border_masking into private options of mpegvideo encoders

4 years agolavc: deprecate unused mb_threshold field
Anton Khirnov [Wed, 8 Oct 2014 10:58:43 +0000 (10:58 +0000)]
lavc: deprecate unused mb_threshold field

4 years agolibvpxenc: add static-thresh private option
Anton Khirnov [Wed, 8 Oct 2014 10:49:11 +0000 (10:49 +0000)]
libvpxenc: add static-thresh private option

Currently, this option is accessed through AVCodecContext.mb_threshold,
which originally controlled reusing MB data when transcoding mpeg to
mpeg. Since the libvpx meaning is completely different from the original
mpegvideo meaning, it is better to use a separate private option for
this.

4 years agolavc: deprecate unused me_threshold field
Anton Khirnov [Wed, 8 Oct 2014 10:39:02 +0000 (10:39 +0000)]
lavc: deprecate unused me_threshold field

4 years agolavc: make rc_buffer_aggressivity/rc_initial_cplx into private options of mpegvideo...
Anton Khirnov [Sun, 27 Oct 2013 12:51:16 +0000 (13:51 +0100)]
lavc: make rc_buffer_aggressivity/rc_initial_cplx into private options of mpegvideo encoders

4 years agolavc: make rc_eq into private options of mpegvideo encoders
Anton Khirnov [Sun, 27 Oct 2013 12:51:16 +0000 (13:51 +0100)]
lavc: make rc_eq into private options of mpegvideo encoders

4 years agolavc: make rc_qmod_* into private options of mpegvideo encoders
Anton Khirnov [Sun, 27 Oct 2013 12:51:16 +0000 (13:51 +0100)]
lavc: make rc_qmod_* into private options of mpegvideo encoders

4 years agolavc: make rc_qsquish a private option of mpegvideo encoders
Anton Khirnov [Sun, 27 Oct 2013 12:51:16 +0000 (13:51 +0100)]
lavc: make rc_qsquish a private option of mpegvideo encoders

4 years agoresample: Avoid off-by-1 errors in PTS calcs.
Timothy B. Terriberry [Tue, 14 Oct 2014 00:46:00 +0000 (17:46 -0700)]
resample: Avoid off-by-1 errors in PTS calcs.

The rounding used in the PTS calculations in filter_frame() does
not actually match the number of samples output by the resampler.
This leads to off-by-1 errors in the timestamps indicating gaps and
underruns, even when the input timestamps are all contiguous.

Bug-Id: 753

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agourlprotocol: remove unused url_interrupt_cb declaration
Anton Khirnov [Fri, 17 Oct 2014 13:18:52 +0000 (15:18 +0200)]
urlprotocol: remove unused url_interrupt_cb declaration

It is a remnant of the old interrupt callback API.

4 years agoMerge commit '9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0'
Michael Niedermayer [Sat, 18 Oct 2014 01:12:10 +0000 (03:12 +0200)]
Merge commit '9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0'

* commit '9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0':
  rtmpproto: Add pause support

Conflicts:
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f4cd8b80b9cb2a9a4112d8abb1d3b93cd3b4e467'
Michael Niedermayer [Sat, 18 Oct 2014 01:01:31 +0000 (03:01 +0200)]
Merge commit 'f4cd8b80b9cb2a9a4112d8abb1d3b93cd3b4e467'

* commit 'f4cd8b80b9cb2a9a4112d8abb1d3b93cd3b4e467':
  rtmpproto: Track last received timestamp

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: add pkg-config support for libx264
Benoit Fouet [Fri, 17 Oct 2014 14:35:58 +0000 (16:35 +0200)]
configure: add pkg-config support for libx264

Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Tested-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavutil: Add CAST128 symmetric block cipher
Supraja Meedinti [Fri, 17 Oct 2014 18:22:25 +0000 (23:52 +0530)]
libavutil: Add CAST128 symmetric block cipher

Only ECB mode is supported at the moment

Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffplay: update documentation
Marton Balint [Sat, 11 Oct 2014 11:54:42 +0000 (13:54 +0200)]
ffplay: update documentation

Reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Marton Balint <cus@passwd.hu>