ffmpeg.git
5 years agolavu/frame: fix malloc error path in av_frame_copy_props()
wm4 [Mon, 15 Dec 2014 03:32:58 +0000 (04:32 +0100)]
lavu/frame: fix malloc error path in av_frame_copy_props()

The error path frees all side data, but forgets to reset the side data
count. This can blow up later in av_frame_unref() and free_side_data().

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: Set the default for --shlibdir to --libdir.
Carl Eugen Hoyos [Mon, 15 Dec 2014 01:49:12 +0000 (02:49 +0100)]
configure: Set the default for --shlibdir to --libdir.

Fixes ticket #4183.

Reviewed-by: Ivan Kalvachev
5 years agovp9/x86: sse2 MC assembly.
Ronald S. Bultje [Mon, 15 Dec 2014 01:13:24 +0000 (20:13 -0500)]
vp9/x86: sse2 MC assembly.

Also a slight change to the ssse3 code, which prevents a theoretical
overflow in the sharp filter.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/mxfdec: Fix memleaks reading corrupt files.
Carl Eugen Hoyos [Mon, 15 Dec 2014 00:33:13 +0000 (01:33 +0100)]
lavf/mxfdec: Fix memleaks reading corrupt files.

Fixes ticket #4173.

Reviewed-by: Tomas Härdin
5 years agolavf/mxfdec: Factorize mxf_read_close().
Carl Eugen Hoyos [Mon, 15 Dec 2014 00:31:12 +0000 (01:31 +0100)]
lavf/mxfdec: Factorize mxf_read_close().

This will allow to fix leaks in a subsequent commit.

5 years agovp9/x86: 32bit and sse2 support for vp9 inverse transform assembly
Ronald S. Bultje [Sun, 14 Dec 2014 23:25:10 +0000 (00:25 +0100)]
vp9/x86: 32bit and sse2 support for vp9 inverse transform assembly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/dv: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Sun, 14 Dec 2014 23:16:49 +0000 (00:16 +0100)]
avformat/dv: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agocmdutils: use macros for device test
Lukasz Marek [Sat, 13 Dec 2014 18:54:39 +0000 (19:54 +0100)]
cmdutils: use macros for device test

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/alsa-audio-common: mark default device in device list
Lukasz Marek [Sat, 13 Dec 2014 18:46:15 +0000 (19:46 +0100)]
lavd/alsa-audio-common: mark default device in device list

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/avdevice: use better option types for caps options
Lukasz Marek [Sat, 13 Dec 2014 19:25:42 +0000 (20:25 +0100)]
lavd/avdevice: use better option types for caps options

Using dedicated types allows to use format/layout names,
not just raw int values.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoMerge commit 'fd665f7f48fa7db89eb9a93ac33919f6adc40f9d'
Michael Niedermayer [Sun, 14 Dec 2014 21:53:23 +0000 (22:53 +0100)]
Merge commit 'fd665f7f48fa7db89eb9a93ac33919f6adc40f9d'

* commit 'fd665f7f48fa7db89eb9a93ac33919f6adc40f9d':
  avconv: Use the mpeg12 private option scan_offset

Conflicts:
ffmpeg_opt.c

See: e479013ae41050ad9b76429d8c6ab70684cddc93
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '559fa0d41b5cf8f7e1ba89d1ac70e74712eb2816'
Michael Niedermayer [Sun, 14 Dec 2014 21:22:19 +0000 (22:22 +0100)]
Merge commit '559fa0d41b5cf8f7e1ba89d1ac70e74712eb2816'

* commit '559fa0d41b5cf8f7e1ba89d1ac70e74712eb2816':
  vdpau: add mapping for H.264 Constrained Baseline profile and fallback

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8502c1e9ff9c1dbb6e467630c048d098f4064021'
Michael Niedermayer [Sun, 14 Dec 2014 21:14:36 +0000 (22:14 +0100)]
Merge commit '8502c1e9ff9c1dbb6e467630c048d098f4064021'

* commit '8502c1e9ff9c1dbb6e467630c048d098f4064021':
  vdpau: add mapping for H.264 Extended profile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8b51bcfed75721e0d20832e5a90e1d585318c9d9'
Michael Niedermayer [Sun, 14 Dec 2014 21:07:08 +0000 (22:07 +0100)]
Merge commit '8b51bcfed75721e0d20832e5a90e1d585318c9d9'

* commit '8b51bcfed75721e0d20832e5a90e1d585318c9d9':
  vdpau: revector macro to reduce line span

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e10e6651b50b4087f08813f3e503620db7413d3a'
Michael Niedermayer [Sun, 14 Dec 2014 21:05:13 +0000 (22:05 +0100)]
Merge commit 'e10e6651b50b4087f08813f3e503620db7413d3a'

* commit 'e10e6651b50b4087f08813f3e503620db7413d3a':
  thread: use "" instead of <> for including the w32pthreads wrapper

See: 32eadfe453c32788ea57968e6e80f673f434739d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: Do not update programs streams from program-less streams in update_wr...
Michael Niedermayer [Sun, 14 Dec 2014 18:46:31 +0000 (19:46 +0100)]
avformat/utils: Do not update programs streams from program-less streams in update_wrap_reference()

Fixes Ticket3686

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mp3dec: Name the dummy variable as what it is, to avoid confusion
Michael Niedermayer [Sun, 14 Dec 2014 19:08:13 +0000 (20:08 +0100)]
avformat/mp3dec: Name the dummy variable as what it is, to avoid confusion

Found-by: nattyzs <nattyzs@163.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavconv: Use the mpeg12 private option scan_offset
Julien Ramseier [Sun, 14 Dec 2014 01:00:04 +0000 (02:00 +0100)]
avconv: Use the mpeg12 private option scan_offset

Introduced in aed790070486b1b01b48106310d9d0ca1730e459

Bug-Id: debian/773055
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agovdpau: add mapping for H.264 Constrained Baseline profile and fallback
Rémi Denis-Courmont [Sat, 13 Dec 2014 16:42:21 +0000 (18:42 +0200)]
vdpau: add mapping for H.264 Constrained Baseline profile and fallback

Old VDPAU drivers do not support this newly defined profile, so falling
back to Main profile is necessary for backward binary compatibility.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agovdpau: add mapping for H.264 Extended profile
Rémi Denis-Courmont [Sat, 13 Dec 2014 16:42:20 +0000 (18:42 +0200)]
vdpau: add mapping for H.264 Extended profile

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agovdpau: revector macro to reduce line span
Rémi Denis-Courmont [Sat, 13 Dec 2014 16:42:19 +0000 (18:42 +0200)]
vdpau: revector macro to reduce line span

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agothread: use "" instead of <> for including the w32pthreads wrapper
Anton Khirnov [Mon, 1 Dec 2014 13:15:36 +0000 (14:15 +0100)]
thread: use "" instead of <> for including the w32pthreads wrapper

Found-by: Dave Yeo <dave.r.yeo@gmail.com>
5 years agoavformat/aviobuf: Check that avio_seek() target is non negative
Michael Niedermayer [Sun, 14 Dec 2014 16:26:11 +0000 (17:26 +0100)]
avformat/aviobuf: Check that avio_seek() target is non negative

Fixes out of array access

Suggested-by: Andrew Scherkus <scherkus@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_dctdnoiz: use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Sun, 14 Dec 2014 14:56:32 +0000 (15:56 +0100)]
avfilter/vf_dctdnoiz: use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/f_sendcmd: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Sun, 14 Dec 2014 14:54:45 +0000 (15:54 +0100)]
avfilter/f_sendcmd: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/xiph: mark returned header pointers const from avpriv_split_xiph_headers()
Michael Niedermayer [Fri, 12 Dec 2014 13:46:19 +0000 (14:46 +0100)]
avcodec/xiph: mark returned header pointers const from avpriv_split_xiph_headers()

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/nutenc: store the actual r_frame_rate in the corresponding field if available
Michael Niedermayer [Sun, 14 Dec 2014 00:12:27 +0000 (01:12 +0100)]
avformat/nutenc: store the actual r_frame_rate in the corresponding field if available

Fixes Ticket 3629 part3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: forward r_frame_rate to the muxer in case of stream copy
Michael Niedermayer [Sun, 14 Dec 2014 00:16:39 +0000 (01:16 +0100)]
ffmpeg: forward r_frame_rate to the muxer in case of stream copy

Fixes Ticket3629 part2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: use r_frame_rate only in the demuxer for ff_compute_frame_duration()
Michael Niedermayer [Sun, 14 Dec 2014 00:36:29 +0000 (01:36 +0100)]
avformat/utils: use r_frame_rate only in the demuxer for ff_compute_frame_duration()

This is primarly to maintain current behavior when r_frame_rate is set for muxers
and could be reverted if it has some advantage

Fixes Ticket3629 part1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: fix wording in AVSubtitleRect doxy
Clément Bœsch [Sat, 13 Dec 2014 22:35:22 +0000 (23:35 +0100)]
avcodec: fix wording in AVSubtitleRect doxy

5 years agoswresample/soxr_resample: fix error handling
Rob Sykes [Sat, 13 Dec 2014 20:12:56 +0000 (21:12 +0100)]
swresample/soxr_resample: fix error handling

Fixes CID1257659

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofix "than" typo
Michael Niedermayer [Sat, 13 Dec 2014 19:52:31 +0000 (20:52 +0100)]
fix "than" typo

Found-by reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: Do not estimate the container bitrate from the streams if one video...
Michael Niedermayer [Sat, 13 Dec 2014 18:20:10 +0000 (19:20 +0100)]
avformat/utils: Do not estimate the container bitrate from the streams if one video stream lacks the bitrate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_uspp: fix gray pixfmt handling
Michael Niedermayer [Sat, 13 Dec 2014 16:16:49 +0000 (17:16 +0100)]
avfilter/vf_uspp: fix gray pixfmt handling

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_uspp: fix used chroma subsampling factors
Michael Niedermayer [Sat, 13 Dec 2014 15:54:13 +0000 (16:54 +0100)]
avfilter/vf_uspp: fix used chroma subsampling factors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_uspp: fix used pix_fmt
Michael Niedermayer [Sat, 13 Dec 2014 15:38:44 +0000 (16:38 +0100)]
avfilter/vf_uspp: fix used pix_fmt

Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dvdsubdec: Avoid strerror() due to thread saftey
Michael Niedermayer [Sat, 13 Dec 2014 14:15:07 +0000 (15:15 +0100)]
avcodec/dvdsubdec: Avoid strerror() due to thread saftey

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libxvid_rc: Avoid strerror() for thread saftey
Michael Niedermayer [Sat, 13 Dec 2014 14:12:37 +0000 (15:12 +0100)]
avcodec/libxvid_rc: Avoid strerror() for thread saftey

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mov: Simplify code by using OFFSET() and FLAGS macros
Michael Niedermayer [Sat, 13 Dec 2014 14:06:19 +0000 (15:06 +0100)]
avformat/mov: Simplify code by using OFFSET() and FLAGS macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_kerndeint: use av_freep(), avoid leaving stale pointers in memory
Michael Niedermayer [Sat, 13 Dec 2014 12:54:16 +0000 (13:54 +0100)]
avfilter/vf_kerndeint: use av_freep(), avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_unsharp: use av_freep() avoid leaving stale pointers in memory
Michael Niedermayer [Sat, 13 Dec 2014 12:53:53 +0000 (13:53 +0100)]
avfilter/vf_unsharp: use av_freep() avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_uspp: Add grayscale support
Michael Niedermayer [Sat, 13 Dec 2014 04:33:19 +0000 (05:33 +0100)]
avfilter/vf_uspp: Add grayscale support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_uspp: assert that the qp_type is valid
Michael Niedermayer [Sat, 13 Dec 2014 04:30:39 +0000 (05:30 +0100)]
avfilter/vf_uspp: assert that the qp_type is valid

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: add FFREPORT example
Lou Logan [Thu, 11 Dec 2014 20:46:54 +0000 (11:46 -0900)]
doc: add FFREPORT example

And fix a few nits.

Signed-off-by: Lou Logan <lou@lrcd.com>
5 years agolavu/dict: check for malloc failures
wm4 [Fri, 12 Dec 2014 17:15:39 +0000 (18:15 +0100)]
lavu/dict: check for malloc failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: check for malloc failure
wm4 [Fri, 12 Dec 2014 21:22:55 +0000 (22:22 +0100)]
avformat/utils: check for malloc failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc/avpacket: check for malloc failure
wm4 [Fri, 12 Dec 2014 17:15:42 +0000 (18:15 +0100)]
lavc/avpacket: check for malloc failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoDelete mp=uspp
Arwa Arif [Fri, 12 Dec 2014 05:44:26 +0000 (11:14 +0530)]
Delete mp=uspp

5 years agoavfilter/vf_spp: The qp array width is qp_stride not stride/16
Michael Niedermayer [Fri, 12 Dec 2014 17:14:15 +0000 (18:14 +0100)]
avfilter/vf_spp: The qp array width is qp_stride not stride/16

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_spp: Allocate qp storage after qp_stride is known
Michael Niedermayer [Fri, 12 Dec 2014 17:13:13 +0000 (18:13 +0100)]
avfilter/vf_spp: Allocate qp storage after qp_stride is known

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavdevice/v4l2: use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Fri, 12 Dec 2014 13:46:46 +0000 (14:46 +0100)]
avdevice/v4l2: use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_spp: change temporary to unsigned
Michael Niedermayer [Fri, 12 Dec 2014 12:34:18 +0000 (13:34 +0100)]
avfilter/vf_spp: change temporary to unsigned

More consistent with uspp and allows for future 10bit support

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_uspp: fix integer overflow in intermediate
Michael Niedermayer [Fri, 12 Dec 2014 03:28:34 +0000 (04:28 +0100)]
avfilter/vf_uspp: fix integer overflow in intermediate

Fixes Ticket3596

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_uspp: remove YUV 411/422/440
Michael Niedermayer [Fri, 12 Dec 2014 00:50:03 +0000 (01:50 +0100)]
avfilter/vf_uspp: remove YUV 411/422/440

snow doesnt support 422/411/440 currently, so these do not work yet

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_uspp: use the average QP instead of QP[0]
Michael Niedermayer [Fri, 12 Dec 2014 00:47:46 +0000 (01:47 +0100)]
avfilter/vf_uspp: use the average QP instead of QP[0]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_uspp: The qp array width is qp_stride not stride/16
Michael Niedermayer [Fri, 12 Dec 2014 00:41:33 +0000 (01:41 +0100)]
avfilter/vf_uspp: The qp array width is qp_stride not stride/16

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_uspp: Allocate qp storage after qp_stride is known
Michael Niedermayer [Fri, 12 Dec 2014 00:40:26 +0000 (01:40 +0100)]
avfilter/vf_uspp: Allocate qp storage after qp_stride is known

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/version: bump for uspp
Michael Niedermayer [Fri, 12 Dec 2014 00:30:45 +0000 (01:30 +0100)]
avfilter/version: bump for uspp

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoLICENSE: mention that uspp is GPL
Clément Bœsch [Fri, 12 Dec 2014 00:46:45 +0000 (01:46 +0100)]
LICENSE: mention that uspp is GPL

5 years agobuild: add forgotten avcodec dependency in uspp
Clément Bœsch [Fri, 12 Dec 2014 00:45:49 +0000 (01:45 +0100)]
build: add forgotten avcodec dependency in uspp

5 years agoavfilter/uspp: use AVFILTER_DEFINE_CLASS()
Clément Bœsch [Fri, 12 Dec 2014 00:52:02 +0000 (01:52 +0100)]
avfilter/uspp: use AVFILTER_DEFINE_CLASS()

5 years agoavfilter/uspp: make src const in store_slice_c()
Clément Bœsch [Fri, 12 Dec 2014 00:45:29 +0000 (01:45 +0100)]
avfilter/uspp: make src const in store_slice_c()

5 years agoavfilter/uspp: misc style fixes
Clément Bœsch [Fri, 12 Dec 2014 00:40:55 +0000 (01:40 +0100)]
avfilter/uspp: misc style fixes

5 years agolavfi: USPP Filter
Arwa Arif [Sun, 7 Dec 2014 13:26:46 +0000 (18:56 +0530)]
lavfi: USPP Filter

Previous version reviewed by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mov: Disable XMP metadata by default
Michael Niedermayer [Tue, 9 Dec 2014 01:57:01 +0000 (02:57 +0100)]
avformat/mov: Disable XMP metadata by default

This was suggested by cbsrobot, ubitux and koda

There are files with huge amounts of XMP data, which would otherwise
be displayed in the terminal output of FFmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libutvideoenc: Check avpicture_get_size() return code
Michael Niedermayer [Thu, 11 Dec 2014 12:55:26 +0000 (13:55 +0100)]
avcodec/libutvideoenc: Check avpicture_get_size() return code

Fixes CID1257656

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libutvideoenc: fix leak of info array on error
Michael Niedermayer [Thu, 11 Dec 2014 14:44:05 +0000 (15:44 +0100)]
avcodec/libutvideoenc: fix leak of info array on error

Fixes CID1257657

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agocompat/avisynth/avxsynth_c: Clear all unused fields in returned structs
Michael Niedermayer [Thu, 11 Dec 2014 15:12:47 +0000 (16:12 +0100)]
compat/avisynth/avxsynth_c: Clear all unused fields in returned structs

Fixes: CID1257658

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/avidec: Do not fail for crazy start times
Gabor Nagy [Thu, 11 Dec 2014 13:59:10 +0000 (14:59 +0100)]
avformat/avidec: Do not fail for crazy start times

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libxavs: fix division by 0 bitrate
Michael Niedermayer [Thu, 11 Dec 2014 12:25:10 +0000 (13:25 +0100)]
avcodec/libxavs: fix division by 0 bitrate

Fixes CID1257655

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/hevc_mc: fix sse register counts
Michael Niedermayer [Wed, 10 Dec 2014 06:48:52 +0000 (07:48 +0100)]
avcodec/x86/hevc_mc: fix sse register counts

These fix failures of --enable-xmm-clobber-test
It would be better to change the code to use fewer registers, but until
someone does the used register count must not be too small

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: do not allow nvenc to be build on cygwin to avoid _WIN32 definition hack
Michael Niedermayer [Thu, 11 Dec 2014 02:47:53 +0000 (03:47 +0100)]
configure: do not allow nvenc to be build on cygwin to avoid _WIN32 definition hack

Suggested-by: James Almer <jamrial@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc: Silence "warning: ref0/1 may be used uninitialized in this function"
Michael Niedermayer [Thu, 11 Dec 2014 01:58:41 +0000 (02:58 +0100)]
avcodec/hevc: Silence "warning: ref0/1 may be used uninitialized in this function"

Also make code more robust by initializing the pointers to NULL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: add loglevel numerical values
Lou Logan [Fri, 5 Dec 2014 21:32:35 +0000 (12:32 -0900)]
doc: add loglevel numerical values

Useful for setting FFREPORT log level.

Signed-off-by: Lou Logan <lou@lrcd.com>
5 years agoMerge commit 'e737a4aaafcb1d761b7f96043c2f83ce742c64ae'
Michael Niedermayer [Thu, 11 Dec 2014 01:03:08 +0000 (02:03 +0100)]
Merge commit 'e737a4aaafcb1d761b7f96043c2f83ce742c64ae'

* commit 'e737a4aaafcb1d761b7f96043c2f83ce742c64ae':
  dashenc: Change the duration fields to 64 bit

Conflicts:
libavformat/dashenc.c

See: e65849a70bfb401306038d41ebd8b5750deb3cfd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c7921a480467876ece06566e0efd8f6bce9d1903'
Michael Niedermayer [Thu, 11 Dec 2014 00:44:04 +0000 (01:44 +0100)]
Merge commit 'c7921a480467876ece06566e0efd8f6bce9d1903'

* commit 'c7921a480467876ece06566e0efd8f6bce9d1903':
  libfdk-aacdec: Fix a boundary check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: Add NVENC encoder
Timo Rothenpieler [Sat, 29 Nov 2014 23:04:37 +0000 (00:04 +0100)]
avcodec: Add NVENC encoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hlsenc: added segment file deletion
Christian Suloway [Mon, 8 Dec 2014 16:25:05 +0000 (10:25 -0600)]
avformat/hlsenc: added segment file deletion

This option flag deletes segment files removed from the playlist after a
period of time equal to the duration of the segment plus the duration of
the playlist.

Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodashenc: Change the duration fields to 64 bit
Martin Storsjö [Wed, 10 Dec 2014 06:08:59 +0000 (08:08 +0200)]
dashenc: Change the duration fields to 64 bit

For the last_duration field, it's mostly theoretical, but the
total_duration field more probably may need to actually be 64 bit.

Bug-Id: CID 1254944
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agolibfdk-aacdec: Fix a boundary check
Martin Storsjö [Wed, 10 Dec 2014 06:02:43 +0000 (08:02 +0200)]
libfdk-aacdec: Fix a boundary check

This avoids potential out of bounds writes, with potential future
versions of the library.

Bug-Id: CID 1254945
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavcodec/hevc_refs: fix potential use of uninitialized min_idx
Michael Niedermayer [Wed, 10 Dec 2014 13:34:46 +0000 (14:34 +0100)]
avcodec/hevc_refs: fix potential use of uninitialized min_idx

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/yuv4mpegdec: fix "warning: field_order may be used uninitialized in this...
Michael Niedermayer [Wed, 10 Dec 2014 13:02:18 +0000 (14:02 +0100)]
avformat/yuv4mpegdec: fix "warning: field_order may be used uninitialized in this function"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/flvdec: fix potential use of uninitialized variables
Michael Niedermayer [Wed, 10 Dec 2014 12:30:51 +0000 (13:30 +0100)]
avformat/flvdec: fix potential use of uninitialized variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_perspective: add av_assert0() to help gcc see that there are no uninitial...
Michael Niedermayer [Wed, 10 Dec 2014 12:26:46 +0000 (13:26 +0100)]
avfilter/vf_perspective: add av_assert0() to help gcc see that there are no uninitialized variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2c3f29c4894ee50635b846f202296ad79a7c0d33'
Michael Niedermayer [Wed, 10 Dec 2014 11:20:23 +0000 (12:20 +0100)]
Merge commit '2c3f29c4894ee50635b846f202296ad79a7c0d33'

* commit '2c3f29c4894ee50635b846f202296ad79a7c0d33':
  xcbgrab: Support empty filename string correctly

Conflicts:
libavdevice/xcbgrab.c

See: 62eca2f827d441f52125191fd78c96b67a7ba30c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/hevc_mc: remove dead branch from EPEL_FILTER
Michael Niedermayer [Wed, 10 Dec 2014 06:34:49 +0000 (07:34 +0100)]
avcodec/x86/hevc_mc: remove dead branch from EPEL_FILTER

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/avidec: Increase dshow_block_align use threshold by 1
Gabor Nagy [Wed, 10 Dec 2014 01:59:25 +0000 (02:59 +0100)]
avformat/avidec: Increase dshow_block_align use threshold by 1

Fixes 00.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoxcbgrab: Support empty filename string correctly
Luca Barbato [Wed, 26 Nov 2014 05:20:52 +0000 (06:20 +0100)]
xcbgrab: Support empty filename string correctly

Bug-Id: CID 1254664
CC: libav-stable@libav.org
5 years agoMerge commit 'fa8934d6d6a0bb290010bdf16265c40b331d56fb'
Michael Niedermayer [Wed, 10 Dec 2014 00:24:36 +0000 (01:24 +0100)]
Merge commit 'fa8934d6d6a0bb290010bdf16265c40b331d56fb'

* commit 'fa8934d6d6a0bb290010bdf16265c40b331d56fb':
  dashenc: log file output progress in verbose mode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '95d880fa6436f3b557a9c060428a04b9e4d552df'
Michael Niedermayer [Wed, 10 Dec 2014 00:16:31 +0000 (01:16 +0100)]
Merge commit '95d880fa6436f3b557a9c060428a04b9e4d552df'

* commit '95d880fa6436f3b557a9c060428a04b9e4d552df':
  rtpproto: Fix the input RTP data format check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd2f1d42b18787e4fcb28864d9d9f701dd64a5747'
Michael Niedermayer [Tue, 9 Dec 2014 23:58:13 +0000 (00:58 +0100)]
Merge commit 'd2f1d42b18787e4fcb28864d9d9f701dd64a5747'

* commit 'd2f1d42b18787e4fcb28864d9d9f701dd64a5747':
  fate: add dolby true hd tests

Conflicts:
tests/fate/lossless-audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4c81613df499ba81d64ea102b38d0c6686cc304c'
Michael Niedermayer [Tue, 9 Dec 2014 23:51:15 +0000 (00:51 +0100)]
Merge commit '4c81613df499ba81d64ea102b38d0c6686cc304c'

* commit '4c81613df499ba81d64ea102b38d0c6686cc304c':
  arm: mlpdsp: handle pic offset calculation in a macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '581c7f0e12b1fa39f73d683e54d6ecda0772c5a9'
Michael Niedermayer [Tue, 9 Dec 2014 23:38:52 +0000 (00:38 +0100)]
Merge commit '581c7f0e12b1fa39f73d683e54d6ecda0772c5a9'

* commit '581c7f0e12b1fa39f73d683e54d6ecda0772c5a9':
  arm: make ff_mlp_filter_channel_arm and ff_mlp_rematrix_channel_arm position independent

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodashenc: log file output progress in verbose mode
Bryan Huh [Tue, 9 Dec 2014 08:11:23 +0000 (08:11 +0000)]
dashenc: log file output progress in verbose mode

As the manifest/segments are flushed to disk, log to stderr the
progress, when in verbose logging mode

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agortpproto: Fix the input RTP data format check
Martin Storsjö [Tue, 9 Dec 2014 14:05:14 +0000 (16:05 +0200)]
rtpproto: Fix the input RTP data format check

Only the upper 2 bits of the first byte are known to be
a fixed value.

The lower bits in the first byte of a RTP packet could be set
if the input is from another RTP packetizers than libavformat's,
but for RTCP packets, they would also be set when sending RTCP RR
packets, triggering false warnings about incorrect input format
to the protocol.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoAllow mov musing if the ac3 parser was disabled.
Carl Eugen Hoyos [Tue, 9 Dec 2014 20:12:54 +0000 (21:12 +0100)]
Allow mov musing if the ac3 parser was disabled.

This reverts 8091fe30.
Reported and tested by Takashi, ffmpeg-list dubistmeinheld de

5 years agofate: add dolby true hd tests
Janne Grunau [Mon, 8 Dec 2014 15:21:43 +0000 (16:21 +0100)]
fate: add dolby true hd tests

The existing meridian audio test does not test
ff_mlp_rematrix_channel_arm. This sample (first 640k of
https://samples.libav.org/A-codecs/TrueHD/TrueHD.raw) uses
ff_mlp_rematrix_channel_arm. Since this sample has 5.1 channels it also
allows testing the integrated downmixing.

5 years agoarm: mlpdsp: handle pic offset calculation in a macro
Janne Grunau [Mon, 8 Dec 2014 13:10:18 +0000 (14:10 +0100)]
arm: mlpdsp: handle pic offset calculation in a macro

Makes the code easier to read since it hides different offset
calculations for arm and thumb mode.

5 years agoarm: make ff_mlp_filter_channel_arm and ff_mlp_rematrix_channel_arm position independent
Janne Grunau [Mon, 8 Dec 2014 12:25:55 +0000 (13:25 +0100)]
arm: make ff_mlp_filter_channel_arm and ff_mlp_rematrix_channel_arm position independent

No significant difference in used cpu cycles on a cortex-a9.

5 years agoMerge commit 'fccfc22d1f304aef42a0b960e4c1d55ce67107f5'
Michael Niedermayer [Tue, 9 Dec 2014 20:04:49 +0000 (21:04 +0100)]
Merge commit 'fccfc22d1f304aef42a0b960e4c1d55ce67107f5'

* commit 'fccfc22d1f304aef42a0b960e4c1d55ce67107f5':
  libavformat: Build hevc.o when building the RTP muxer

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