ffmpeg.git
5 years agoMerge commit 'cf1f3d837e1266034a487de5b575bd76426c6b10'
Michael Niedermayer [Tue, 26 May 2015 18:49:13 +0000 (20:49 +0200)]
Merge commit 'cf1f3d837e1266034a487de5b575bd76426c6b10'

* commit 'cf1f3d837e1266034a487de5b575bd76426c6b10':
  doc: Fix spelling of 'Transmission'

See: 9898bd9a82ad16f7ef2dcc26542827ff92255821
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/matroskaenc: Avoid floats in default duration calculation
Michael Niedermayer [Tue, 26 May 2015 18:09:40 +0000 (20:09 +0200)]
avformat/matroskaenc: Avoid floats in default duration calculation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/ircamenc: Avoid floats
Michael Niedermayer [Tue, 26 May 2015 17:54:41 +0000 (19:54 +0200)]
avformat/ircamenc: Avoid floats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil: Add av_q2intfloat()
Michael Niedermayer [Sun, 24 May 2015 12:19:57 +0000 (14:19 +0200)]
avutil: Add av_q2intfloat()

This function allows writing AVRationals as IEEE floats without the need
of platform dependant float operations

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/movenc: Avoid floats & float rounding in tmcd nb_frames calculation
Michael Niedermayer [Tue, 26 May 2015 12:51:00 +0000 (14:51 +0200)]
avformat/movenc: Avoid floats & float rounding in tmcd nb_frames calculation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/asfdec: Avoid float usage in duration calculation
Michael Niedermayer [Tue, 26 May 2015 11:02:25 +0000 (13:02 +0200)]
avformat/asfdec: Avoid float usage in duration calculation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: Fix spelling of 'Transmission'
Sebastian Ramacher [Tue, 26 May 2015 02:37:13 +0000 (04:37 +0200)]
doc: Fix spelling of 'Transmission'

Signed-off-by: Sebastian Ramacher <sramacher@debian.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoavformat/mpegts: Avoid float in bitrate calculation
Michael Niedermayer [Tue, 26 May 2015 10:02:44 +0000 (12:02 +0200)]
avformat/mpegts: Avoid float in bitrate calculation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264: Fix HWACCEL_MAX for D3D11
Michael Niedermayer [Tue, 26 May 2015 03:08:32 +0000 (05:08 +0200)]
avcodec/h264: Fix HWACCEL_MAX for D3D11

Found-by: philipl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc: Fix HWACCEL_MAX for D3D11
Michael Niedermayer [Tue, 26 May 2015 03:08:32 +0000 (05:08 +0200)]
avcodec/hevc: Fix HWACCEL_MAX for D3D11

Found-by: philipl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dxva2_h264: Fix "may be used uninitialized" warnings
Michael Niedermayer [Tue, 26 May 2015 02:52:39 +0000 (04:52 +0200)]
avcodec/dxva2_h264: Fix "may be used uninitialized" warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vdpau: Re-factor pre-hwaccel helper functions into separate header
Philip Langdale [Mon, 25 May 2015 16:42:14 +0000 (09:42 -0700)]
avcodec/vdpau: Re-factor pre-hwaccel helper functions into separate header

h264.h and hevc.h are mutually exclusive due to defining some of the same
names. As such, we need to avoid forcing h264.h to be included if we want
hevc decode acceleration to be possible.

However, some of the pre-hwaccel helper functions need h264.h. To avoid
messy collisions, let's move the declaration of all those helpers to
a separate header which we will exclude for the hevc support (which will
be hwaccel-only).

Signed-off-by: Philip Langdale <philipl@overt.org>
5 years agoavcodec/dxva2: Fix "may be used uninitialized" warnings
Michael Niedermayer [Tue, 26 May 2015 02:40:04 +0000 (04:40 +0200)]
avcodec/dxva2: Fix "may be used uninitialized" warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: Check if ID3D11VideoDecoder exists, not just the header to enable d3d11va
Michael Niedermayer [Mon, 25 May 2015 22:14:58 +0000 (00:14 +0200)]
configure: Check if ID3D11VideoDecoder exists, not just the header to enable d3d11va

Fixes build with "mingw-w64-x86-64-dev 3.2.0-2"

Tested-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/x86/vf_fspp: Fix invalid combination of opcode and operands
Michael Niedermayer [Mon, 25 May 2015 23:37:39 +0000 (01:37 +0200)]
avfilter/x86/vf_fspp: Fix invalid combination of opcode and operands

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/dnxhd: Autodetect more files that can be decoded.
Carl Eugen Hoyos [Mon, 25 May 2015 22:28:12 +0000 (00:28 +0200)]
lavf/dnxhd: Autodetect more files that can be decoded.

5 years agomov: reject zero bytes_per_frame with non-zero samples_per_frame
Andreas Cadhalpun [Mon, 25 May 2015 15:17:39 +0000 (17:17 +0200)]
mov: reject zero bytes_per_frame with non-zero samples_per_frame

In this case the mov demuxer can return a large number of empty packets.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
5 years agoconfigure: d3d11va is auto-detected like the others
Michael Niedermayer [Mon, 25 May 2015 21:31:51 +0000 (23:31 +0200)]
configure: d3d11va is auto-detected like the others

Fix the help text accordingly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/riff: Add 0x729A as TwoCC for G.729.
Carl Eugen Hoyos [Mon, 25 May 2015 21:39:56 +0000 (23:39 +0200)]
lavf/riff: Add 0x729A as TwoCC for G.729.

Reported by forum user muchuan.

5 years agoavcodec/dxva2: Fix build without D3D11
Michael Niedermayer [Mon, 25 May 2015 20:24:40 +0000 (22:24 +0200)]
avcodec/dxva2: Fix build without D3D11

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772'
Michael Niedermayer [Mon, 25 May 2015 20:02:00 +0000 (22:02 +0200)]
Merge commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772'

* commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772':
  D3D11va: add a Direct3D11 video decoder similar to DXVA2

Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/dxva2_vc1.c
libavcodec/version.h
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoImprove upon dynamic arrays- movtext subtitles
Niklesh [Mon, 25 May 2015 17:16:04 +0000 (22:46 +0530)]
Improve upon dynamic arrays- movtext subtitles

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
5 years agolibshine: fix support for shine 3.0
Andreas Cadhalpun [Sun, 24 May 2015 13:44:31 +0000 (15:44 +0200)]
libshine: fix support for shine 3.0

shine_encode_buffer expects written to be an int pointer, while the
previous shine_encode_frame expected it to be a long pointer.

Thus encoding with libshine currently always fails with
"internal buffer too small", because a negative return value of
shine_encode_buffer is interpreted as a very large long value.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
5 years agoavcodec/mjpegenc_common: Use ff_mpv_reallocate_putbitbuffer()
Michael Niedermayer [Mon, 25 May 2015 12:35:35 +0000 (14:35 +0200)]
avcodec/mjpegenc_common: Use ff_mpv_reallocate_putbitbuffer()

Fixes assertion failure
Fixes Ticket4396

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo: Factor ff_mpv_reallocate_putbitbuffer() out
Michael Niedermayer [Mon, 25 May 2015 02:12:13 +0000 (04:12 +0200)]
avcodec/mpegvideo: Factor ff_mpv_reallocate_putbitbuffer() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rmenc: Avoid floats in duration calculation
Michael Niedermayer [Mon, 25 May 2015 11:00:14 +0000 (13:00 +0200)]
avformat/rmenc: Avoid floats in duration calculation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegenc: Replace *0.7 by *7/10
Michael Niedermayer [Mon, 25 May 2015 10:57:22 +0000 (12:57 +0200)]
avformat/mpegenc: Replace *0.7 by *7/10

This avoids another float computation, avoiding a potential source of
rounding issues

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegenc: Do not use floats for vcd_padding_bitrate
Michael Niedermayer [Mon, 25 May 2015 10:43:51 +0000 (12:43 +0200)]
avformat/mpegenc: Do not use floats for vcd_padding_bitrate

This reduces the risk for rounding differences.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg_opt: Set the video VBV parameters only for the video stream from -target
Michael Niedermayer [Mon, 25 May 2015 10:13:53 +0000 (12:13 +0200)]
ffmpeg_opt: Set the video VBV parameters only for the video stream from -target

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoD3D11va: add a Direct3D11 video decoder similar to DXVA2
Steve Lhomme [Mon, 11 May 2015 08:52:47 +0000 (10:52 +0200)]
D3D11va: add a Direct3D11 video decoder similar to DXVA2

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoavcodec/put_bits: Assert that size in set_put_bits_buffer_size() does not cause integ...
Michael Niedermayer [Mon, 25 May 2015 03:31:26 +0000 (05:31 +0200)]
avcodec/put_bits: Assert that size in set_put_bits_buffer_size() does not cause integer overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/bitstream: Assert that there is enough space left in avpriv_copy_bits()
Michael Niedermayer [Mon, 25 May 2015 01:48:45 +0000 (03:48 +0200)]
avcodec/bitstream: Assert that there is enough space left in avpriv_copy_bits()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/put_bits: Assert that there is enough space left in skip_put_bytes()
Michael Niedermayer [Mon, 25 May 2015 01:45:38 +0000 (03:45 +0200)]
avcodec/put_bits: Assert that there is enough space left in skip_put_bytes()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo_enc: Update the buffer size as more slices are merged
Michael Niedermayer [Mon, 25 May 2015 02:54:41 +0000 (04:54 +0200)]
avcodec/mpegvideo_enc: Update the buffer size as more slices are merged

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/put_bits: Update size_in_bits in set_put_bits_buffer_size()
Michael Niedermayer [Mon, 25 May 2015 02:53:09 +0000 (04:53 +0200)]
avcodec/put_bits: Update size_in_bits in set_put_bits_buffer_size()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mov: Mark avio context of decompressed atoms as seekable
Michael Niedermayer [Sun, 24 May 2015 23:26:55 +0000 (01:26 +0200)]
avformat/mov: Mark avio context of decompressed atoms as seekable

Fixes Ticket4329

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libutvideoenc: Fix memleak
Michael Niedermayer [Fri, 15 May 2015 21:53:24 +0000 (23:53 +0200)]
avcodec/libutvideoenc: Fix memleak

Fixes: CID1257657

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibdcadec: search for frames that start late in a packet
James Almer [Sun, 24 May 2015 04:24:32 +0000 (01:24 -0300)]
libdcadec: search for frames that start late in a packet

Based on commit 4ae15605f6298d8369a1f1374596b52a3839c703

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavcodec/ituh263enc: Pass PutBitContext into h263p_encode_umotion() instead of MpegEnc...
Michael Niedermayer [Sun, 24 May 2015 15:07:51 +0000 (17:07 +0200)]
avcodec/ituh263enc: Pass PutBitContext into h263p_encode_umotion() instead of MpegEncContext

This avoids the need to dereference MpegEncContext->pb if it is
already available outside h263p_encode_umotion()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: Pass PutBitContext into ff_h263_encode_motion() instead of MpegEncContext
Michael Niedermayer [Sun, 24 May 2015 15:07:51 +0000 (17:07 +0200)]
avcodec: Pass PutBitContext into ff_h263_encode_motion() instead of MpegEncContext

This avoids the need to dereference MpegEncContext->pb if it is
already available outside ff_h263_encode_motion()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h263: Remove unused argument of h263_get_motion_length()
Michael Niedermayer [Sun, 24 May 2015 14:58:55 +0000 (16:58 +0200)]
avcodec/h263: Remove unused argument of h263_get_motion_length()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpeg4video: Reorder operations to reduce accesses to err_recognition
Michael Niedermayer [Sun, 24 May 2015 13:03:45 +0000 (15:03 +0200)]
avcodec/mpeg4video: Reorder operations to reduce accesses to err_recognition

About 9 cpu cycle faster mpeg4_decode_mb()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomov: always check avio_read return value
Andreas Cadhalpun [Sat, 23 May 2015 21:45:44 +0000 (23:45 +0200)]
mov: always check avio_read return value

If avio_read fails, the buffer can contain uninitialized data.

This fixes 'Conditional jump or move depends on uninitialised value(s)'
valgrind warnings.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
5 years agomov: fix two memleaks
Andreas Cadhalpun [Sat, 23 May 2015 21:35:42 +0000 (23:35 +0200)]
mov: fix two memleaks

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
5 years agomov: abort on EOF in ff_mov_read_chan
Andreas Cadhalpun [Sat, 23 May 2015 21:32:12 +0000 (23:32 +0200)]
mov: abort on EOF in ff_mov_read_chan

Otherwise the loop can take a lot of time if num_descr is very large.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
5 years agoavformat/movenc: Remove float use from rgb_to_yuv()
Michael Niedermayer [Sun, 24 May 2015 10:46:06 +0000 (12:46 +0200)]
avformat/movenc: Remove float use from rgb_to_yuv()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/swfenc: Remove another unneeded float computation
Michael Niedermayer [Sun, 24 May 2015 10:38:54 +0000 (12:38 +0200)]
avformat/swfenc: Remove another unneeded float computation

fewer chances for rounding differences between platforms is better

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/swfenc: Remove unneeded floats
Michael Niedermayer [Sun, 24 May 2015 01:59:26 +0000 (03:59 +0200)]
avformat/swfenc: Remove unneeded floats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/avienc: Avoid float usage
Michael Niedermayer [Sat, 23 May 2015 20:46:51 +0000 (22:46 +0200)]
avformat/avienc: Avoid float usage

reduces risk for rounding differences between platforms

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/4xm: Change fps to AVRational
Michael Niedermayer [Sat, 23 May 2015 20:08:13 +0000 (22:08 +0200)]
avformat/4xm: Change fps to AVRational

This fixes the video timebase as well

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/y41pdec: Avoid using float for size test
Michael Niedermayer [Sat, 23 May 2015 19:27:10 +0000 (21:27 +0200)]
avcodec/y41pdec: Avoid using float for size test

Floats are not bitexact

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibwebp: simplify AVCodec.close functions
James Almer [Sat, 23 May 2015 17:24:34 +0000 (14:24 -0300)]
libwebp: simplify AVCodec.close functions

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoconfigure: simplify libwebp checks
James Almer [Sat, 23 May 2015 05:14:26 +0000 (02:14 -0300)]
configure: simplify libwebp checks

The libwebpmux pkg-config file already has an explicit dependecy on libwebp >= 0.2.0.
Also remove the warning and silently disable the anim encoder when libwebpmux is not new enough.
This is more in line with other library components, like libvpx-vp9

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agonutdec: fix various memleaks on failure
Andreas Cadhalpun [Fri, 22 May 2015 21:02:07 +0000 (23:02 +0200)]
nutdec: fix various memleaks on failure

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
5 years agoavcodec/dcadec: Search and decode frame in case it starts later in a packet
Michael Niedermayer [Sat, 23 May 2015 14:23:52 +0000 (16:23 +0200)]
avcodec/dcadec: Search and decode frame in case it starts later in a packet

This fixes decoding the first frame of some dts files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/wavdec: Increase dts packet threshold to fix more misdetections
Rodger Combs [Sat, 23 May 2015 12:07:14 +0000 (14:07 +0200)]
avformat/wavdec: Increase dts packet threshold to fix more misdetections

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/wavdec: Increase probe_packets limit
Michael Niedermayer [Sat, 23 May 2015 10:03:38 +0000 (12:03 +0200)]
avformat/wavdec: Increase probe_packets limit

Fixes DTS detection of b2429e5ba9.dts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agonutdec: always check the get_str return value
Andreas Cadhalpun [Fri, 22 May 2015 20:58:55 +0000 (22:58 +0200)]
nutdec: always check the get_str return value

If it fails, the buffers can be (partially) uninitialized.

This fixes 'Conditional jump or move depends on uninitialised value(s)'
valgrind warnings.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
5 years agolibwebp: use a separate AVClass for each encoder
James Almer [Sat, 23 May 2015 04:51:45 +0000 (01:51 -0300)]
libwebp: use a separate AVClass for each encoder

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agolibwebpenc_common: add header guards
James Almer [Sat, 23 May 2015 04:44:32 +0000 (01:44 -0300)]
libwebpenc_common: add header guards

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agolibwebp: remove unneeded defines
James Almer [Sat, 23 May 2015 04:28:44 +0000 (01:28 -0300)]
libwebp: remove unneeded defines

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoWebP encoder: use WebPAnimEncoder API when available.
Urvang Joshi [Wed, 20 May 2015 01:04:07 +0000 (18:04 -0700)]
WebP encoder: use WebPAnimEncoder API when available.

WebPAnimEncoder API is a combination of encoder (WebPEncoder) and muxer
(WebPMux). It performs several optimizations to make it more efficient
than the combination of WebPEncode() and native ffmpeg muxer.

When WebPAnimEncoder API is used:
- In the encoder layer: we use WebPAnimEncoderAdd() instead of
  WebPEncode().
- The muxer layer: works like a raw muxer.

On the other hand, when WebPAnimEncoder API isn't available, the old code is
used as it is:
- In the codec layer: WebPEncode is used to encode each frame
- In the muxer layer:  ffmpeg muxer is used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/nutdec: Check X in 2nd branch of index reading
Michael Niedermayer [Fri, 22 May 2015 22:23:05 +0000 (00:23 +0200)]
avformat/nutdec: Check X in 2nd branch of index reading

Prevents read of uninitialized variable

Based on patch by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4e17946f10d39eec6cc03fb249ae8147373141b6'
Michael Niedermayer [Fri, 22 May 2015 19:25:57 +0000 (21:25 +0200)]
Merge commit '4e17946f10d39eec6cc03fb249ae8147373141b6'

* commit '4e17946f10d39eec6cc03fb249ae8147373141b6':
  mpegvideo: Rework various functions not to use MpegEncContext directly

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2'
Michael Niedermayer [Fri, 22 May 2015 19:17:18 +0000 (21:17 +0200)]
Merge commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2'

* commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2':
  mpegvideo: Have ff_mpeg_ref_picture use AVCodecContext directly

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd528045558825f01472e9bee873f60c98d661e53'
Michael Niedermayer [Fri, 22 May 2015 18:57:30 +0000 (20:57 +0200)]
Merge commit 'd528045558825f01472e9bee873f60c98d661e53'

* commit 'd528045558825f01472e9bee873f60c98d661e53':
  mpegvideo: Have ff_mpeg_unref_picture use AVCodecContext directly

Conflicts:
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c

The memset is left in place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6f54dc43cee6b2f5d183acf98b32a3cf8be4a4fc'
Michael Niedermayer [Fri, 22 May 2015 18:49:04 +0000 (20:49 +0200)]
Merge commit '6f54dc43cee6b2f5d183acf98b32a3cf8be4a4fc'

* commit '6f54dc43cee6b2f5d183acf98b32a3cf8be4a4fc':
  mpegvideo: Drop stream_codec_tag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9c1db92ad372d4cd69e0490e691c56e4097cb193'
Michael Niedermayer [Fri, 22 May 2015 18:38:07 +0000 (20:38 +0200)]
Merge commit '9c1db92ad372d4cd69e0490e691c56e4097cb193'

* commit '9c1db92ad372d4cd69e0490e691c56e4097cb193':
  mpegvideo: Drop err_recognition

Conflicts:
libavcodec/h263dec.c
libavcodec/ituh263dec.c
libavcodec/mpeg4video.h
libavcodec/mpeg4videodec.c
libavcodec/msmpeg4dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42'
Michael Niedermayer [Fri, 22 May 2015 18:12:51 +0000 (20:12 +0200)]
Merge commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42'

* commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42':
  mpegvideo: Drop flags and flags2

Conflicts:
libavcodec/mpeg12dec.c
libavcodec/mpeg12enc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/ratecontrol.c
libavcodec/vc1_block.c
libavcodec/vc1_loopfilter.c
libavcodec/vc1_mc.c
libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/movtextdec: Add support for large boxes(>32 bit)
Niklesh [Thu, 21 May 2015 15:55:39 +0000 (21:25 +0530)]
avcodec/movtextdec: Add support for large boxes(>32 bit)

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
5 years agompegvideo: Rework various functions not to use MpegEncContext directly
Vittorio Giovara [Mon, 27 Apr 2015 21:09:21 +0000 (22:09 +0100)]
mpegvideo: Rework various functions not to use MpegEncContext directly

5 years agompegvideo: Have ff_mpeg_ref_picture use AVCodecContext directly
Vittorio Giovara [Mon, 27 Apr 2015 21:09:20 +0000 (22:09 +0100)]
mpegvideo: Have ff_mpeg_ref_picture use AVCodecContext directly

5 years agompegvideo: Have ff_mpeg_unref_picture use AVCodecContext directly
Vittorio Giovara [Mon, 27 Apr 2015 21:09:19 +0000 (22:09 +0100)]
mpegvideo: Have ff_mpeg_unref_picture use AVCodecContext directly

This skips setting the memory to 0 but allows for reuse on different
contextes. Oracle did not report any unsual activity because of it.

5 years agompegvideo: Drop stream_codec_tag
Vittorio Giovara [Mon, 27 Apr 2015 18:13:28 +0000 (19:13 +0100)]
mpegvideo: Drop stream_codec_tag

The field is unused.

5 years agompegvideo: Drop err_recognition
Vittorio Giovara [Mon, 27 Apr 2015 18:13:27 +0000 (19:13 +0100)]
mpegvideo: Drop err_recognition

It is just a duplicate of an AVCodecContext member so use it instead.

5 years agompegvideo: Drop flags and flags2
Vittorio Giovara [Mon, 27 Apr 2015 18:13:25 +0000 (19:13 +0100)]
mpegvideo: Drop flags and flags2

They are just duplicates of AVCodecContext members so use those instead.

5 years agoavformat/mxfenc: Add color siting element
Michael Niedermayer [Mon, 18 May 2015 23:11:09 +0000 (01:11 +0200)]
avformat/mxfenc: Add color siting element

Previous version Reviewed-by: tim nicholson <nichot20@yahoo.com>
Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavformat/mux: Add ff_choose_chroma_location()
Michael Niedermayer [Fri, 22 May 2015 11:42:24 +0000 (13:42 +0200)]
libavformat/mux: Add ff_choose_chroma_location()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpeg12dec: Fix chroma location
Michael Niedermayer [Fri, 22 May 2015 13:08:58 +0000 (15:08 +0200)]
avcodec/mpeg12dec: Fix chroma location

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/pixfmt: Clarify DV example comments for AVChromaLocation
Tim Nicholson [Fri, 22 May 2015 09:31:26 +0000 (10:31 +0100)]
avutil/pixfmt: Clarify DV example comments for AVChromaLocation

Signed-off-by: Tim Nicholson <tim.nicholson@bbc.co.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '29216d7fd14d1cec16821867d17c90b5c49e8c07'
Michael Niedermayer [Fri, 22 May 2015 09:52:21 +0000 (11:52 +0200)]
Merge commit '29216d7fd14d1cec16821867d17c90b5c49e8c07'

* commit '29216d7fd14d1cec16821867d17c90b5c49e8c07':
  tls: fix compilation when both gnutls and openssl are enabled

See: e91fbfd9cf17270d78c73add53fada4c217fdb5e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotls: fix compilation when both gnutls and openssl are enabled
James Almer [Fri, 22 May 2015 03:32:17 +0000 (00:32 -0300)]
tls: fix compilation when both gnutls and openssl are enabled

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agotls: fix compilation when both gnutls and openssl are enabled
James Almer [Fri, 22 May 2015 03:32:17 +0000 (00:32 -0300)]
tls: fix compilation when both gnutls and openssl are enabled

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoWebP encoder: extract out some methods into a separate helper library.
Urvang Joshi [Wed, 20 May 2015 00:39:54 +0000 (17:39 -0700)]
WebP encoder: extract out some methods into a separate helper library.

This is the 2nd patch in preparation for using WebPAnimEncoder API for encoding
and muxing WebP images.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '94599a6de3822b13c94096d764868128f388ba28'
Michael Niedermayer [Fri, 22 May 2015 00:49:34 +0000 (02:49 +0200)]
Merge commit '94599a6de3822b13c94096d764868128f388ba28'

* commit '94599a6de3822b13c94096d764868128f388ba28':
  tls: Remove all the local polling loops

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd13b124eaf452b267480074b2e6946538ed03a6e'
Michael Niedermayer [Fri, 22 May 2015 00:37:23 +0000 (02:37 +0200)]
Merge commit 'd13b124eaf452b267480074b2e6946538ed03a6e'

* commit 'd13b124eaf452b267480074b2e6946538ed03a6e':
  tls: Remove the nonblocking code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd15eec4d6bdfa3bd4c4b5b7dd2dbd699ba253d02'
Michael Niedermayer [Fri, 22 May 2015 00:28:22 +0000 (02:28 +0200)]
Merge commit 'd15eec4d6bdfa3bd4c4b5b7dd2dbd699ba253d02'

* commit 'd15eec4d6bdfa3bd4c4b5b7dd2dbd699ba253d02':
  tls: Use custom IO to read from the URLContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoWebP muxer: support a packet containing animated WebP.
Urvang Joshi [Wed, 20 May 2015 00:39:54 +0000 (17:39 -0700)]
WebP muxer: support a packet containing animated WebP.

This is the 1st patch in preparation for using WebPAnimEncoder API for encoding
and muxing WebP images.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotls: Remove all the local polling loops
Martin Storsjö [Thu, 10 Nov 2011 15:44:27 +0000 (17:44 +0200)]
tls: Remove all the local polling loops

These aren't necessary any longer.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agotls: Remove the nonblocking code
Martin Storsjö [Thu, 10 Nov 2011 15:35:39 +0000 (17:35 +0200)]
tls: Remove the nonblocking code

Since the underlying URLContext read functions are used,
they handle interruption, without having to handle it at
this level.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agotls: Use custom IO to read from the URLContext
Martin Storsjö [Thu, 10 Nov 2011 14:58:58 +0000 (16:58 +0200)]
tls: Use custom IO to read from the URLContext

This avoids hijacking the fd, by reading using the normal
URLContext functions instead. This allowing reading data that has
been buffered in the underlying URLContext.

This avoids using the libraries own send functions that can
cause SIGPIPE.

The fd is still used for polling the lowlevel socket, for
waiting for retries.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agodoc/ffmpeg: basic documentation for -copy/ignore_unknown
Michael Niedermayer [Thu, 21 May 2015 20:29:53 +0000 (22:29 +0200)]
doc/ffmpeg: basic documentation for -copy/ignore_unknown

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mov: check result of avio_seek
Zhang Rui [Thu, 21 May 2015 03:48:55 +0000 (11:48 +0800)]
avformat/mov: check result of avio_seek

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: Support copying unknown streams
Michael Niedermayer [Wed, 20 May 2015 22:34:41 +0000 (00:34 +0200)]
ffmpeg: Support copying unknown streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mips: loongson fix bugs in mathops optimization
周晓勇 [Thu, 21 May 2015 08:31:58 +0000 (16:31 +0800)]
avcodec/mips: loongson fix bugs in mathops optimization

the incorrect UMULH, ff_sqrt, MAC64 and MLS64 to be optimized later, delete them just for now.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/pixfmt: s/luma sample positions/horizontal luma sample positions/
Michael Niedermayer [Thu, 21 May 2015 10:48:16 +0000 (12:48 +0200)]
avutil/pixfmt: s/luma sample positions/horizontal luma sample positions/

Better to be explicit before someone thinks this could be the time axis ...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/pixfmt: make luma sample positions even more explicit in the AVChromaLocation...
Michael Niedermayer [Thu, 21 May 2015 10:44:23 +0000 (12:44 +0200)]
avutil/pixfmt: make luma sample positions even more explicit in the AVChromaLocation ASCII art

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/pixfmt: Clarify mpeg example comments for AVChromaLocation
Michael Niedermayer [Thu, 21 May 2015 10:40:29 +0000 (12:40 +0200)]
avutil/pixfmt: Clarify mpeg example comments for AVChromaLocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/pixfmt: clarify chroma location text further, as "first" is ambigous
Michael Niedermayer [Thu, 21 May 2015 10:35:22 +0000 (12:35 +0200)]
avutil/pixfmt: clarify chroma location text further, as "first" is ambigous

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/pixfmt: Clarify that the ASCII art describes the location of the first chroma...
Michael Niedermayer [Thu, 21 May 2015 10:18:31 +0000 (12:18 +0200)]
avutil/pixfmt: Clarify that the ASCII art describes the location of the first chroma sample of AVChromaLocation

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