Commit Graph
88454 Commits
Author SHA1 Message Date
James Almer b5e2974b64 Merge commit '2ca759657bcda328acc312e5882a940333a3e268'
* commit '2ca759657bcda328acc312e5882a940333a3e268':
  os_support: Remove the dynamic loading of getaddrinfo from the fallback getaddrinfo

Merged-by: James Almer <jamrial@gmail.com>
2017-11-01 14:01:54 -03:00
James Almer 4b97435566 doc/libav-merge: mention skipped hlsenc commit
Signed-off-by: James Almer <jamrial@gmail.com>
2017-11-01 13:55:29 -03:00
James Almer 9c2f477151 Merge commit '4d444d04c1e19cd02ac836d411433906a9f32613'
* commit '4d444d04c1e19cd02ac836d411433906a9f32613':
  configure: Default to _WIN32_WINNT=0x0502 (XP) as minimum, for legacy mingw

See 69f7aad571

Merged-by: James Almer <jamrial@gmail.com>
2017-11-01 13:47:02 -03:00
James Almer 7c9b469a6b Merge commit '16cb06bb30390c3d74312fc6aead818e19bfd8e4'
* commit '16cb06bb30390c3d74312fc6aead818e19bfd8e4':
  hlsenc: Support recovery from an already present playlist

This commit is a noop. It needs extra work to apply cleanly.

Merged-by: James Almer <jamrial@gmail.com>
2017-11-01 13:42:35 -03:00
James Almer e70cdf91a7 avformat/mux: be less strict with bitstream filter failures
This makes the autobsf feature behave the same as the manual
bitstream filtering in ffmpeg.c

Fixes ticket #6794

Reviewed-by: rcombs
Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-11-01 11:55:50 -03:00
James Almer 502050cb4c avformat/movenc: let avpriv_ac3_parse_header() allocate the AC3HeaderInfo struct
This removes sizeof(AC3HeaderInfo) from the ABI.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-11-01 11:55:13 -03:00
Carl Eugen Hoyos 40d635e8c3 lavc/ppc/h264dsp: Fix function prototype after bc26fe89.
Silences the following gcc warnings:
src/libavcodec/ppc/h264dsp.c: In function 'ff_h264dsp_init_ppc':
src/libavcodec/ppc/h264dsp.c:809:40: warning: assignment from incompatible pointer type
src/libavcodec/ppc/h264dsp.c:810:40: warning: assignment from incompatible pointer type
src/libavcodec/ppc/h264dsp.c:811:40: warning: assignment from incompatible pointer type
src/libavcodec/ppc/h264dsp.c:812:40: warning: assignment from incompatible pointer type
2017-11-01 14:15:15 +01:00
Carl Eugen Hoyos f6b9e365cd lavc/ppc/svq1enc_altivec: Fix function prototype after dad31083.
Silences a gcc warning:
src/libavcodec/ppc/svq1enc_altivec.c: In function 'ff_svq1enc_init_ppc':
src/libavcodec/ppc/svq1enc_altivec.c:80:26: warning: assignment from incompatible pointer type
2017-11-01 13:41:18 +01:00
Moritz BarsnickandPaul B Mahol a0560d0477 avfilter/vf_ocr: check ff_set_common_formats() return value
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
2017-11-01 09:50:57 +01:00
Carl Eugen Hoyos 17806f6083 lavu/murmur3: Enforce usual function attribute order. 2017-11-01 03:05:51 +01:00
Jun ZhaoandMichael Niedermayer 5c51d0edd4 examples/filtering_audio: suppress the build warning.
suppress the "warning: assignment discards ‘const’ qualifier from
pointer target type" build warning.

Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-01 02:10:09 +01:00
Jun ZhaoandMichael Niedermayer cb6e20f8de examples/filtering_video: suppress the build warning.
suppress the "warning: assignment discards ‘const’ qualifier from
pointer target type" build warning.

Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-01 02:10:09 +01:00
Jun ZhaoandMichael Niedermayer fdfc51766d examples/transcoding: suppress build warning.
suppress the "warning: assignment discards ‘const’ qualifier from
pointer target type" build warning.

Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-01 02:10:09 +01:00
Kaustubh RasteandMichael Niedermayer a211626978 avcodec/mips: Improve hevc uni vt and hv mc msa functions
Remove unused macro.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-01 02:10:09 +01:00
Kaustubh RasteandMichael Niedermayer e39c0f29a1 avcodec/mips: Improve hevc bi hz and hv mc msa functions
Align the mask buffer.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-01 02:10:09 +01:00
Kaustubh RasteandMichael Niedermayer 6854dd7039 avcodec/mips: Improve hevc bi weighted copy, hz and vt mc msa functions
Pack the data to half word before clipping.
Use immediate unsigned saturation for clip to max saving one vector register.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-01 02:10:09 +01:00
Carl Eugen Hoyos ff994c2aaa lswr/rematrix: Support s32p.
Fixes ticket #6785.
2017-11-01 01:04:43 +01:00
James Almer 7a02b364b6 avcodec/vp9_superframe_bsf: cache packets by creating new references rather than moving them
Should hopefully fix the invalid reads after free introduced in
e1bc3f4396 for all targets.

Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-31 20:33:32 -03:00
Aman Gupta 05d77587cb lavc/videotoolbox: fix out-of-bounds memory access during hvcc creation
Signed-off-by: Aman Gupta <aman@tmm1.net>
2017-10-31 16:23:23 -07:00
Paul B Mahol d0920da029 avfilter/af_join: switch to activate
Fixes #6780.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-10-31 20:37:22 +01:00
Paul B Mahol e6055af025 avfilter: pass correct argument to helper function
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-10-31 20:37:22 +01:00
James Almer 37f4a093f7 avcodec/vp9_superframe_bsf: allocate cache of packets during init
Also use av_packet_move_ref() to cache them instead of copying
pointers.

Fixes invalid reads since e1bc3f4396.

Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-31 16:24:26 -03:00
James Almer 88c7aa13dd Merge commit '91622f6446b463abe6507ad2cd5d1fbf7e49c424'
* commit '91622f6446b463abe6507ad2cd5d1fbf7e49c424':
  avconv: Always initialize the opkt struct on streamcopy

Merged-by: James Almer <jamrial@gmail.com>
2017-10-31 13:41:37 -03:00
James Almer dbde588917 Merge commit '427f7a1f9ec1977bcb57cb4d6e6f7228dc1e858b'
* commit '427f7a1f9ec1977bcb57cb4d6e6f7228dc1e858b':
  configure: Fix the msvcrt version check for mingw32

This commit is a noop

Merged-by: James Almer <jamrial@gmail.com>
2017-10-31 13:37:46 -03:00
James Almer c2e3cfd060 Merge commit '2017ffc18fe4d33b954dd8a50b086f310f17a329'
* commit '2017ffc18fe4d33b954dd8a50b086f310f17a329':
  vaapi: Add ABGR map only if VA_FOURCC_ABGR is defined

This commit is a noop, see 5aede05120

Merged-by: James Almer <jamrial@gmail.com>
2017-10-31 13:21:21 -03:00
James Almer 092951f4a8 Merge commit '6a7e928555d081ff86c867867ebce74fdc4c87d6'
* commit '6a7e928555d081ff86c867867ebce74fdc4c87d6':
  configure: Do not check for the __builtin_vec_vsx_ld

Merged-by: James Almer <jamrial@gmail.com>
2017-10-31 13:11:02 -03:00
James Almer 51e091e2dc Merge commit '3d040513a1de4797a4f81dde4984395f51db76b7'
* commit '3d040513a1de4797a4f81dde4984395f51db76b7':
  avutil/hwcontext_dxva2: Don't improperly free IDirect3DSurface9 objects
  decode: fix the code reducing cropping to preserve alignment

This commit is a noop, see
02327d1237
0c1c514643

Merged-by: James Almer <jamrial@gmail.com>
2017-10-31 13:06:53 -03:00
James Almer b1ab02895b Merge commit 'c3f0357bdf7d3c542aad2c58b94184b9f56edc41'
* commit 'c3f0357bdf7d3c542aad2c58b94184b9f56edc41':
  hevcdec: move the MD5 context out of HEVCSEIPictureHash back into HEVCContext

Merged-by: James Almer <jamrial@gmail.com>
2017-10-31 12:48:36 -03:00
James Almer 9e2b0f32e9 avcodec/hevc_sei: reorder some parameters in static functions
Cosmetic change skipped in 0b30cb8dae
by mistake.

Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-31 12:48:26 -03:00
James Almer bd8f1fa100 avcodec/hevc_sei: rename HEVCSEIContext to HEVCSEI
Cosmetic change skipped in 0b30cb8dae
by mistake.

Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-31 12:27:57 -03:00
James Almer baf14a996b Merge commit 'd7dcd825dea3681c69a35b3147a3b42f1bf078dd'
* commit 'd7dcd825dea3681c69a35b3147a3b42f1bf078dd':
  extract_extradata_bsf: make sure all needed parameter set NALUs were found

This commit is a noop, see cbd2502939

Merged-by: James Almer <jamrial@gmail.com>
2017-10-31 12:13:40 -03:00
James Almer e1bc3f4396 Merge commit '3fb6b98b5e247434456916c35ba7e08efa03e85d'
* commit '3fb6b98b5e247434456916c35ba7e08efa03e85d':
  vp9_superframe_bsf: cache input packets directly

Merged-by: James Almer <jamrial@gmail.com>
2017-10-31 12:09:53 -03:00
Nicolas George a8305b0ea3 lavfi/testsrc2: fix hang with very small sizes.
Move a subtraction to the other side of the equal to avoid overflows.
2017-10-31 09:17:28 +01:00
James Almer 86c446ec61 Merge commit '126bc2c33b79c36bc23f43719d20f55b9b6771e9'
* commit '126bc2c33b79c36bc23f43719d20f55b9b6771e9':
  vp9_superframe_bsf: convert to the new bitstream reader

This commit is a noop, see
https://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html

Merged-by: James Almer <jamrial@gmail.com>
2017-10-30 23:20:51 -03:00
James Almer a33490ca28 Merge commit '3daaa4417317ca732fb00476fdb3308d784f87e4'
* commit '3daaa4417317ca732fb00476fdb3308d784f87e4':
  hevc: Add names for reserved NAL unit types
  h264_sei: Add namespace prefix to all SEI values

This commit is a noop, see
6eb102a616
b264810ef7

Merged-by: James Almer <jamrial@gmail.com>
2017-10-30 23:18:43 -03:00
James Almer a7da134742 Merge commit '4d56f7ab8f627aa140c1ede1bb61305f01cefcdd'
* commit '4d56f7ab8f627aa140c1ede1bb61305f01cefcdd':
  avconv: Flush output BSFs when stream copy reaches EOF

Merged-by: James Almer <jamrial@gmail.com>
2017-10-30 23:07:15 -03:00
James Almer f7038c3629 Merge commit '66aa9b94dae217a0fc5acfb704490707629d95ed'
* commit '66aa9b94dae217a0fc5acfb704490707629d95ed':
  doc: Document hwupload, hwdownload and hwmap filters

This commit is a noop, see 5de38188f8

Merged-by: James Almer <jamrial@gmail.com>
2017-10-30 21:13:48 -03:00
James Almer ed15851fd8 Merge commit '7c35bee0251efc271c8f7900ce816fcb8ec25d19'
* commit '7c35bee0251efc271c8f7900ce816fcb8ec25d19':
  movenc-test: Add tests for negative cts offsets
  movenc: Don't write any edit list if the start offset is zero

This commit is a noop, see 5455a44aa5

Merged-by: James Almer <jamrial@gmail.com>
2017-10-30 21:09:20 -03:00
James Almer 17feb9e61d Merge commit 'c380a0d7f7a2c7411aae60463e25d916541f0388'
* commit 'c380a0d7f7a2c7411aae60463e25d916541f0388':
  movenc: Add an option for enabling negative CTS offsets

This commit is a noop, see 07e4be7ec9

Merged-by: James Almer <jamrial@gmail.com>
2017-10-30 21:06:15 -03:00
James Almer 122a749dfc Merge commit 'd05c9cde0e87c23ca42957646bea483dfc09d6bf'
* commit 'd05c9cde0e87c23ca42957646bea483dfc09d6bf':
  checkasm: aarch64: Specify alignment for the register_init const array

Merged-by: James Almer <jamrial@gmail.com>
2017-10-30 21:03:50 -03:00
James Almer 921993503b Merge commit 'd7320ca3ed10f0d35b3740fa03341161e74275ea'
* commit 'd7320ca3ed10f0d35b3740fa03341161e74275ea':
  arm: Avoid using .dn register aliases

Merged-by: James Almer <jamrial@gmail.com>
2017-10-30 21:00:51 -03:00
James Almer 7131139b43 Merge commit '6ccf76aec73b2cd598bb1e65d126d8a12540c411'
* commit '6ccf76aec73b2cd598bb1e65d126d8a12540c411':
  mpjpeg: Use proper CR/LF in multipart headers

This commit is a noop, see 0d2f4eedc8

Merged-by: James Almer <jamrial@gmail.com>
2017-10-30 20:58:03 -03:00
James Almer 0e5a47693c Merge commit 'cb167f2947f1a2c446bd8db196d0e64ef4a6d06b'
* commit 'cb167f2947f1a2c446bd8db196d0e64ef4a6d06b':
  h264_refs: validate the SPS pointer in ff_h264_execute_ref_pic_marking()

Merged-by: James Almer <jamrial@gmail.com>
2017-10-30 20:40:28 -03:00
James Almer 0b30cb8dae Merge commit 'cfd25488bf35123bdd38ecbe1107a21df2e03c2f'
* commit 'cfd25488bf35123bdd38ecbe1107a21df2e03c2f':
  hevcdec: move SEI message parsing into a separate header
  hevcdec: remove HEVCContext usage from hevc_sei

This commit is a noop, see
c4b08c8a4e
a687fb9970

Merged-by: James Almer <jamrial@gmail.com>
2017-10-30 20:08:18 -03:00
James Almer 71bf534dd6 Merge commit '59cee42d7d22530e66a155305389e29679b11f78'
* commit '59cee42d7d22530e66a155305389e29679b11f78':
  arm: Check for the .arch directive in configure

Merged-by: James Almer <jamrial@gmail.com>
2017-10-30 20:04:46 -03:00
James Almer 62d86c41b7 Merge commit 'ce080f47b8b55ab3d41eb00487b138d9906d114d'
* commit 'ce080f47b8b55ab3d41eb00487b138d9906d114d':
  hevc: Add NEON 32x32 IDCT

Merged-by: James Almer <jamrial@gmail.com>
2017-10-30 19:59:01 -03:00
James Almer e9e7e1cc6b Merge commit '118dd4a321a2d67f67c21b076abd0b4d939ab642'
* commit '118dd4a321a2d67f67c21b076abd0b4d939ab642':
  hevc: 16x16 NEON idct: Use the right element size for loads/stores

Merged-by: James Almer <jamrial@gmail.com>
2017-10-30 19:56:29 -03:00
James Almer 989254fcff Merge commit '504403ab28688588fb85817ad58964482f67f29f'
* commit '504403ab28688588fb85817ad58964482f67f29f':
  aacsbr: Turnoff in the event of over read.

This commit is a noop, see 2c8a3aa985

Merged-by: James Almer <jamrial@gmail.com>
2017-10-30 19:49:07 -03:00
James Almer b9d3def9b2 Merge commit 'b5f19f7478492307e4b4763aeac3180faf50e17f'
* commit 'b5f19f7478492307e4b4763aeac3180faf50e17f':
  aac: Split function to parse ADTS header data into public and private part

Merged-by: James Almer <jamrial@gmail.com>
2017-10-30 18:56:45 -03:00
James Almer ff173ce8f1 Merge commit '0ac1fec1c3dacedabbf3dd4122ef4bf8523e688c'
* commit '0ac1fec1c3dacedabbf3dd4122ef4bf8523e688c':
  bitstream: Move VLC reading functions into the vlc.h header
  vlc: Add header #include when the types are used

This commit is a noop, see
https://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html

Merged-by: James Almer <jamrial@gmail.com>
2017-10-30 18:10:06 -03:00