summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* doc/libav-merge: add a note for the skipped QSV functionalityHendrik Leppkes2016-10-01
|
* Merge commit 'ac7bfd69678f3966e38debdb27f4bde94dc0345c'Hendrik Leppkes2016-10-01
|\ | | | | | | | | | | | | | | | | | | * commit 'ac7bfd69678f3966e38debdb27f4bde94dc0345c': lavfi: add a QSV scaling filter This is a noop since it depends on sharing a hwcontext with the decoder/encoder, see 04b17ff and 130e1f1 Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavfi: add a QSV scaling filterAnton Khirnov2016-06-21
| |
* | Merge commit 'ad9c9440d592e4d53d6bec9961b4b22e25387d70'Hendrik Leppkes2016-10-01
|\| | | | | | | | | | | | | | | | | | | * commit 'ad9c9440d592e4d53d6bec9961b4b22e25387d70': qsvenc: support getting the session from an AVHWFramesContext This commit is a noop, as it needs to be fully re-implemented for our qsv components. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvenc: support getting the session from an AVHWFramesContextAnton Khirnov2016-06-21
| |
* | Merge commit 'a0524d9b1e1bb0012207584f067096df7792df6c'Hendrik Leppkes2016-10-01
|\| | | | | | | | | | | | | | | | | | | * commit 'a0524d9b1e1bb0012207584f067096df7792df6c': qsvdec: support getting the session from an AVHWFramesContext This commit is a noop, as it needs to be fully re-implemented for our qsv components. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvdec: support getting the session from an AVHWFramesContextAnton Khirnov2016-06-21
| |
* | doc/libav-merge: complete TODO sectionClément Bœsch2016-10-01
| |
* | fate: Add regression test for Ticket 186Michael Niedermayer2016-10-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fate: Add fate-svq3-watermarkMichael Niedermayer2016-10-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/hlsenc: support mkdir_p for use_localtime_mkdirSteven Liu2016-10-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when use use_localtime_mkdir to create multi level dir, ffmpeg give error message: ffmpeg -re -i ~/Movies/objectC/facebook.mp4 -c copy -use_localtime 1 -use_localtime_mkdir 1 -hls_segment_filename '%Y%m%d/file-%Y%m%d/%s.ts' out.m3u8 error message: Could not create directory 20160926/file-20160926 with use_localtime_mkdir add mkdir_p for support the multi level dir Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Tested-by: Zuo Genyu <1515161258@qq.com> (Windows) Signed-off-by: Steven Liu <lingjiujianke@gmail.com>
* | doc/examples: build http_multiclient exampleClément Bœsch2016-09-30
| |
* | doc/examples/gitignore: add forgotten qsvdec entryClément Bœsch2016-09-30
| |
* | build: remove references to inexistant avcodec exampleClément Bœsch2016-09-30
| |
* | doc/examples/http_multiclient: fix mixed declarations and codeClément Bœsch2016-09-30
| |
* | doc/examples/http_multiclient: fix compilationClément Bœsch2016-09-30
| | | | | | | | 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-30
| |
* | build: sort EXAMPLE_LISTClément Bœsch2016-09-30
| |
* | avutil/hwcontext_cuda: use proper synchronization flagTimo Rothenpieler2016-09-29
| |
* | avcodec/cuvid: make use of new av_hwdevice_ctx_create apiTimo Rothenpieler2016-09-29
| |
* | avcodec/cuvid: support a pre-initialized hw_frames_ctxTimo Rothenpieler2016-09-29
| |
* | avcodec/cuvid: use actual frame size for buffer allocationTimo Rothenpieler2016-09-29
| |
* | avformat/tee: Copy interrupt callback and flags to slaveJan Sebechlebsky2016-09-29
| | | | | | | | | | | | | | 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-29
| |
* | ffmpeg: pass the hwaccel frames context to the decoderAnton Khirnov2016-09-29
| |
* | lavf/movenc: Put correct display aspect ratio in ARES atom.Carl Eugen Hoyos2016-09-29
| |
* | lavf/mov: Read display aspect ratio from ares atom also for dnxhd.Carl Eugen Hoyos2016-09-29
| | | | | | | | | | Fixes aspect ratio of sample in ticket #2125. Fixes aspect ratio of sample in ticket #5325.
* | Changelog: Mention edts support.Carl Eugen Hoyos2016-09-29
| |
* | movenc: Add support for writing language codes into ISML manifestsJan Ekström2016-09-29
| | | | | | | | | | | | | | 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-29
| | | | | | | | | | | | | | | | | | 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-29
| | | | | | | | | | 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-29
| | | | | | | | | | | | | | | | | | | | 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-28
| | | | | | | | | | | | | | 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-28
| | | | | | | | | | | | 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-28
| | | | | | | | | | | | | | | | | | | | 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-28
| | | | | | | | | | 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-28
| |
* | avutil/hwcontext: use CONFIG_QSV instead of CONFIG_LIBMFX for qsvJames Almer2016-09-28
| | | | | | | | | | | | | | 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-28
| |
* | Merge commit '59e7361cc791e5103be1712dc59a2055f118d0da'James Almer2016-09-28
|\| | | | | | | | | | | | | | | | | | | | | * 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-21
| |
* | Merge commit '6f19bbcf8532d018d8d6d82e000738d0ac2385c9'James Almer2016-09-28
|\| | | | | | | | | | | | | | | | | | | * 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-21
| | | | | | | | This is a more appropriate place for it.
* | Merge commit 'e85f6f7f8d037c0af0f294000718d9ba22753baa'James Almer2016-09-28
|\| | | | | | | | | | | | | | | | | | | | | * 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-21
| | | | | | | | | | For now it will only be used by the default get_buffer2 callback for allocating hw frames.
* | Merge commit '40dd5166d2ba4f9035b93748840e408cd8be40e5'James Almer2016-09-28
|\| | | | | | | | | | | | | * commit '40dd5166d2ba4f9035b93748840e408cd8be40e5': truemotion2rt: Use ff_set_dimensions Merged-by: James Almer <jamrial@gmail.com>
| * truemotion2rt: Use ff_set_dimensionsVittorio Giovara2016-06-21
| |
* | Merge commit 'a8164323374e86ce5f93759230868c98356833a2'James Almer2016-09-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-21
| | | | | | | | | | | | Appeared in H.264 2016/02. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '5d560d38deca1e4705e6d3784d737363b9c830fe'James Almer2016-09-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>