summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '38392b2af815898b8716826c4e29d95c04fb2647'Hendrik Leppkes2016-06-262-2/+82
|\ | | | | | | | | | | | | * commit '38392b2af815898b8716826c4e29d95c04fb2647': hwcontext_vdpau: implement device creation Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * hwcontext_vdpau: implement device creationAnton Khirnov2016-05-262-2/+82
| |
* | Merge commit '1c9e8616c535ef496e7ee8a5cbc5e9e972a6977d'Hendrik Leppkes2016-06-265-1/+71
|\ \ | |/ | | | | | | | | | | * commit '1c9e8616c535ef496e7ee8a5cbc5e9e972a6977d': hwcontext: add a function for opening devices Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * hwcontext: add a function for opening devicesAnton Khirnov2016-05-265-1/+71
| |
* | Merge commit '24b5cff01bbac4e08acfd6d19c499e880988f520'Hendrik Leppkes2016-06-261-1/+9
|\ \ | |/ | | | | | | | | | | * commit '24b5cff01bbac4e08acfd6d19c499e880988f520': lavc: handle hw_frames_ctx where necessary Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: handle hw_frames_ctx where necessaryAndrey Turkin2016-05-261-0/+9
| | | | | | | | | | | | | | avcodec_copy_context() didn't handle hw_frames_ctx references correctly which could cause crashes. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '4024b566d664a4b161d677554be52f32e7ad4236'Hendrik Leppkes2016-06-268-87/+87
|\ \ | |/ | | | | | | | | | | * commit '4024b566d664a4b161d677554be52f32e7ad4236': golomb: Give svq3_get_se_golomb()/svq3_get_ue_golomb() better names Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * golomb: Give svq3_get_se_golomb()/svq3_get_ue_golomb() better namesDiego Biurrun2016-05-256-49/+49
| |
* | Merge commit '7ca4fdc046a945949866bb6fc550e3cab1fc8c00'Hendrik Leppkes2016-06-261-6/+6
|\ \ | |/ | | | | | | | | | | * commit '7ca4fdc046a945949866bb6fc550e3cab1fc8c00': fate: More fine-grained dependencies for demuxer tests Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * fate: More fine-grained dependencies for demuxer testsDiego Biurrun2016-05-251-6/+6
| |
* | Merge commit '07377fb557909015338b4c215b87b9c73ea577ad'Hendrik Leppkes2016-06-261-4/+3
|\ \ | |/ | | | | | | | | | | * commit '07377fb557909015338b4c215b87b9c73ea577ad': fate: More fine-grained dependencies for voice codec tests Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * fate: More fine-grained dependencies for voice codec testsDiego Biurrun2016-05-251-12/+12
| |
* | Merge commit '3fdffc032e8ea5676bc0c2551b900c0dc887835b'Hendrik Leppkes2016-06-261-4/+4
|\ \ | |/ | | | | | | | | | | * commit '3fdffc032e8ea5676bc0c2551b900c0dc887835b': rtsp: Use avcodec_descriptor_get instead of avcodec_find_decoder Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * rtsp: Use avcodec_descriptor_get instead of avcodec_find_decoderMartin Storsjö2016-05-251-4/+4
| | | | | | | | | | | | | | This is only used for logging a human readable codec name for debugging. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298'Hendrik Leppkes2016-06-262-1/+4
|\ \ | |/ | | | | | | | | | | * commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298': avcodec: Bump micro version after changing public JPEG 2000 defines Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avcodec: Bump micro version after changing public JPEG 2000 definesDiego Biurrun2016-05-242-1/+4
| |
* | Merge commit 'ad61da054bd8c74a5d5b38d80846228fc6147108'Hendrik Leppkes2016-06-261-3/+3
|\ \ | |/ | | | | | | | | | | * commit 'ad61da054bd8c74a5d5b38d80846228fc6147108': jpeg2000: Fix profile define values Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * jpeg2000: Fix profile define valuesFrancois Cartegnie2016-05-241-3/+3
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'ac84e618df4765ba751327497994066d0931e6a8'Hendrik Leppkes2016-06-260-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit 'ac84e618df4765ba751327497994066d0931e6a8': avfiltergraph: check the query_formats() return value This commit is a noop, see 6a4c5c730ed67a7f472e43205fd96e91781796ce Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avfiltergraph: check the query_formats() return valueAnton Khirnov2016-05-231-2/+8
| |
* | Merge commit '2ef6dab0a79a9852a92ed80b07f9e32a37530d9e'Hendrik Leppkes2016-06-261-0/+5
|\ \ | |/ | | | | | | | | | | * commit '2ef6dab0a79a9852a92ed80b07f9e32a37530d9e': lavc: document that avcodec_close() should not be used Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: document that avcodec_close() should not be usedAnton Khirnov2016-05-231-0/+5
| | | | | | | | | | | | | | We cannot deprecate it until the new parser API is in place, because of the way libavformat works. But the majority of the users can already simply replace it with avcodec_free_context(), which will simplify the transition once it is finally deprecated.
* | Merge commit '04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f'Hendrik Leppkes2016-06-263-16/+21
|\ \ | |/ | | | | | | | | | | * commit '04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f': lavc: deprecate avcodec_get_context_defaults3() Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: deprecate avcodec_get_context_defaults3()Anton Khirnov2016-05-233-16/+21
| | | | | | | | | | | | | | | | | | This function is supposed to "reset" a codec context to a clean state so that it can be opened again. The only reason it exists is to allow using AVStream.codec as a decoding context (after it was already opened/used/closed by avformat_find_stream_info()). Since that behaviour is now deprecated, there is no reason for this function to exist anymore.
* | Merge commit '5f30ac27795f9f98043e8582ccaad8813104adc4'Hendrik Leppkes2016-06-263-0/+14
|\ \ | |/ | | | | | | | | | | * commit '5f30ac27795f9f98043e8582ccaad8813104adc4': lavc: deprecate avcodec_copy_context() Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: deprecate avcodec_copy_context()Anton Khirnov2016-05-233-0/+14
| | | | | | | | | | | | | | | | | | Since AVCodecContext contains a lot of complex state, copying a codec context is not a well-defined operation. The purpose for which it is typically used (which is well-defined) is copying the stream parameters from one codec context to another. That is now possible with through the AVCodecParameters API. Therefore, there is no reason for avcodec_copy_context() to exist.
* | Merge commit '14634429b915333f3612eaf41db3954222dc4aaf'Hendrik Leppkes2016-06-261-3/+3
|\ \ | |/ | | | | | | | | | | * commit '14634429b915333f3612eaf41db3954222dc4aaf': lavf: update muxing doxy Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavf: update muxing doxyAnton Khirnov2016-05-231-3/+3
| | | | | | | | Describe the new AVCodecParameters API.
* | Merge commit '74b1bf632f125a795e66e5fd0a060b9c7c55b7a3'Hendrik Leppkes2016-06-261-13/+15
|\ \ | |/ | | | | | | | | | | * commit '74b1bf632f125a795e66e5fd0a060b9c7c55b7a3': mp3: Make the extrasize explicit Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mp3: Make the extrasize explicitLuca Barbato2016-05-221-14/+15
| | | | | | | | | | | | | | | | | | Initialize the bit buffer with the correct size (amount of bits that will be read) instead of relying on the bitstream reader overreading the correct values. Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '52567e8198669a1e7493c75771613f87a90466c3'Hendrik Leppkes2016-06-263-96/+1
|\ \ | |/ | | | | | | | | | | * commit '52567e8198669a1e7493c75771613f87a90466c3': get_bits: Drop some TRACE-level debug code Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * get_bits: Drop some TRACE-level debug codeDiego Biurrun2016-05-223-74/+0
| | | | | | | | It will not be provided by the new bit reader anyway.
* | Merge commit 'e45a638f50cc1dbeb87b9792e68f57e77fc0c3b5'Hendrik Leppkes2016-06-261-1/+0
|\ \ | |/ | | | | | | | | | | * commit 'e45a638f50cc1dbeb87b9792e68f57e77fc0c3b5': dump: Drop unused variable Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dump: Drop unused variableDiego Biurrun2016-05-221-1/+0
| |
* | Merge commit 'e2a3df1a464091075040a81ffc419fa21a8a5fd8'Hendrik Leppkes2016-06-260-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit 'e2a3df1a464091075040a81ffc419fa21a8a5fd8': avconv: Use more precise deprecation ifdefs The PSNR functionality is not deprecated in ffmpeg. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avconv: Use more precise deprecation ifdefsDiego Biurrun2016-05-221-3/+3
| | | | | | | | This fixes compilation with the libavcodec version bumped to 58.
* | Merge commit '35c858066840352d6d43385bbc728467c5150974'Hendrik Leppkes2016-06-260-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '35c858066840352d6d43385bbc728467c5150974': avconv: stop using AVStream.codec Not merged, as ffmpeg.c is not migrated to codecpar yet, and this commit only changes minor parts of AVStream.codec usage, which should get applied after ffmpeg.c is using codecpar. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avconv: stop using AVStream.codecAnton Khirnov2016-05-222-13/+9
| | | | | | | | | | | | | | | | It is now only used by the av_parser_change() call during streamcopy, so allocate a special AVCodecContext instance for this case. This instance should go away when the new parser API is finished. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avcodec: add YUY2 Lossless Codec decoderPaul B Mahol2016-06-268-1/+488
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | doc/APIchanges: Add FFmpeg 3.1 cut markerMichael Niedermayer2016-06-261-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | doc/APIchanges: Fill in and correct more stuffMichael Niedermayer2016-06-261-23/+23
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/vf_paletteuse: enable skip_initial_unpairedMichael Niedermayer2016-06-261-0/+1
| | | | | | | | | | | | | | | | | | Fixes crash due to unprocessed input being passed through This fixes the last segfault caused by mixing 3.0 and 3.1 libs and applications Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/dualinput: Add support to skip initial unpaired framesMichael Niedermayer2016-06-262-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/h264_sei: Do not skip subsequent SEIs on errors potentially caused ↵Michael Niedermayer2016-06-261-4/+10
| | | | | | | | | | | | by missing parameter sets. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/src_movie: Add option to remove timestamp discontinuitiesMichael Niedermayer2016-06-262-0/+27
| | | | | | | | | | | | This can also be extended to remove discontiuities caused by seek commands Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/tee: Support arbitrary number of slavesJan Sebechlebsky2016-06-251-10/+16
| | | | | | | | Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
* | avcodec/nvenc: Bring encoder names in line with other encodersTimo Rothenpieler2016-06-256-12/+89
| |
* | lavf/srtdec: fix indentRodger Combs2016-06-251-1/+1
| |
* | lavf: update auto-bsf to new BSF APIRodger Combs2016-06-254-24/+91
| |
* | lavf: deprecate av_apply_bitstream_filtersRodger Combs2016-06-252-0/+7
| |