ffmpeg.git
3 years agoMerge commit 'e85f6f7f8d037c0af0f294000718d9ba22753baa'
James Almer [Wed, 28 Sep 2016 16:22:00 +0000 (13:22 -0300)]
Merge commit 'e85f6f7f8d037c0af0f294000718d9ba22753baa'

* commit 'e85f6f7f8d037c0af0f294000718d9ba22753baa':
  lavc: allow using AVCodecContext.hw_frames_ctx for decoding

Conflicts:
    doc/APIchanges
    libavcodec/version.h

Merged-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit '40dd5166d2ba4f9035b93748840e408cd8be40e5'
James Almer [Wed, 28 Sep 2016 16:19:07 +0000 (13:19 -0300)]
Merge commit '40dd5166d2ba4f9035b93748840e408cd8be40e5'

* commit '40dd5166d2ba4f9035b93748840e408cd8be40e5':
  truemotion2rt: Use ff_set_dimensions

Merged-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit 'a8164323374e86ce5f93759230868c98356833a2'
James Almer [Wed, 28 Sep 2016 16:12:18 +0000 (13:12 -0300)]
Merge commit 'a8164323374e86ce5f93759230868c98356833a2'

* commit 'a8164323374e86ce5f93759230868c98356833a2':
  pixdesc: Add new SMPTE 431, 432, and 2085 color properties

Conflicts:
    libavcodec/options_table.h
    libavcodec/version.h
    libavutil/pixdesc.c
    libavutil/pixfmt.h
    libavutil/version.h

Merged-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit '5d560d38deca1e4705e6d3784d737363b9c830fe'
James Almer [Wed, 28 Sep 2016 16:09:26 +0000 (13:09 -0300)]
Merge commit '5d560d38deca1e4705e6d3784d737363b9c830fe'

* commit '5d560d38deca1e4705e6d3784d737363b9c830fe':
  pixfmt: Add ARIB STD-B76 color transfer characteristic

See 785038c92cc7fc1da437576382083246ca598fce

Conflicts:
    libavcodec/options_table.h
    libavcodec/version.h
    libavutil/pixdesc.c
    libavutil/version.h

Merged-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit '6ed0f70f97c882813199b3bafd724ceeb43659de'
James Almer [Wed, 28 Sep 2016 15:59:07 +0000 (12:59 -0300)]
Merge commit '6ed0f70f97c882813199b3bafd724ceeb43659de'

* commit '6ed0f70f97c882813199b3bafd724ceeb43659de':
  avconv: factor out initializing stream parameters for streamcopy

Conflicts:
    ffmpeg.c

Merged-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit '5fa255b65c7887cc913f097aed1b581fbf1a8745'
James Almer [Wed, 28 Sep 2016 15:57:58 +0000 (12:57 -0300)]
Merge commit '5fa255b65c7887cc913f097aed1b581fbf1a8745'

* commit '5fa255b65c7887cc913f097aed1b581fbf1a8745':
  avconv: initialize output framerate earlier

Skipping this for now. It's not needed until several committs ahead,
and should be carefully implemented.

Merged-by: James Almer <jamrial@gmail.com>
3 years agolavc/8bps: Fix 32bit output of 24bit video.
Carl Eugen Hoyos [Wed, 28 Sep 2016 15:49:39 +0000 (17:49 +0200)]
lavc/8bps: Fix 32bit output of 24bit video.

Regression since / partial revert of ba3bb53b

3 years agolavf/mpegtsenc: Set min PID for data pkt to 0x0010.
Sylvain Laurent [Sat, 24 Sep 2016 10:01:34 +0000 (12:01 +0200)]
lavf/mpegtsenc: Set min PID for data pkt to 0x0010.

Fixes ticket #1673.

3 years agoavcodec/nvenc: nicely align AVOptions
Timo Rothenpieler [Wed, 28 Sep 2016 14:08:09 +0000 (16:08 +0200)]
avcodec/nvenc: nicely align AVOptions

3 years agoavcodec/nvenc: Extended rate-control support as provided by SDK 7
Yogender Gupta [Sat, 24 Sep 2016 15:55:00 +0000 (17:55 +0200)]
avcodec/nvenc: Extended rate-control support as provided by SDK 7

Merged from libav commit by Yogender Gupta:
https://git.libav.org/?p=libav.git;a=commitdiff;h=70de2ea4261f860457a04e3d0c58c5543f403325

3 years agoavcodec/nvenc: add HEVC REXT profile
Timo Rothenpieler [Wed, 28 Sep 2016 12:21:03 +0000 (14:21 +0200)]
avcodec/nvenc: add HEVC REXT profile

3 years agoavcodec/nvenc: Make sure that enum and array index match
Timo Rothenpieler [Wed, 28 Sep 2016 11:52:47 +0000 (13:52 +0200)]
avcodec/nvenc: Make sure that enum and array index match

Based on libav commits by Luca Barbato and Yogender Gupta:
https://git.libav.org/?p=libav.git;a=commit;h=352741b5ead1543d775ccf6040f33023e4491186
https://git.libav.org/?p=libav.git;a=commit;h=e02e2515b24bfc37ede6ca1744696230be55e50b

3 years agoavformat/avidec: Check nb_streams in read_gab2_sub()
Michael Niedermayer [Wed, 28 Sep 2016 14:14:08 +0000 (16:14 +0200)]
avformat/avidec: Check nb_streams in read_gab2_sub()

Fixes null pointer dereference
Fixes: 1/null_point.avi

Found-by: 连一汉 <lianyihan@360.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/avidec: Remove ancient assert
Michael Niedermayer [Wed, 28 Sep 2016 13:47:12 +0000 (15:47 +0200)]
avformat/avidec: Remove ancient assert

This assert can with crafted files fail, a warning is already printed
for this case.

Fixes assertion failure
Fixes:1/assert.avi

Found-by: 连一汉 <lianyihan@360.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavc/qdm2: increase code clarity
Adriano Pallavicino [Tue, 27 Sep 2016 18:22:20 +0000 (20:22 +0200)]
lavc/qdm2: increase code clarity

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Josh de Kock <josh@itanimul.li>
3 years agolavc/movtextdec.c: Avoid infinite loop on invalid data.
Sasi Inguva [Wed, 28 Sep 2016 02:23:20 +0000 (19:23 -0700)]
lavc/movtextdec.c: Avoid infinite loop on invalid data.

Signed-off-by: Sasi Inguva <isasi@google.com>
3 years agoffprobe: don't use AVStream.codec to set decoder framerate
James Almer [Tue, 27 Sep 2016 01:56:52 +0000 (22:56 -0300)]
ffprobe: don't use AVStream.codec to set decoder framerate

Also don't set time_base. It's deprecated for decoding and avcodec_open2()
will overwrite it

Reviewed-by: Josh de Kock <josh@itanimul.li>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavformat/matroskadec: set AVCodecParameters.field_order on progressive video
James Almer [Tue, 27 Sep 2016 17:48:33 +0000 (14:48 -0300)]
avformat/matroskadec: set AVCodecParameters.field_order on progressive video

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavformat/matroskadec: retain error codes in matroska_resync() and matroska_read_packet()
Sophia Wang [Tue, 27 Sep 2016 19:00:29 +0000 (12:00 -0700)]
avformat/matroskadec: retain error codes in matroska_resync() and matroska_read_packet()

Signed-off-by: Sophia Wang <skw@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agodoc/filters: blend terminates on longest input
Mulvya [Sat, 24 Sep 2016 03:35:27 +0000 (09:05 +0530)]
doc/filters: blend terminates on longest input

Signed-off-by: Mulvya <mulvya@gmail.com>
Signed-off-by: Lou Logan <lou@lrcd.com>
3 years agoffmpeg: stop using AVStream.codec on stream copy
James Almer [Tue, 27 Sep 2016 13:10:44 +0000 (10:10 -0300)]
ffmpeg: stop using AVStream.codec on stream copy

This commit is based on commit 35c8580 from Anton Khirnov <anton@khirnov.net>
which was skipped in b8945c4.

The avcodec_copy_context() call in the encode path is left in place for now
as AVStream.codec is apparently still required even after porting ffmpeg to
the new bsf API.

Tested-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavformat: add av_stream_get_codec_timebase()
James Almer [Tue, 27 Sep 2016 13:07:14 +0000 (10:07 -0300)]
avformat: add av_stream_get_codec_timebase()

This will allow ffmpeg.c to stop using AVStream.codec in some cases

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoswr: Update version & APIChanges for swr_build_matrix()
Michael Niedermayer [Tue, 27 Sep 2016 13:26:13 +0000 (15:26 +0200)]
swr: Update version & APIChanges for swr_build_matrix()

Found-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoswresample: Add swr_build_matrix()
Michael Niedermayer [Wed, 17 Aug 2016 23:08:50 +0000 (01:08 +0200)]
swresample: Add swr_build_matrix()

API and Doxy documentation is taken from avresample_build_matrix()
Fixes: Ticket5780

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoswresample: Use double and float for matrixes for best quality and speed
Michael Niedermayer [Wed, 17 Aug 2016 23:07:32 +0000 (01:07 +0200)]
swresample: Use double and float for matrixes for best quality and speed

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agodoc: Mention -dn in the "Stream selection" paragraph.
Carl Eugen Hoyos [Tue, 27 Sep 2016 07:07:17 +0000 (09:07 +0200)]
doc: Mention -dn in the "Stream selection" paragraph.

There is no "Data options" paragraph.
Requested-by: ilker tezcan
3 years agoffprobe: don't access AVCodecContext.pkt_timebase directly
James Almer [Tue, 27 Sep 2016 01:45:39 +0000 (22:45 -0300)]
ffprobe: don't access AVCodecContext.pkt_timebase directly

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavcodec/ansi: Check dimensions
Michael Niedermayer [Mon, 26 Sep 2016 18:25:59 +0000 (20:25 +0200)]
avcodec/ansi: Check dimensions

Fixes: 1.avi

Found-by: 连一汉 <lianyihan@360.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/mpegvideo_enc: fix memory leak
Timo Rothenpieler [Sun, 25 Sep 2016 13:41:47 +0000 (15:41 +0200)]
avcodec/mpegvideo_enc: fix memory leak

When the input frames contain side data, it will accumulate endlessly in
the coded frame, as av_frame_copy_props will append any new side data.

Fixes ticket #5799.

3 years agolavf/movenc: Allow to disable writing the timecode track.
Carl Eugen Hoyos [Mon, 26 Sep 2016 06:50:48 +0000 (08:50 +0200)]
lavf/movenc: Allow to disable writing the timecode track.

Fixes ticket #5492.

3 years agoavcodec/hevc: Add YUV420P10 to vaapi hardware decode - permits hardware decoding...
Jean-Yves Simon [Tue, 9 Aug 2016 15:15:30 +0000 (17:15 +0200)]
avcodec/hevc: Add YUV420P10 to vaapi hardware decode - permits hardware decoding of HEVC Main 10 on AMD RX 480

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoffmpeg: fix memleak of bitstream filter context on failure
James Almer [Sat, 24 Sep 2016 18:03:42 +0000 (15:03 -0300)]
ffmpeg: fix memleak of bitstream filter context on failure

Increase the nb_bitstream_filters value as soon as the context is allocated, so
if option parsing fails the last context is actually freed.

Reviewed-by: Josh de Kock <josh@itanimul.li>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoffmpeg: fix memleak of encoder options AVDictionary on failure
James Almer [Sat, 24 Sep 2016 17:59:01 +0000 (14:59 -0300)]
ffmpeg: fix memleak of encoder options AVDictionary on failure

Reviewed-by: Josh de Kock <josh@itanimul.li>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavcodec/Makefile: Fix mlpenc dependencies
James Almer [Sun, 25 Sep 2016 19:12:18 +0000 (16:12 -0300)]
avcodec/Makefile: Fix mlpenc dependencies

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavformat/avidec: remove warning about deprecated declarations
James Almer [Sun, 25 Sep 2016 19:03:21 +0000 (16:03 -0300)]
avformat/avidec: remove warning about deprecated declarations

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agodoc/libav-merge: change gmane link to a ffmpeg.org one
Clément Bœsch [Sun, 25 Sep 2016 17:38:27 +0000 (19:38 +0200)]
doc/libav-merge: change gmane link to a ffmpeg.org one

3 years agodoc: move out merge script to tools
Clément Bœsch [Sun, 25 Sep 2016 17:26:39 +0000 (19:26 +0200)]
doc: move out merge script to tools

3 years agodoc: remove codecpar mention in libav-merge.txt
Clément Bœsch [Sun, 25 Sep 2016 17:17:39 +0000 (19:17 +0200)]
doc: remove codecpar mention in libav-merge.txt

3 years agoMerge commit '1e93c1e30ff0e8bf6094a426ca60f005e9cdaed3'
Clément Bœsch [Sun, 25 Sep 2016 17:15:44 +0000 (19:15 +0200)]
Merge commit '1e93c1e30ff0e8bf6094a426ca60f005e9cdaed3'

* commit '1e93c1e30ff0e8bf6094a426ca60f005e9cdaed3':
  avconv: do not set encoder options when streamcopy is used

This chunk was removed in 955b818cf947473ec94a3fe8aa7f408b119fbbc9
already.

Merged-by: Clément Bœsch <u@pkh.me>
3 years agolavd/sdl2: add sdl alias
Josh de Kock [Sun, 25 Sep 2016 11:55:16 +0000 (12:55 +0100)]
lavd/sdl2: add sdl alias

This commit also adds an sdl alias for the configure script.

3 years agolavd/sdl2: remove unused code
Josh de Kock [Sat, 24 Sep 2016 17:57:55 +0000 (18:57 +0100)]
lavd/sdl2: remove unused code

3 years agoavformat/avidec: Fix memleak with dv in avi
Michael Niedermayer [Sun, 25 Sep 2016 09:56:11 +0000 (11:56 +0200)]
avformat/avidec: Fix memleak with dv in avi

Found-by: 连一汉 <lianyihan@360.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoffmpeg: Fix bistream typos
Michael Niedermayer [Sun, 25 Sep 2016 01:29:07 +0000 (03:29 +0200)]
ffmpeg: Fix bistream typos

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec: fix vc1dsp dependencies
Xiaolei Yu [Sun, 25 Sep 2016 10:56:55 +0000 (18:56 +0800)]
avcodec: fix vc1dsp dependencies

3 years agolavf/utils: Avoid an overflow for huge negative durations.
Carl Eugen Hoyos [Sat, 24 Sep 2016 11:07:39 +0000 (13:07 +0200)]
lavf/utils: Avoid an overflow for huge negative durations.

Fixes ticket #5135.

3 years agoavcodec/nvenc: use AVERROR_BUFFER_TOO_SMALL instead of ENOBUFS
James Almer [Sat, 24 Sep 2016 18:31:00 +0000 (15:31 -0300)]
avcodec/nvenc: use AVERROR_BUFFER_TOO_SMALL instead of ENOBUFS

Should fix compilation with mingw32

Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavfilter/tests/integral: Remove unused variables
Michael Niedermayer [Sat, 24 Sep 2016 17:31:55 +0000 (19:31 +0200)]
avfilter/tests/integral: Remove unused variables

Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoffmpeg: switch to the new BSF API
Clément Bœsch [Wed, 21 Sep 2016 13:39:16 +0000 (15:39 +0200)]
ffmpeg: switch to the new BSF API

This commit is initially largely based on commit 4426540 from Anton
Khirnov <anton@khirnov.net> and two following fixes (80fb19b and
fe7b21c) which were previously skipped respectively in 98e3153, c9ee36e,
and 7fe7cdc.

mpeg4-bsf-unpack-bframes FATE reference is updated because the bsf
filter now actually fixes the extradata (mpeg4_unpack_bframes_init()
changing one byte is now honored on the output extradata).

The FATE references for remove_extra change because the packet flags
were wrong and the keyframes weren't marked, causing the bsf relying on
these proprieties to not actually work as intended.

The following was fixed by James Almer:

The filter option arguments are now also parsed correctly.

A hack to propagate extradata changed by bitstream filters after the
first av_bsf_receive_packet() call is added to maintain the current
behavior. This was previously done by av_bitstream_filter_filter() and
is needed for the aac_adtstoasc bsf.

The exit_on_error was not being checked anymore, and led to an exit
error in the last frame of h264_mp4toannexb test. Restoring this
behaviour prevents erroring out. The test is still changed as a result
due to the badly filtered frame now not being written after the failure.

Signed-off-by: Clément Bœsch <u@pkh.me>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agolavd/sdl2: Fix 32bit rgb formats on little-endian hardware.
Carl Eugen Hoyos [Sat, 24 Sep 2016 16:56:40 +0000 (18:56 +0200)]
lavd/sdl2: Fix 32bit rgb formats on little-endian hardware.

3 years agolavd/sdl2: Move unsupported formats SDL_PIXELFORMAT_xxx888 updwards.
Carl Eugen Hoyos [Sat, 24 Sep 2016 16:35:15 +0000 (18:35 +0200)]
lavd/sdl2: Move unsupported formats SDL_PIXELFORMAT_xxx888 updwards.

There is a paragraph for unsupported SDL formats.

3 years agolavf/aacdec: Do not autodetect a single frame inside the file.
Carl Eugen Hoyos [Sat, 24 Sep 2016 13:09:27 +0000 (15:09 +0200)]
lavf/aacdec: Do not autodetect a single frame inside the file.

3 years agolavd: drop SDL1 device and SDL1 support
Josh de Kock [Thu, 22 Sep 2016 18:20:24 +0000 (19:20 +0100)]
lavd: drop SDL1 device and SDL1 support

Signed-off-by: Josh de Kock <josh@itanimul.li>
3 years agoffplay: add SDL2 support
Marton Balint [Tue, 23 Feb 2016 20:43:41 +0000 (20:43 +0000)]
ffplay: add SDL2 support

This commit also drops SDL1 support for ffplay.

Tested-by: James Almer <jamrial@gmail.com> (Windows, mingw-w64)
Signed-off-by: Josh de Kock <josh@itanimul.li>
3 years agolavd/opengl: use SDL2
Lukasz Marek [Sun, 18 Sep 2016 17:13:12 +0000 (19:13 +0200)]
lavd/opengl: use SDL2

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Josh de Kock <josh@itanimul.li>
3 years agoMAINTAINERS: update my entries
Josh de Kock [Wed, 14 Sep 2016 21:43:33 +0000 (22:43 +0100)]
MAINTAINERS: update my entries

Acked-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Josh de Kock <josh@itanimul.li>
3 years agolavd: Add SDL2 output device
Josh de Kock [Wed, 24 Feb 2016 23:31:02 +0000 (23:31 +0000)]
lavd: Add SDL2 output device

Acked-by: Michael Niedermayer
Signed-off-by: Josh de Kock <josh@itanimul.li>
3 years agolavfi: add nlmeans filter
Clément Bœsch [Wed, 30 Sep 2015 18:29:30 +0000 (20:29 +0200)]
lavfi: add nlmeans filter

Fixes Ticket #4910

3 years agoavformat/hls: Fix handling of EXT-X-BYTERANGE streams over 2GB
Anssi Hannula [Sat, 24 Sep 2016 06:29:03 +0000 (09:29 +0300)]
avformat/hls: Fix handling of EXT-X-BYTERANGE streams over 2GB

Replace uses of atoi() with strtoll() when trying to read values into
int64_t variables.

Fixes Kodi trac #16926:
http://trac.kodi.tv/ticket/16926

3 years agoavformat/hlsenc: refine EXT-X-BYTERANGE support for segments
Steven Liu [Sun, 18 Sep 2016 23:00:42 +0000 (07:00 +0800)]
avformat/hlsenc: refine EXT-X-BYTERANGE support for segments

refine EXT-X-BYTERANGE tag,
the spec link:
https://tools.ietf.org/html/draft-pantos-http-live-streaming-19#section-4.3.2.2
the apple doc:
https://developer.apple.com/library/ios/technotes/tn2288/_index.html#
//apple_ref/doc/uid/DTS40012238-CH1-BYTE_RANGE_SUPPORT_FOR_SEGMENTS

command line:
./ffmpeg -i ~/Movies/objectC/a.mp4 -c copy -f hls -hls_time 7
 -hls_list_size 0 -hls_segment_size 2500000 -t 40 output-test.m3u8
output:
localhost:ffmpeg liuqi$ ll *.ts ;cat output-test.m3u8
 -rw-r--r--  1 liuqi  staff  2792176  9 12 14:44 output-test0.ts
 -rw-r--r--  1 liuqi  staff  3112528  9 12 14:44 output-test3.ts
 -rw-r--r--  1 liuqi  staff  3377420  9 12 14:44 output-test6.ts
 -rw-r--r--  1 liuqi  staff  1228016  9 12 14:44 output-test7.ts
 #EXTM3U
 #EXT-X-VERSION:4
 #EXT-X-TARGETDURATION:10
 #EXT-X-MEDIA-SEQUENCE:0
 #EXTINF:9.021000,
 #EXT-X-BYTERANGE:1334988@0
 output-test0.ts
 #EXTINF:3.000000,
 #EXT-X-BYTERANGE:721356@1334988
 output-test0.ts
 #EXTINF:3.000000,
 #EXT-X-BYTERANGE:735832@2056344
 output-test0.ts
 #EXTINF:6.000000,
 #EXT-X-BYTERANGE:1645940@0
 output-test3.ts
 #EXTINF:3.000000,
 #EXT-X-BYTERANGE:715152@1645940
 output-test3.ts
 #EXTINF:3.000000,
 #EXT-X-BYTERANGE:751436@2361092
 output-test3.ts
 #EXTINF:9.000000,
 #EXT-X-BYTERANGE:3377420@0
 output-test6.ts
 #EXTINF:3.960000,
 #EXT-X-BYTERANGE:1228016@0
 output-test7.ts
 #EXT-X-ENDLIST
 localhost:ffmpeg liuqi$

 ticket-id: #5839

Signed-off-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoffprobe.c: Indicate decode-but-discard packets when doing -show_packets.
Sasi Inguva [Thu, 15 Sep 2016 20:36:19 +0000 (13:36 -0700)]
ffprobe.c: Indicate decode-but-discard packets when doing -show_packets.

Signed-off-by: Sasi Inguva <isasi@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agofate: add Test for h264_mp4toannexb (ticket2991)
Michael Niedermayer [Fri, 23 Sep 2016 19:25:32 +0000 (21:25 +0200)]
fate: add Test for h264_mp4toannexb (ticket2991)

3 years agoavcodec/cavsdsp: use av_clip_uint8() for idct
Michael Niedermayer [Mon, 19 Sep 2016 13:25:38 +0000 (15:25 +0200)]
avcodec/cavsdsp: use av_clip_uint8() for idct

Fixes out of array read
Fixes: 1.swf

Found-by: 连一汉 <lianyihan@360.cn>
Tested-by: 连一汉 <lianyihan@360.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/remove_extradata_bsf: Fix AVoption parameter max value
James Almer [Fri, 23 Sep 2016 14:13:48 +0000 (16:13 +0200)]
avcodec/remove_extradata_bsf: Fix AVoption parameter max value

3 years agotests/fate/ffmpeg: Remove dead automatic remove extradata test update the keyframe...
Michael Niedermayer [Fri, 23 Sep 2016 14:26:56 +0000 (16:26 +0200)]
tests/fate/ffmpeg: Remove dead automatic remove extradata test update the keyframe test

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agox86/h264_weight: use appropriate register size for weight parameters
Hendrik Leppkes [Fri, 23 Sep 2016 07:52:48 +0000 (09:52 +0200)]
x86/h264_weight: use appropriate register size for weight parameters

Fixes trac 5579

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Acked-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agotests/fate: Add fate-ffmpeg-bsf-remove-* tests
Michael Niedermayer [Fri, 23 Sep 2016 10:57:33 +0000 (12:57 +0200)]
tests/fate: Add fate-ffmpeg-bsf-remove-* tests

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agocompat/cuda: convert to unix line endings
Timo Rothenpieler [Fri, 23 Sep 2016 09:43:00 +0000 (11:43 +0200)]
compat/cuda: convert to unix line endings

3 years agoavcodec/cuvid: mark as avoid for probing
Timo Rothenpieler [Thu, 22 Sep 2016 10:10:31 +0000 (12:10 +0200)]
avcodec/cuvid: mark as avoid for probing

3 years agoavformat/utils: avoid using marked decoders for probing
Timo Rothenpieler [Thu, 22 Sep 2016 10:10:15 +0000 (12:10 +0200)]
avformat/utils: avoid using marked decoders for probing

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec: add new AVOID_PROBING capability
Timo Rothenpieler [Thu, 22 Sep 2016 10:09:26 +0000 (12:09 +0200)]
avcodec: add new AVOID_PROBING capability

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agofate: update fate-source reference file
James Almer [Fri, 23 Sep 2016 02:55:31 +0000 (23:55 -0300)]
fate: update fate-source reference file

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavcodec/h264: Use ptrdiff_t for (bi)weight functions
Michael Niedermayer [Wed, 21 Sep 2016 01:34:51 +0000 (03:34 +0200)]
avcodec/h264: Use ptrdiff_t for (bi)weight functions

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agocuvid: Pass bit depth information to decoder
Philip Langdale [Sat, 3 Sep 2016 19:52:52 +0000 (12:52 -0700)]
cuvid: Pass bit depth information to decoder

Although cuvid can only output 8bit, it can consume HEVC Main10 if
the bit depth is set properly. In cases where >8bit is not supported,
this change is still beneficial as the decoder will fail to be
created instead of plowing throw and decoding as 8bit.

3 years agocuvid: Use bundled headers
Philip Langdale [Wed, 21 Sep 2016 04:36:00 +0000 (21:36 -0700)]
cuvid: Use bundled headers

We need to remove the dynlink fanciness and replace it with normal
function prototypes and update the include paths and configure logic.

We don't need to explicitly check for PICPARMS now - they're going
to be there.

3 years agocuvid: Add MIT licenced nvcuid headers from Video SDK 7.0
Philip Langdale [Wed, 21 Sep 2016 04:28:15 +0000 (21:28 -0700)]
cuvid: Add MIT licenced nvcuid headers from Video SDK 7.0

For unknown reasons, the only accurately descriptive version of
cuviddec.h is in the Video SDK - the one in CUDA 7.5 lacks vp8
PICPARAMS and the vp9 struct definition is inaccurate. The CUDA 8 RC
includes an ancient version of this file from many many years go.

However, the one in the Video SDK is modified to work through a
dynamic link mechanism which we don't really want to use, so the
next change will modify the files to just declare functions in
the normal way.

I've split the changes so it's clear to see what changed between
the original files and ones that work for us.

3 years agoavformat/movenc: write pasp atom even if sar.num == sar.den
Paul B Mahol [Tue, 20 Sep 2016 12:48:44 +0000 (14:48 +0200)]
avformat/movenc: write pasp atom even if sar.num == sar.den

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavformat/utils: force native h264 decoder for probing
Timo Rothenpieler [Wed, 21 Sep 2016 17:00:46 +0000 (19:00 +0200)]
avformat/utils: force native h264 decoder for probing

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavc/avpacket: Fix undefined behaviour, do not pass a null pointer to memcpy().
Carl Eugen Hoyos [Wed, 21 Sep 2016 23:03:55 +0000 (01:03 +0200)]
lavc/avpacket: Fix undefined behaviour, do not pass a null pointer to memcpy().

Fixes ticket #5857.

3 years agocrystalhd: Use up-to-date bsf API
Philip Langdale [Sun, 18 Sep 2016 19:43:25 +0000 (12:43 -0700)]
crystalhd: Use up-to-date bsf API

Although the old API is supposed to be functional, the crystalhd
decoder is currently not working for non-annex.b h.264 content.

So, let's update to the modern API and make it work again.

Signed-off-by: Philip Langdale <philipl@overt.org>
3 years agoavcodec/cuvid: add support for hardware deinterlacing
Timo Rothenpieler [Sun, 18 Sep 2016 00:42:52 +0000 (02:42 +0200)]
avcodec/cuvid: add support for hardware deinterlacing

Currently does not work with the ffmpeg cli tool, due do it using the
old one in one out API.
Anything using the new API, like mpv, can make use of it, provided it is
prepared for a decoder modifying the framerate and outputing multiple
frames per input. FFmpeg itself is not.

3 years agoavcodec/cuvid: implement new send_packet/receive_frame api
Timo Rothenpieler [Sat, 17 Sep 2016 22:52:10 +0000 (00:52 +0200)]
avcodec/cuvid: implement new send_packet/receive_frame api

3 years agoavcodec/mlz: Check output chars before using it
Michael Niedermayer [Thu, 8 Sep 2016 17:55:24 +0000 (19:55 +0200)]
avcodec/mlz: Check output chars before using it

Fixes hypothetical integer overflow

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/mlz: Remove 'l' postfixes from numbers
Michael Niedermayer [Fri, 26 Aug 2016 21:27:08 +0000 (23:27 +0200)]
avcodec/mlz: Remove 'l' postfixes from numbers

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoffmpeg: switch to codecpar
Clément Bœsch [Thu, 1 Sep 2016 14:48:45 +0000 (16:48 +0200)]
ffmpeg: switch to codecpar

This commit is largely based on commit 15e84ed3 from Anton Khirnov
<anton@khirnov.net> which was previously skipped in bbf5ef9d.

There are still a bunch of things raising codecpar related warnings that
need fixing, such as:
- the use of codec->debug in the interactive debug mode
- read_ffserver_streams(): it's probably broken now but there is no test
- lowres stuff
- codec copy apparently required by bitstream filters

The matroska references are updated because they now properly forward
the field_order (previously unknown, now progressive).

Thanks to James Almer for fixing a bunch of FATE issues in this commit.

Signed-off-by: Clément Bœsch <clement@stupeflix.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavcodec/on2avc: add 0x500 stereo support and improve 0x500 mono support
Paul B Mahol [Wed, 21 Sep 2016 12:25:50 +0000 (14:25 +0200)]
avcodec/on2avc: add 0x500 stereo support and improve 0x500 mono support

0x500 can be stereo.
0x500 mono can use extended window types.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavcodec/dds: add support for 4bpp format
Paul B Mahol [Wed, 21 Sep 2016 11:40:04 +0000 (13:40 +0200)]
avcodec/dds: add support for 4bpp format

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavfilter/drawutils: allow drawing opaque text on transparent background
Paul B Mahol [Tue, 13 Sep 2016 23:37:13 +0000 (01:37 +0200)]
avfilter/drawutils: allow drawing opaque text on transparent background

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agotest/fate: add multi component mxf test
Mark Reid [Sun, 18 Sep 2016 21:11:35 +0000 (14:11 -0700)]
test/fate: add multi component mxf test

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/mxfdec: use first valid sourceclip found if material track has multiple...
Mark Reid [Sun, 18 Sep 2016 21:11:34 +0000 (14:11 -0700)]
avformat/mxfdec: use first valid sourceclip found if material track has multiple components

This commit fixes a issue with mxf footage having multiple
components on a material track.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/avrndec: Remove obsolete FIXME
Michael Niedermayer [Tue, 20 Sep 2016 11:44:01 +0000 (13:44 +0200)]
avcodec/avrndec: Remove obsolete FIXME

This FIXME probably meant to suggest to use a AVFrame that no longer
exists in the context.

Found-by: durandal117
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agofate: add aac_adtstoasc test (Ticket 3715)
Michael Niedermayer [Tue, 20 Sep 2016 13:26:03 +0000 (15:26 +0200)]
fate: add aac_adtstoasc test (Ticket 3715)

3 years agofate: Add rgb24-mkv test
Michael Niedermayer [Tue, 20 Sep 2016 03:21:51 +0000 (05:21 +0200)]
fate: Add rgb24-mkv test

3 years agolavc/rscc: Support pal8 in rscc.
Carl Eugen Hoyos [Mon, 19 Sep 2016 21:26:06 +0000 (23:26 +0200)]
lavc/rscc: Support pal8 in rscc.

Fixes the colours of the sample for ticket #5611.

3 years agodoc/encoders: minor aac encoder formatting improvements
Moritz Barsnick [Sun, 18 Sep 2016 21:51:48 +0000 (23:51 +0200)]
doc/encoders: minor aac encoder formatting improvements

Also corrected a line's level.

Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
3 years agolavf/mov: Add support for edit list parsing.
Sasi Inguva [Mon, 19 Sep 2016 05:09:03 +0000 (22:09 -0700)]
lavf/mov: Add support for edit list parsing.

Signed-off-by: Sasi Inguva <isasi@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/utils: If using discard frame flag, ignore skip_samples set by the decoder
Sasi Inguva [Mon, 19 Sep 2016 05:09:03 +0000 (22:09 -0700)]
avcodec/utils: If using discard frame flag, ignore skip_samples set by the decoder

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavf/utils: Support av_index_search_timestamp in case of AVIndexEntry with discarded...
Sasi Inguva [Thu, 15 Sep 2016 20:36:18 +0000 (13:36 -0700)]
lavf/utils: Support av_index_search_timestamp in case of AVIndexEntry with discarded packets.

Signed-off-by: Sasi Inguva <isasi@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavc: Add a flag in AVPacket to discard packet after decoding. Discard frames after...
Sasi Inguva [Thu, 15 Sep 2016 20:36:16 +0000 (13:36 -0700)]
lavc: Add a flag in AVPacket to discard packet after decoding. Discard frames after decoding based on the flag.

Signed-off-by: Sasi Inguva <isasi@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/avframe.h: Add a flag in AVIndexEntry to discard frame after decoding.
Sasi Inguva [Thu, 15 Sep 2016 20:36:15 +0000 (13:36 -0700)]
avformat/avframe.h: Add a flag in AVIndexEntry to discard frame after decoding.

Signed-off-by: Sasi Inguva <isasi@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavutil/frame: Add a flag to discard frame after decode.
Sasi Inguva [Thu, 15 Sep 2016 20:36:14 +0000 (13:36 -0700)]
avutil/frame: Add a flag to discard frame after decode.

Signed-off-by: Sasi Inguva <isasi@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>