ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-30 10:10:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,988 Commits 37 Branches 399 Tags 501 MiB
c593a70cda
Commit Graph

81988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sasi Inguva
7e0235bdb1 lavc/utils.c: Subtract skip_samples when frame is DISCARDed. 
Signed-off-by: Sasi Inguva <isasi@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-29 02:25:41 +02:00
Moritz Barsnick
1846a3eac8 ffmpeg_vaapi: fix choice of decoder_format 
The check could previously never evaluate to true, probably due to
a typo.

Reported-By: Mihai Chindea <mihai.chindea@uti.eu.com>
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Tested-by: Mark Thompson <sw@jkqxz.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-29 01:23:52 +02:00
Steven Liu
95f2dcafe1 doc/muxers: fix hlsenc options examples error 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Lou Logan <lou@lrcd.com>
 2016-09-28 15:04:55 -08:00
James Almer
a68f1ae6b1 doc/codecs.texi: fix and expand color related options 
Found-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-09-28 19:33:20 -03:00
Jan Ekström
6c10f8fe76 movenc: use similar logic to DASH when writing bit rate to ISML 
This way, in case of bit rate not being set, max_bitrate will be
used instead. This enables, for example, re-using max_bitrate
information from the input or doing transcoding with a rate
control mode that is not bit rate based.

Signed-off-by: Jan Ekström <jeebjp@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-28 23:45:11 +02:00
James Almer
e4bfc9ecf7 avfilter/vf_colorspace: fix range for output colorspace option 
Rreviewed-by: BBB
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-09-28 17:33:38 -03:00
raymondzheng1412@gmail.com
2366efce3c avformat/concatdec: don't call open_file when seek position within a file 2016-09-28 20:31:22 +02:00
James Almer
13dd5edb88 avutil/hwcontext: use CONFIG_QSV instead of CONFIG_LIBMFX for qsv 
See "[FFmpeg-devel] [PATCH] hwcontext: add a QSV implementation"

Suggested-by: nablet developer <sdk@nablet.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-09-28 15:13:10 -03:00
Philip Langdale
d6573275a7 ffmpeg_cuvid: Don't unnecessarily include nvcuvid.h 2016-09-28 10:44:37 -07:00
James Almer
eba0414768 Merge commit '59e7361cc791e5103be1712dc59a2055f118d0da' 
* commit '59e7361cc791e5103be1712dc59a2055f118d0da':
  hwcontext: add a QSV implementation

Conflicts:
    doc/APIchanges
    libavutil/version.h

Merged-by: James Almer <jamrial@gmail.com>
 2016-09-28 13:30:27 -03:00
James Almer
e9a5fc9678 Merge commit '6f19bbcf8532d018d8d6d82e000738d0ac2385c9' 
* commit '6f19bbcf8532d018d8d6d82e000738d0ac2385c9':
  qsvdec: move reading the user-provided session to qsv_decode_init()

Conflicts:
    libavcodec/qsvdec.c

Merged-by: James Almer <jamrial@gmail.com>
 2016-09-28 13:26:12 -03:00
James Almer
32c25f06b7 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>
 2016-09-28 13:22:00 -03:00
James Almer
0153cc49b2 Merge commit '40dd5166d2ba4f9035b93748840e408cd8be40e5' 
* commit '40dd5166d2ba4f9035b93748840e408cd8be40e5':
  truemotion2rt: Use ff_set_dimensions

Merged-by: James Almer <jamrial@gmail.com>
 2016-09-28 13:19:07 -03:00
James Almer
6e76c9c450 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>
 2016-09-28 13:12:18 -03:00
James Almer
f013ba475b Merge commit '5d560d38deca1e4705e6d3784d737363b9c830fe' 
* commit '5d560d38deca1e4705e6d3784d737363b9c830fe':
  pixfmt: Add ARIB STD-B76 color transfer characteristic

See 785038c92c

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

Merged-by: James Almer <jamrial@gmail.com>
 2016-09-28 13:09:26 -03:00
James Almer
3597d32e88 Merge commit '6ed0f70f97c882813199b3bafd724ceeb43659de' 
* commit '6ed0f70f97c882813199b3bafd724ceeb43659de':
  avconv: factor out initializing stream parameters for streamcopy

Conflicts:
    ffmpeg.c

Merged-by: James Almer <jamrial@gmail.com>
 2016-09-28 12:59:07 -03:00
James Almer
df2ae8f3f0 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>
 2016-09-28 12:57:58 -03:00
Carl Eugen Hoyos
83bf40f3cf lavc/8bps: Fix 32bit output of 24bit video. 
Regression since / partial revert of ba3bb53b
 2016-09-28 17:49:39 +02:00
Sylvain Laurent
58776ccbdb lavf/mpegtsenc: Set min PID for data pkt to 0x0010. 
Fixes ticket #1673.
 2016-09-28 17:29:11 +02:00
Timo Rothenpieler
c03b9d6a62 avcodec/nvenc: nicely align AVOptions 2016-09-28 16:48:43 +02:00
Yogender Gupta
facc19ef06 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
 2016-09-28 16:48:43 +02:00
Timo Rothenpieler
033f98c902 avcodec/nvenc: add HEVC REXT profile 2016-09-28 16:48:43 +02:00
Timo Rothenpieler
a81b000a39 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
 2016-09-28 16:48:43 +02:00
Michael Niedermayer
2679ad4773 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>
 2016-09-28 16:46:24 +02:00
Michael Niedermayer
14bac7e00d 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>
 2016-09-28 16:46:24 +02:00
Adriano Pallavicino
25866680fd lavc/qdm2: increase code clarity 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Josh de Kock <josh@itanimul.li>
 2016-09-28 12:35:58 +01:00
Sasi Inguva
7e9e1b7070 lavc/movtextdec.c: Avoid infinite loop on invalid data. 
Signed-off-by: Sasi Inguva <isasi@google.com>
 2016-09-27 19:49:02 -07:00
James Almer
92de2c23a6 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>
 2016-09-27 21:21:42 -03:00
James Almer
29b6c2be29 avformat/matroskadec: set AVCodecParameters.field_order on progressive video 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-09-27 20:30:11 -03:00
Sophia Wang
8c83062acb 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>
 2016-09-28 01:24:51 +02:00
Mulvya
a54c3ff65f doc/filters: blend terminates on longest input 
Signed-off-by: Mulvya <mulvya@gmail.com>
Signed-off-by: Lou Logan <lou@lrcd.com>
 2016-09-27 11:06:37 -08:00
James Almer
4a05d2eda7 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>
 2016-09-27 10:42:51 -03:00
James Almer
f0b6f7253f 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>
 2016-09-27 10:42:39 -03:00
Michael Niedermayer
fd902510ac swr: Update version & APIChanges for swr_build_matrix() 
Found-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-27 15:26:13 +02:00
Michael Niedermayer
23c0779cda 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>
 2016-09-27 12:54:00 +02:00
Michael Niedermayer
740f5105d5 swresample: Use double and float for matrixes for best quality and speed 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-27 12:53:25 +02:00
Carl Eugen Hoyos
dcc506a91e doc: Mention -dn in the "Stream selection" paragraph. 
There is no "Data options" paragraph.
Requested-by: ilker tezcan
 2016-09-27 09:07:17 +02:00
James Almer
64545dd600 ffprobe: don't access AVCodecContext.pkt_timebase directly 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-09-26 22:45:39 -03:00
Michael Niedermayer
69449da436 avcodec/ansi: Check dimensions 
Fixes: 1.avi

Found-by: 连一汉 <lianyihan@360.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-26 21:42:17 +02:00
Timo Rothenpieler
99b823f0a1 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.
 2016-09-26 18:21:00 +02:00
Carl Eugen Hoyos
46aae84616 lavf/movenc: Allow to disable writing the timecode track. 
Fixes ticket #5492.
 2016-09-26 08:50:48 +02:00
Jean-Yves Simon
fb37da37ac 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>
 2016-09-26 03:29:00 +02:00
James Almer
449dc25f56 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>
 2016-09-25 16:17:59 -03:00
James Almer
3ac76d7618 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>
 2016-09-25 16:17:41 -03:00
James Almer
e3842e87f2 avcodec/Makefile: Fix mlpenc dependencies 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-09-25 16:12:18 -03:00
James Almer
aa0dc698db avformat/avidec: remove warning about deprecated declarations 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-09-25 16:03:21 -03:00
Clément Bœsch
bd9e425459 doc/libav-merge: change gmane link to a ffmpeg.org one 2016-09-25 19:38:27 +02:00
Clément Bœsch
95a7cbb09d doc: move out merge script to tools 2016-09-25 19:27:51 +02:00
Clément Bœsch
485f75b278 doc: remove codecpar mention in libav-merge.txt 2016-09-25 19:17:39 +02:00
Clément Bœsch
99dfa55d5a Merge commit '1e93c1e30ff0e8bf6094a426ca60f005e9cdaed3' 
* commit '1e93c1e30ff0e8bf6094a426ca60f005e9cdaed3':
  avconv: do not set encoder options when streamcopy is used

This chunk was removed in 955b818cf9
already.

Merged-by: Clément Bœsch <u@pkh.me>
 2016-09-25 19:15:44 +02:00