ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 13:26:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
83,182 Commits 36 Branches 398 Tags 544 MiB
5f2b360fc0
Commit Graph

83182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
5f2b360fc0 avfilter/avfiltergraph: Add assert to write down in machine readable form what is assumed about sample rates in swap_samplerates_on_filter() 
Fixes CID1397292

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-01-21 01:35:52 +01:00
Matthieu Bouron
cf3affabb4 lavc/h264dec: re-indent after previous commit 2017-01-20 17:29:09 +01:00
Matthieu Bouron
639e262971 lavc/h264dec: make sure a slice is decoded before finishing setup 
Fixes regression in fate-h264-attachment-631 with THREADS=8 introduced
by bdbbb8f11e.
 2017-01-20 17:28:40 +01:00
Paul B Mahol
8869f5efec avformat/wavdec: enable seeking with XMA2 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-01-20 13:58:41 +01:00
Paul B Mahol
18cfcc6458 avcodec/wmaprodec: add xma_flush for seeking in XMA2 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-01-20 13:58:41 +01:00
Paul B Mahol
5d2609929d avcodec: add XMA2 parser 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-01-20 13:58:41 +01:00
Paul B Mahol
96fe4432f5 avcodec/wmaprodec: unbreak XMA mono decoding 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-01-20 13:58:36 +01:00
bnnm
cab0f3abc5 avcodec/atrac3: allow 6 channels (non-joint stereo) 
Raises max channels to 6 (for non joint-stereo only),
there is no difference decoding 1 or N discrete channels.
Fixes trac issue #5840

Signed-off-by: bnnm <bananaman255@gmail.com>
 2017-01-20 12:53:57 +01:00
Daniil Cherednik
9a619bef54 dcaenc: Use Huffman codes for Bit Allocation Index 
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2017-01-20 10:03:46 +00:00
Timo Rothenpieler
6b0a3ee6f8 avcodec/nvenc: add logging for more error cases 2017-01-20 10:29:36 +01:00
Timo Rothenpieler
5403d90f32 avcodec/nvenc: make gpu indices independend of supported capabilities 2017-01-20 10:29:36 +01:00
Steven Liu
1c1031003b avformat/hlsenc: fix too many open files bug 
When use http method to delete the old segments,
there is only io_open, hove not io_close yet,
this patch is used to fix it

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
 2017-01-20 12:12:02 +08:00
Paul B Mahol
8a1759ad46 avcodec/exr: export writer info into frame metadata 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-01-19 21:06:34 +01:00
Paul B Mahol
546e29d1f5 avcodec/exr: make it aware of 2 additional compressions 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-01-19 21:06:34 +01:00
Aleksandr Slobodeniuk
545511f57a avcodec/avcodec: fix lil typo in comment 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-01-19 20:21:36 +01:00
Michael Niedermayer
1df3d636d4 avcodec/speedhq: Fix warning about "initialization from incompatible pointer type" 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-01-19 19:49:55 +01:00
Paul B Mahol
45f4bf94af avcodec/wmaprodec: check number of channels for XMA streams 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-01-19 15:42:47 +01:00
Paul B Mahol
0fe50e56e9 avcodec/pixlet: use av_clip_uintp2_c explicitly 
Found-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-01-19 13:32:21 +01:00
Paul B Mahol
a340987e37 avcodec/pixlet: use av_clip_uintp2() 
Found-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-01-19 13:19:10 +01:00
Paul B Mahol
be46eb7101 avcodec/pixlet: clip chroma before shifting 
Fixes artifacts.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-01-19 12:49:41 +01:00
Paul B Mahol
1daa08bd96 avcodec/wmapro: redone stream selection for XMA1/2 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-01-19 12:33:14 +01:00
Clément Bœsch
e5ac554ba7 lavc/h264: simplify find_unused_picture() 2017-01-19 10:34:10 +01:00
Piotr Bandurski
bcfa8551a1 avformat/caf: add 'aacl' codec tag 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-01-19 02:40:43 +01:00
Tobias Rapp
c324e2c5db ffmpeg: pass output stream duration as a hint to the muxer 
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-01-19 01:54:49 +01:00
Paul B Mahol
6c43f33ac2 avcodec/wmaprodec: >2 channel support for XMA 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-01-19 00:37:26 +01:00
Steven Liu
90096e42e1 avfilter:vf_drawtext: add new line space size set parameter 
add line_spacing parameter to set the space between two lines

Based on an idea by: Leandro Santiago <leandrosansilva@gmail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
 2017-01-19 07:09:22 +08:00
Steven Liu
b05d0274ce avformat/hlsenc: fix bug of hlsenc http delete old segments 
when push hls to http server, the old segemnts can not delete by hls formats.
so add the http option into hls_delete_old_segments

Reported-by: Yin Jiaoyuan <yinjiaoyuan@163.com>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
 2017-01-19 07:06:50 +08:00
Clément Bœsch
c3050fcbdc lavc/h264dec: remove flush goto in decode callback 2017-01-18 18:06:21 +01:00
Steven Liu
83a9cf3603 avformat/hlsenc: remove debug message used error level log 
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
 2017-01-18 23:18:41 +08:00
Mark Thompson
f7e9275f83 hwcontext_vdpau: Fix missing subscripts 
Also remove the redundant casts which were hiding the error here.

(cherry picked from commit 7081620aca)
 2017-01-17 23:06:46 +00:00
Mark Thompson
2a4a8653b6 lavc: Remove old vaapi decode infrastructure 
Deprecates struct vaapi_context and the installed header vaapi.h,
to be removed at the next version bump.

(cherry picked from commit 851960f6f8)
 2017-01-17 23:06:46 +00:00
Mark Thompson
542a65d0b3 ffmpeg_vaapi: Convert to use hw_frames_ctx only 
Most of the functionality here has moved into lavc.

(cherry picked from commit 3e8651a7cc)
 2017-01-17 23:06:46 +00:00
Mark Thompson
defbb8bc26 vaapi_vp9: Convert to use the new VAAPI hwaccel code 2017-01-17 23:06:46 +00:00
Anton Khirnov
adb54e59c1 vaapi_hevc: Convert to use the new VAAPI hwaccel code 
(cherry picked from commit ea8b730d8e)
Signed-off-by: Mark Thompson <sw@jkqxz.net>
 2017-01-17 23:06:46 +00:00
Mark Thompson
fd1a6a0106 vaapi_mpeg4: Convert to use the new VAAPI hwaccel code 
(cherry picked from commit ccd0316f7c)
 2017-01-17 23:06:46 +00:00
Mark Thompson
32b3812b60 vaapi_vc1: Convert to use the new VAAPI hwaccel code 
(cherry picked from commit 520fb77285)
 2017-01-17 23:06:46 +00:00
Mark Thompson
71acbea112 vaapi_mpeg2: Convert to use the new VAAPI hwaccel code 
(cherry picked from commit 102e13c353)
 2017-01-17 23:06:45 +00:00
Mark Thompson
c8b26d5954 vaapi_h264: Convert to use the new VAAPI hwaccel code 
(cherry picked from commit 2fe93244ab)
 2017-01-17 23:06:45 +00:00
Mark Thompson
79307ae563 lavc: Rewrite VAAPI decode infrastructure 
Moves much of the setup logic for VAAPI decoding into lavc; the user
now need only provide the hw_frames_ctx.

(cherry picked from commit 123ccd07c5)
(cherry picked from commit 5e879b54a3)
(cherry picked from commit 0aec37e625)
(cherry picked from commit cfa4eb4fba)
 2017-01-17 23:06:45 +00:00
Mark Thompson
d07d01bcce vaapi_vc1: Remove redundant version check 
The lowest supported VAAPI version is 0.34 (checked at configure
time), so this test is no longer needed.

(cherry picked from commit 5a667322f5)
 2017-01-17 23:06:45 +00:00
Mark Thompson
845c2c140b vaapi_vc1: Constify pointers 
(cherry picked from commit 01d6f84f49)
 2017-01-17 23:06:45 +00:00
Mark Thompson
6bc2808c41 vaapi_mpeg2: Constify pointers 
(cherry picked from commit ee9061293e)
 2017-01-17 23:06:45 +00:00
Mark Thompson
d0897da924 vaapi_h264: Constify pointers 
(cherry picked from commit 03adfe9130)
 2017-01-17 23:06:45 +00:00
Michael Niedermayer
b05d8e7184 libavformat/mpegtsenc: support hevc with missing in stream headers like h.264 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-01-17 20:36:34 +01:00
Kacper Michajłow
2064a3b8df configure: Don't disable SSA Optimizer on MSVC v19.00.24218+. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-01-17 17:55:34 +01:00
Matthieu Bouron
bdbbb8f11e Merge commit 'f450cc7bc595155bacdb9f5d2414a076ccf81b4a' 
* commit 'f450cc7bc595155bacdb9f5d2414a076ccf81b4a':
  h264: eliminate decode_postinit()

Also includes fixes from 1f7b4f9abc and e344e65109.

Original patch replace H264Context.next_output_pic (H264Picture *) by
H264Context.output_frame (AVFrame *). This change is discarded as it
is incompatible with the frame reconstruction and motion vectors
display code which needs the extra information from the H264Picture.

Merged-by: Clément Bœsch <u@pkh.me>
Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
 2017-01-17 14:38:48 +01:00
Matthieu Bouron
adf5dc90a9 avutil/tests: add aes_ctr, audio_fifo and imgutils to .gitignore 2017-01-17 10:08:05 +01:00
Carl Eugen Hoyos
e664730271 configure: Fix standalone compilation of aiff and caf muxers. 2017-01-16 12:03:21 +01:00
Clément Bœsch
9561de4183 lavc/h264dec: reconstruct and debug flush frames as well 2017-01-16 10:43:41 +01:00
Clément Bœsch
bd520e8569 lavc/h264_slice: drop redundant current_slice reset 
It is done unconditionally in ff_h264_field_end()
 2017-01-16 10:43:41 +01:00