aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* doc/examples/gitignore: add forgotten qsvdec entryClément Bœsch2016-09-301-0/+1
|
* build: remove references to inexistant avcodec exampleClément Bœsch2016-09-302-2/+0
|
* doc/examples/http_multiclient: fix mixed declarations and codeClément Bœsch2016-09-301-1/+1
|
* doc/examples/http_multiclient: fix compilationClément Bœsch2016-09-301-1/+1
| | | | Fixes error: no previous prototype for ‘process_client’ [-Werror=missing-prototypes]
* build: fix avio_dir_cmd and avio_reading example dependenciesClément Bœsch2016-09-301-2/+2
|
* build: sort EXAMPLE_LISTClément Bœsch2016-09-301-1/+1
|
* avutil/hwcontext_cuda: use proper synchronization flagTimo Rothenpieler2016-09-291-1/+1
|
* avcodec/cuvid: make use of new av_hwdevice_ctx_create apiTimo Rothenpieler2016-09-292-44/+11
|
* avcodec/cuvid: support a pre-initialized hw_frames_ctxTimo Rothenpieler2016-09-291-7/+6
|
* avcodec/cuvid: use actual frame size for buffer allocationTimo Rothenpieler2016-09-291-3/+3
|
* avformat/tee: Copy interrupt callback and flags to slaveJan Sebechlebsky2016-09-291-0/+2
| | | | | | | Copy interrupt callback to slave format context to allow user to interrupt IO. Copy format flags as well. Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
* ffmpeg_cuvid: make use of new av_hwdevice_ctx_create apiTimo Rothenpieler2016-09-291-103/+22
|
* ffmpeg: pass the hwaccel frames context to the decoderAnton Khirnov2016-09-291-0/+7
|
* lavf/movenc: Put correct display aspect ratio in ARES atom.Carl Eugen Hoyos2016-09-292-2/+6
|
* lavf/mov: Read display aspect ratio from ares atom also for dnxhd.Carl Eugen Hoyos2016-09-293-3/+4
| | | | | Fixes aspect ratio of sample in ticket #2125. Fixes aspect ratio of sample in ticket #5325.
* Changelog: Mention edts support.Carl Eugen Hoyos2016-09-291-0/+1
|
* movenc: Add support for writing language codes into ISML manifestsJan Ekström2016-09-291-0/+4
| | | | | | | Streaming servers appear to ignore all other language metadata. Signed-off-by: Jan Ekström <jeebjp@gmail.com> Signed-off-by: Josh de Kock <josh@itanimul.li>
* lavf/mov.c: Make audio timestamps strictly monotonically increasing inside ↵Sasi Inguva2016-09-293-13/+71
| | | | | | | | | an edit list. Fixes gapless decoding. Adjust skip_samples field correctly in case of DISCARDed audio frames. Signed-off-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavc/utils.c: Subtract skip_samples when frame is DISCARDed.Sasi Inguva2016-09-292-10/+8
| | | | | Signed-off-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg_vaapi: fix choice of decoder_formatMoritz Barsnick2016-09-291-1/+1
| | | | | | | | | | 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>
* doc/muxers: fix hlsenc options examples errorSteven Liu2016-09-281-3/+3
| | | | | | | 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>
* doc/codecs.texi: fix and expand color related optionsJames Almer2016-09-281-10/+63
| | | | | | Found-by: Michael Niedermayer <michael@niedermayer.cc> Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* movenc: use similar logic to DASH when writing bit rate to ISMLJan Ekström2016-09-281-2/+14
| | | | | | | | | | 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>
* avfilter/vf_colorspace: fix range for output colorspace optionJames Almer2016-09-281-1/+1
| | | | | Rreviewed-by: BBB Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/concatdec: don't call open_file when seek position within a fileraymondzheng1412@gmail.com2016-09-281-7/+17
|
* avutil/hwcontext: use CONFIG_QSV instead of CONFIG_LIBMFX for qsvJames Almer2016-09-282-3/+3
| | | | | | | See "[FFmpeg-devel] [PATCH] hwcontext: add a QSV implementation" Suggested-by: nablet developer <sdk@nablet.com> Signed-off-by: James Almer <jamrial@gmail.com>
* ffmpeg_cuvid: Don't unnecessarily include nvcuvid.hPhilip Langdale2016-09-281-1/+0
|
* Merge commit '59e7361cc791e5103be1712dc59a2055f118d0da'James Almer2016-09-288-1/+857
|\ | | | | | | | | | | | | | | | | | | | | * commit '59e7361cc791e5103be1712dc59a2055f118d0da': hwcontext: add a QSV implementation Conflicts: doc/APIchanges libavutil/version.h Merged-by: James Almer <jamrial@gmail.com>
| * hwcontext: add a QSV implementationAnton Khirnov2016-06-218-1/+857
| |
* | Merge commit '6f19bbcf8532d018d8d6d82e000738d0ac2385c9'James Almer2016-09-281-9/+24
|\| | | | | | | | | | | | | | | | | | | * commit '6f19bbcf8532d018d8d6d82e000738d0ac2385c9': qsvdec: move reading the user-provided session to qsv_decode_init() Conflicts: libavcodec/qsvdec.c Merged-by: James Almer <jamrial@gmail.com>
| * qsvdec: move reading the user-provided session to qsv_decode_init()Anton Khirnov2016-06-211-13/+11
| | | | | | | | This is a more appropriate place for it.
* | Merge commit 'e85f6f7f8d037c0af0f294000718d9ba22753baa'James Almer2016-09-284-9/+37
|\| | | | | | | | | | | | | | | | | | | | | * commit 'e85f6f7f8d037c0af0f294000718d9ba22753baa': lavc: allow using AVCodecContext.hw_frames_ctx for decoding Conflicts: doc/APIchanges libavcodec/version.h Merged-by: James Almer <jamrial@gmail.com>
| * lavc: allow using AVCodecContext.hw_frames_ctx for decodingAnton Khirnov2016-06-214-9/+37
| | | | | | | | | | For now it will only be used by the default get_buffer2 callback for allocating hw frames.
* | Merge commit '40dd5166d2ba4f9035b93748840e408cd8be40e5'James Almer2016-09-281-3/+8
|\| | | | | | | | | | | | | * commit '40dd5166d2ba4f9035b93748840e408cd8be40e5': truemotion2rt: Use ff_set_dimensions Merged-by: James Almer <jamrial@gmail.com>
| * truemotion2rt: Use ff_set_dimensionsVittorio Giovara2016-06-211-3/+8
| |
* | Merge commit 'a8164323374e86ce5f93759230868c98356833a2'James Almer2016-09-285-3/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * pixdesc: Add new SMPTE 431, 432, and 2085 color propertiesVittorio Giovara2016-06-215-2/+11
| | | | | | | | | | | | Appeared in H.264 2016/02. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '5d560d38deca1e4705e6d3784d737363b9c830fe'James Almer2016-09-282-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * pixfmt: Add ARIB STD-B76 color transfer characteristicNeil Birkbeck2016-06-215-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding hybrid log-gamma (https://en.wikipedia.org/wiki/Hybrid_Log-Gamma) based on the standardization in ARIB STD-B67: http://www.arib.or.jp/english/html/overview/doc/2-STD-B67v1_0.pdf The choice of enum value of 18 is consistent with HEVC: http://phenix.it-sudparis.eu/jct/doc_end_user/current_document.php?id=10481 And also with latest proposal for color format in mkv: https://mailarchive.ietf.org/arch/search/?email_list=cellar&gbt=1&q=Colour+Format+proposal Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '6ed0f70f97c882813199b3bafd724ceeb43659de'James Almer2016-09-281-145/+158
|\| | | | | | | | | | | | | | | | | | | * commit '6ed0f70f97c882813199b3bafd724ceeb43659de': avconv: factor out initializing stream parameters for streamcopy Conflicts: ffmpeg.c Merged-by: James Almer <jamrial@gmail.com>
| * avconv: factor out initializing stream parameters for streamcopyAnton Khirnov2016-06-211-99/+110
| |
* | Merge commit '5fa255b65c7887cc913f097aed1b581fbf1a8745'James Almer2016-09-280-0/+0
|\| | | | | | | | | | | | | | | | | | | * 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>
| * avconv: initialize output framerate earlierAnton Khirnov2016-06-212-34/+42
| | | | | | | | This will be needed in the following commits.
* | lavc/8bps: Fix 32bit output of 24bit video.Carl Eugen Hoyos2016-09-282-6/+9
| | | | | | | | Regression since / partial revert of ba3bb53b
* | lavf/mpegtsenc: Set min PID for data pkt to 0x0010.Sylvain Laurent2016-09-281-1/+1
| | | | | | | | Fixes ticket #1673.
* | avcodec/nvenc: nicely align AVOptionsTimo Rothenpieler2016-09-282-131/+154
| |
* | avcodec/nvenc: Extended rate-control support as provided by SDK 7Yogender Gupta2016-09-285-4/+69
| | | | | | | | | | Merged from libav commit by Yogender Gupta: https://git.libav.org/?p=libav.git;a=commitdiff;h=70de2ea4261f860457a04e3d0c58c5543f403325
* | avcodec/nvenc: add HEVC REXT profileTimo Rothenpieler2016-09-283-1/+13
| |
* | avcodec/nvenc: Make sure that enum and array index matchTimo Rothenpieler2016-09-281-12/+20
| | | | | | | | | | | | 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
* | 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>