summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avformat/avidec: Check nb_streams in read_gab2_sub()Michael Niedermayer2016-09-281-0/+2
| | | | | | | | Fixes null pointer dereference Fixes: 1/null_point.avi Found-by: 连一汉 <lianyihan@360.cn> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/avidec: Remove ancient assertMichael Niedermayer2016-09-281-1/+0
| | | | | | | | | | | 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>
* lavc/qdm2: increase code clarityAdriano Pallavicino2016-09-281-58/+59
| | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Josh de Kock <josh@itanimul.li>
* lavc/movtextdec.c: Avoid infinite loop on invalid data.Sasi Inguva2016-09-271-0/+4
| | | | Signed-off-by: Sasi Inguva <isasi@google.com>
* ffprobe: don't use AVStream.codec to set decoder framerateJames Almer2016-09-271-4/+1
| | | | | | | | 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>
* avformat/matroskadec: set AVCodecParameters.field_order on progressive videoJames Almer2016-09-271-0/+2
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/matroskadec: retain error codes in matroska_resync() and ↵Sophia Wang2016-09-281-6/+9
| | | | | | | matroska_read_packet() Signed-off-by: Sophia Wang <skw@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* doc/filters: blend terminates on longest inputMulvya2016-09-271-1/+1
| | | | | Signed-off-by: Mulvya <mulvya@gmail.com> Signed-off-by: Lou Logan <lou@lrcd.com>
* ffmpeg: stop using AVStream.codec on stream copyJames Almer2016-09-273-13/+16
| | | | | | | | | | | | 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>
* avformat: add av_stream_get_codec_timebase()James Almer2016-09-274-1/+23
| | | | | | This will allow ffmpeg.c to stop using AVStream.codec in some cases Signed-off-by: James Almer <jamrial@gmail.com>
* swr: Update version & APIChanges for swr_build_matrix()Michael Niedermayer2016-09-272-1/+4
| | | | | Found-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swresample: Add swr_build_matrix()Michael Niedermayer2016-09-272-71/+117
| | | | | | | API and Doxy documentation is taken from avresample_build_matrix() Fixes: Ticket5780 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swresample: Use double and float for matrixes for best quality and speedMichael Niedermayer2016-09-272-2/+12
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* doc: Mention -dn in the "Stream selection" paragraph.Carl Eugen Hoyos2016-09-271-1/+1
| | | | | There is no "Data options" paragraph. Requested-by: ilker tezcan
* ffprobe: don't access AVCodecContext.pkt_timebase directlyJames Almer2016-09-261-1/+1
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/ansi: Check dimensionsMichael Niedermayer2016-09-261-0/+3
| | | | | | | Fixes: 1.avi Found-by: 连一汉 <lianyihan@360.cn> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mpegvideo_enc: fix memory leakTimo Rothenpieler2016-09-261-0/+1
| | | | | | | 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.
* lavf/movenc: Allow to disable writing the timecode track.Carl Eugen Hoyos2016-09-263-2/+8
| | | | Fixes ticket #5492.
* avcodec/hevc: Add YUV420P10 to vaapi hardware decode - permits hardware ↵Jean-Yves Simon2016-09-261-0/+3
| | | | | | decoding of HEVC Main 10 on AMD RX 480 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: fix memleak of bitstream filter context on failureJames Almer2016-09-251-4/+4
| | | | | | | | 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>
* ffmpeg: fix memleak of encoder options AVDictionary on failureJames Almer2016-09-251-0/+1
| | | | | Reviewed-by: Josh de Kock <josh@itanimul.li> Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/Makefile: Fix mlpenc dependenciesJames Almer2016-09-251-1/+1
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/avidec: remove warning about deprecated declarationsJames Almer2016-09-251-0/+4
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* doc/libav-merge: change gmane link to a ffmpeg.org oneClément Bœsch2016-09-251-1/+1
|
* doc: move out merge script to toolsClément Bœsch2016-09-252-31/+27
|
* doc: remove codecpar mention in libav-merge.txtClément Bœsch2016-09-251-1/+0
|
* Merge commit '1e93c1e30ff0e8bf6094a426ca60f005e9cdaed3'Clément Bœsch2016-09-250-0/+0
|\ | | | | | | | | | | | | | | | | | | * 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>
| * avconv: do not set encoder options when streamcopy is usedAnton Khirnov2016-06-211-4/+0
| |
* | lavd/sdl2: add sdl aliasJosh de Kock2016-09-252-1/+3
| | | | | | | | This commit also adds an sdl alias for the configure script.
* | lavd/sdl2: remove unused codeJosh de Kock2016-09-251-22/+5
| |
* | avformat/avidec: Fix memleak with dv in aviMichael Niedermayer2016-09-251-0/+4
| | | | | | | | | | Found-by: 连一汉 <lianyihan@360.cn> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: Fix bistream typosMichael Niedermayer2016-09-252-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec: fix vc1dsp dependenciesXiaolei Yu2016-09-253-3/+3
| |
* | lavf/utils: Avoid an overflow for huge negative durations.Carl Eugen Hoyos2016-09-241-1/+1
| | | | | | | | Fixes ticket #5135.
* | avcodec/nvenc: use AVERROR_BUFFER_TOO_SMALL instead of ENOBUFSJames Almer2016-09-241-1/+1
| | | | | | | | | | | | | | Should fix compilation with mingw32 Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org> Signed-off-by: James Almer <jamrial@gmail.com>
* | avfilter/tests/integral: Remove unused variablesMichael Niedermayer2016-09-241-2/+0
| | | | | | | | | | Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: switch to the new BSF APIClément Bœsch2016-09-248-119/+237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | lavd/sdl2: Fix 32bit rgb formats on little-endian hardware.Carl Eugen Hoyos2016-09-241-8/+13
| |
* | lavd/sdl2: Move unsupported formats SDL_PIXELFORMAT_xxx888 updwards.Carl Eugen Hoyos2016-09-241-2/+2
| | | | | | | | There is a paragraph for unsupported SDL formats.
* | lavf/aacdec: Do not autodetect a single frame inside the file.Carl Eugen Hoyos2016-09-241-1/+1
| |
* | lavd: drop SDL1 device and SDL1 supportJosh de Kock2016-09-245-411/+2
| | | | | | | | Signed-off-by: Josh de Kock <josh@itanimul.li>
* | ffplay: add SDL2 supportMarton Balint2016-09-243-351/+250
| | | | | | | | | | | | | | 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>
* | lavd/opengl: use SDL2Lukasz Marek2016-09-241-60/+49
| | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Josh de Kock <josh@itanimul.li>
* | MAINTAINERS: update my entriesJosh de Kock2016-09-241-0/+1
| | | | | | | | | | Acked-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Josh de Kock <josh@itanimul.li>
* | lavd: Add SDL2 output deviceJosh de Kock2016-09-245-1/+407
| | | | | | | | | | Acked-by: Michael Niedermayer Signed-off-by: Josh de Kock <josh@itanimul.li>
* | lavfi: add nlmeans filterClément Bœsch2016-09-247-2/+683
| | | | | | | | Fixes Ticket #4910
* | avformat/hls: Fix handling of EXT-X-BYTERANGE streams over 2GBAnssi Hannula2016-09-241-5/+5
| | | | | | | | | | | | | | | | 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
* | avformat/hlsenc: refine EXT-X-BYTERANGE support for segmentsSteven Liu2016-09-241-3/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | ffprobe.c: Indicate decode-but-discard packets when doing -show_packets.Sasi Inguva2016-09-2313-441/+442
| | | | | | | | | | Signed-off-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fate: add Test for h264_mp4toannexb (ticket2991)Michael Niedermayer2016-09-232-0/+132
| |
OpenPOWER on IntegriCloud