ffmpeg.git
5 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

5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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

5 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>
5 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

5 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

5 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

5 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

5 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

5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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

5 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

5 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

5 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.

5 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

5 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

5 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

5 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

5 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

5 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>
5 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.

5 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>
5 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>
5 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>
5 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>
5 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>
5 years agoffplay: remove manual bug option handling code
Marton Balint [Fri, 10 Oct 2014 22:52:15 +0000 (00:52 +0200)]
ffplay: remove manual bug option handling code

It is supported as a codec option, and those are already parsed.

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoffplay: remove delays when paused from video and subtitle thread
Marton Balint [Fri, 10 Oct 2014 21:57:26 +0000 (23:57 +0200)]
ffplay: remove delays when paused from video and subtitle thread

Once the frame queue is full, we will wait anyway.

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agortmpproto: Add pause support
Uwe L. Korn [Fri, 17 Oct 2014 14:30:47 +0000 (16:30 +0200)]
rtmpproto: Add pause support

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agortmpproto: Track last received timestamp
Uwe L. Korn [Fri, 17 Oct 2014 14:30:46 +0000 (16:30 +0200)]
rtmpproto: Track last received timestamp

Some RTMP commands need the most recent timestamp as their parameter, so
keep track of it. This must be the most recent one and not e.g. the max
received timestamp as it can decrease again through seeking.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agohlsenc.c, segment.c: propagate defaults to mpegts
Mika Raento [Fri, 17 Oct 2014 16:28:47 +0000 (19:28 +0300)]
hlsenc.c, segment.c: propagate defaults to mpegts

This fixes the abnormally high ts overhead in the files produced by the
HLS and segments muxers. See https://trac.ffmpeg.org/ticket/2857 . For
example makes it much more likely that it can produces streams that fit
under the 64kb App store limit.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bae557edcea996328e8ff48b9e074a4210f7e6b4'
Michael Niedermayer [Fri, 17 Oct 2014 19:00:08 +0000 (21:00 +0200)]
Merge commit 'bae557edcea996328e8ff48b9e074a4210f7e6b4'

* commit 'bae557edcea996328e8ff48b9e074a4210f7e6b4':
  dump: display codec tags when available

Conflicts:
libavcodec/utils.c

See: d2d7b7134fc387837d51aa1d7f3dbe090d35e8b4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '66e9f839536238945fbfe9d2041b6891cb150e45'
Michael Niedermayer [Fri, 17 Oct 2014 18:45:43 +0000 (20:45 +0200)]
Merge commit '66e9f839536238945fbfe9d2041b6891cb150e45'

* commit '66e9f839536238945fbfe9d2041b6891cb150e45':
  libfdk-aacdec: Enable Dynamic Range Control Metadata Support

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libfdk-aacdec: use av_feeep() to avoid leaving stale pointers in memory
Michael Niedermayer [Fri, 17 Oct 2014 18:36:14 +0000 (20:36 +0200)]
avcodec/libfdk-aacdec: use av_feeep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b01a2204b5cff7bb920f42fda1bb0103f450fe93'
Michael Niedermayer [Fri, 17 Oct 2014 18:35:43 +0000 (20:35 +0200)]
Merge commit 'b01a2204b5cff7bb920f42fda1bb0103f450fe93'

* commit 'b01a2204b5cff7bb920f42fda1bb0103f450fe93':
  libfdk-aacdec: Enable Decoder Downmix including Downmix Metadata Support

Conflicts:
libavcodec/libfdk-aacdec.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/id3v2: support buggy id3v2.3 tag length in id3v2.4
Benoit Fouet [Fri, 17 Oct 2014 08:56:59 +0000 (10:56 +0200)]
avformat/id3v2: support buggy id3v2.3 tag length in id3v2.4

Some encoders do not use syncsafe sizes in v2.4 id3 tags. Check the next
tag to try to choose between the two.

Fixes ticket #4003

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agogitignore: add test_copy.ffmeta
Benoit Fouet [Fri, 17 Oct 2014 09:50:53 +0000 (11:50 +0200)]
gitignore: add test_copy.ffmeta

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodump: display codec tags when available
Vittorio Giovara [Fri, 17 Oct 2014 10:31:46 +0000 (11:31 +0100)]
dump: display codec tags when available

For both audio and video.

5 years agoMerge commit 'e65c776d18dc14df8a279e017760862f9fc8763b'
Michael Niedermayer [Fri, 17 Oct 2014 13:34:24 +0000 (15:34 +0200)]
Merge commit 'e65c776d18dc14df8a279e017760862f9fc8763b'

* commit 'e65c776d18dc14df8a279e017760862f9fc8763b':
  rtmpproto: Add getStreamLength call to query duration

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '324b23dde1bc8638959eb32419c95a93906db272'
Michael Niedermayer [Fri, 17 Oct 2014 13:21:26 +0000 (15:21 +0200)]
Merge commit '324b23dde1bc8638959eb32419c95a93906db272'

* commit '324b23dde1bc8638959eb32419c95a93906db272':
  rtmpproto: Add function to read a number response

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4'
Michael Niedermayer [Fri, 17 Oct 2014 12:57:00 +0000 (14:57 +0200)]
Merge commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4'

* commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4':
  cmdutils: Use the correct guard

Conflicts:
cmdutils.c

See: 35daf3ca8173f80f200860e06a410ced31a8b360
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibfdk-aacdec: Enable Dynamic Range Control Metadata Support
Omer Osman [Tue, 14 Oct 2014 14:43:08 +0000 (16:43 +0200)]
libfdk-aacdec: Enable Dynamic Range Control Metadata Support

For streams which contain DRC metadata, the FDK decoder is able to
control rendering of the decoded output. The rendering parameters
are detailed in fdk_aac_dec_options [].

The default behavior is left up to the decoder.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agolibfdk-aacdec: Enable Decoder Downmix including Downmix Metadata Support
Omer Osman [Tue, 14 Oct 2014 14:43:07 +0000 (16:43 +0200)]
libfdk-aacdec: Enable Decoder Downmix including Downmix Metadata Support

The FDK decoder is capable of producing mono and stereo downmix from
multichannel streams. These streams may contain metadata that control
the downmix process. The decoder requires an Ancillary Buffer in order to
correctly apply downmix in streams containing downmix Metadata. The
decoder does not have an API interface to inform of the presence of
Metadata in the stream, and therefore the Ancillary Buffer is always
allocated whenever a downmix is requested.

When downmixing multichannel streams, the decoder requires the output
buffer in aacDecoder_DecodeFrame call to be of fixed size in order to
hold the actual number of channels contained in the stream. For example,
for a 5.1ch to stereo downmix, the decoder requires that the output buffer
is allocated for 6 channels, regardless of the fact that the output is in
fact two channels.

Due to this requirement, the output buffer is allocated for the maximum
output buffer size in case a downmix is requested (and also during
decoder init). When a downmix is requested, the buffer used for output
during init will also be used for the entire duration the decoder is open.
Otherwise, the initial decoder output buffer is freed and the decoder
decodes straight into the output AVFrame.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoMerge commit '0db6bbb24c1a9f6b5527f460361a5a4132248eee'
Michael Niedermayer [Fri, 17 Oct 2014 12:21:25 +0000 (14:21 +0200)]
Merge commit '0db6bbb24c1a9f6b5527f460361a5a4132248eee'

* commit '0db6bbb24c1a9f6b5527f460361a5a4132248eee':
  avformat: Make avformat_free_context handle NULL

See: ee23dcf534801931c13f9f534586b56e231d3085
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a'
Michael Niedermayer [Fri, 17 Oct 2014 12:08:40 +0000 (14:08 +0200)]
Merge commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a'

* commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a':
  avconv: check return value

Conflicts:
ffmpeg.c

See: 4930cd13d634d5f4e284de3a955d5c6a84fd65e2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581'
Michael Niedermayer [Fri, 17 Oct 2014 11:47:49 +0000 (13:47 +0200)]
Merge commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581'

* commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581':
  avconv: fix leak in filter error

Conflicts:
ffmpeg_filter.c

See: 14369f59c5ad1fb817fb4d94073f31cccf12b556
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'aeb23fc4549a25ef32ff085d2a76227f90caf403'
Michael Niedermayer [Fri, 17 Oct 2014 11:35:27 +0000 (13:35 +0200)]
Merge commit 'aeb23fc4549a25ef32ff085d2a76227f90caf403'

* commit 'aeb23fc4549a25ef32ff085d2a76227f90caf403':
  avprobe: Remove a pointless check

Conflicts:
avprobe.c

No change as the code does not exist in ffprobe

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc'
Michael Niedermayer [Fri, 17 Oct 2014 11:28:50 +0000 (13:28 +0200)]
Merge commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc'

* commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc':
  avplay: Always free opts

Conflicts:
ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767'
Michael Niedermayer [Fri, 17 Oct 2014 11:17:05 +0000 (13:17 +0200)]
Merge commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767'

* commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767':
  avplay: Always free find_stream_info options

Conflicts:
ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotests/fate/mpeg4: fix samples path
Michael Niedermayer [Fri, 17 Oct 2014 11:07:55 +0000 (13:07 +0200)]
tests/fate/mpeg4: fix samples path

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f29c226af0ecc34c417b646580a9acd7d8bbaf48'
Michael Niedermayer [Fri, 17 Oct 2014 10:52:15 +0000 (12:52 +0200)]
Merge commit 'f29c226af0ecc34c417b646580a9acd7d8bbaf48'

* commit 'f29c226af0ecc34c417b646580a9acd7d8bbaf48':
  fate: add mpeg4 tests for frame size changes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/m4vdec: mark as possibly containing discontinuities
Michael Niedermayer [Fri, 17 Oct 2014 10:37:40 +0000 (12:37 +0200)]
avformat/m4vdec: mark as possibly containing discontinuities

This will be needed for the resolution change mpeg4 test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agortmpproto: Add getStreamLength call to query duration
Uwe L. Korn [Tue, 14 Oct 2014 15:16:21 +0000 (17:16 +0200)]
rtmpproto: Add getStreamLength call to query duration

In (non-live) streams with no metadata, the duration of a stream can
be retrieved by calling the RTMP function getStreamLength with the
playpath. The server will return a positive duration upon the request if
the duration is known, otherwise either no response or a duration of 0
will be returned.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agortmpproto: Add function to read a number response
Uwe L. Korn [Tue, 14 Oct 2014 15:16:20 +0000 (17:16 +0200)]
rtmpproto: Add function to read a number response

Packets that contain a number as a result to a rtmp function call are
structured the same way (String, Number, Null, Number). This new method
also includes more bounds checks to better handle packets that are not
structured as expected.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agocmdutils: Use the correct guard
Luca Barbato [Wed, 15 Oct 2014 00:43:30 +0000 (02:43 +0200)]
cmdutils: Use the correct guard

The OptionDef arrays are terminated with a { NULL } element not NULL.

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

5 years agoavformat: Make avformat_free_context handle NULL
Luca Barbato [Wed, 15 Oct 2014 00:35:55 +0000 (02:35 +0200)]
avformat: Make avformat_free_context handle NULL

Work as the other free()-like functions.

Bug-Id: CID 1087081
CC: libav-stable@libav.org
5 years agoavconv: check return value
Vittorio Giovara [Tue, 14 Oct 2014 15:46:48 +0000 (16:46 +0100)]
avconv: check return value

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

5 years agoavconv: fix leak in filter error
Vittorio Giovara [Tue, 14 Oct 2014 15:46:44 +0000 (16:46 +0100)]
avconv: fix leak in filter error

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

5 years agoavprobe: Remove a pointless check
Luca Barbato [Tue, 14 Oct 2014 15:46:42 +0000 (16:46 +0100)]
avprobe: Remove a pointless check

The element is always valid.

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

5 years agoavplay: Always free opts
Luca Barbato [Tue, 14 Oct 2014 15:46:39 +0000 (16:46 +0100)]
avplay: Always free opts

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

5 years agoavplay: Always free find_stream_info options
Luca Barbato [Tue, 14 Oct 2014 15:46:38 +0000 (16:46 +0100)]
avplay: Always free find_stream_info options

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

5 years agofate: add mpeg4 tests for frame size changes
Janne Grunau [Tue, 18 Sep 2012 14:03:08 +0000 (16:03 +0200)]
fate: add mpeg4 tests for frame size changes

5 years agodoc/filters.texi: fix several typos in the vidstab* sections
Moritz Barsnick [Wed, 15 Oct 2014 13:44:33 +0000 (15:44 +0200)]
doc/filters.texi: fix several typos in the vidstab* sections

Also create an anchor for the unsharp filter, and references to
it in its mentions.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/vf_noise: move asm code to a separate file
James Almer [Fri, 17 Oct 2014 01:24:42 +0000 (22:24 -0300)]
x86/vf_noise: move asm code to a separate file

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>