summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | hevc: fix temporal_id(cherry picked from commit ↵Mickaël Raulet2013-11-02
| | | | | | | | | | | | 5eac0df49d33bef7f3ffc5efde19839dddb554e8) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mvcdec: stop using deprecated avcodec_set_dimensions()Paul B Mahol2013-11-01
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/exr: stop using deprecated avcodec_set_dimensions()Paul B Mahol2013-11-01
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/sanm: stop using deprecated avcodec_set_dimensions()Paul B Mahol2013-11-01
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/tiff_common: allow count = 0 in ff_tadd_bytes_metadata()Michael Niedermayer2013-11-01
| | | | | | | | | | | | | | Fixes Ticket3103 Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/isom: lpcm in mov default to big endianMark Himsley2013-11-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is my understanding that "Unless otherwise stated, all data in a QuickTime movie is stored in big-endian byte ordering" [1] in MOV files. I have a couple of thousand files, which technically are invalid because their sound sample description element 4CC is 'lpcm' but its version is 0 - and "Version 0 supports only uncompressed audio in raw ('raw ') or twos-complement ('twos') format" [2] Because isom.c only contains a mapping for 4CC 'lpcm' to AV_CODEC_ID_PCM_S16LE, these files have their audio decoded as LE when it is actually BE. This commit adds AV_CODEC_ID_PCM_S16BE as the first match for 4CC 'lpcm'. [1] https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf page 21 [2] https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf page 178 Reviewed-by: Yusuke Nakamura <muken.the.vfrmaniac@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | * qatar/master: rtspenc: Make sure BYE packets are sent before TEARDOWN Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtspenc: Make sure BYE packets are sent before TEARDOWNMartin Storsjö2013-11-01
| | | | | | | | | | | | | | Also make sure the BYE packets are sent at all when using TCP interleaved transport. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | | | | | | | * commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05': rtpenc: Add a rtpflag option for sending BYE packets when finishing Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc: Add a rtpflag option for sending BYE packets when finishingMartin Storsjö2013-11-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'b264453de93999ea6f23e98014390af468f56146'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | * commit 'b264453de93999ea6f23e98014390af468f56146': rtpenc: Remove some superfluous parentheses Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc: Remove some superfluous parenthesesMartin Storsjö2013-11-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'd07b51bf0733fe58bbfa13c448775dc325463cb4'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | * commit 'd07b51bf0733fe58bbfa13c448775dc325463cb4': aviobuf: Handle a NULL buffer in avio_close_dyn_buf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aviobuf: Handle a NULL buffer in avio_close_dyn_bufMartin Storsjö2013-11-01
| | | | | | | | | | | | | | | | | | | | | | | | This simplifies proper error handling in rtsp.c/rtspdec.c. When broadcasting over RTSP in TCP mode, the AVIOContext is closed and recreated for each sent packet, and if the recreation fails, we might try to close a NULL buffer when freeing things at the end. Previously, if recreating the buffer in rtspdec.c failed, this would crash later due to trying to close a NULL buffer. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '28240a60c1b5ce276e947ba013271ec009adc078'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | * commit '28240a60c1b5ce276e947ba013271ec009adc078': lavc: move FF_ASPECT_EXTENDED from avcodec.h to h263.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: move FF_ASPECT_EXTENDED from avcodec.h to h263.hAnton Khirnov2013-10-31
| | | | | | | | It's for internal use only.
* | Merge commit 'eb5920c195d1b0bda81782af4ba0c5982f5225b3'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | * commit 'eb5920c195d1b0bda81782af4ba0c5982f5225b3': lavc: deprecate unused FF_BUG_OLD_MSMPEG4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate unused FF_BUG_OLD_MSMPEG4Anton Khirnov2013-10-31
| |
* | Merge commit '0300962b76644f145b773439989a5cdf1667e162'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | * commit '0300962b76644f145b773439989a5cdf1667e162': lavc: schedule FF_BUG_AC_VLC for removal on the next major bump. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: schedule FF_BUG_AC_VLC for removal on the next major bump.Anton Khirnov2013-10-31
| | | | | | | | It has been deprecated/unused for about 10 years.
* | avcodec: document that FF_DEBUG_VIS_QP / FF_DEBUG_VIS_MB_TYPE should only be ↵Michael Niedermayer2013-11-01
| | | | | | | | | | | | | | | | used through avoptions This preempts ABI issues if their values get reused by the fork for something unrelated Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | | | | | * commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8': lavc: deprecate FF_DEBUG_VIS_* leave the AVOptions as they work fine Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate FF_DEBUG_VIS_*Anton Khirnov2013-10-31
| | | | | | | | | | Those flags have no effect since 37045e422903695e610cca6ecb753df643ab9380.
* | avcodec/avcodec.h: move debug_mv to the end of the struct with the next ABI bumpMichael Niedermayer2013-11-01
| | | | | | | | | | | | | | This maintains ABI compatibility also add a note that debug_mv must be accessed through AVOptions (for ABI) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577': lavc: deprecate AVCodecContext.debug_mv Conflicts: libavcodec/options_table.h Not merged, debug_mv works fine Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate AVCodecContext.debug_mvAnton Khirnov2013-10-31
| | | | | | | | It has been unused since 37045e422903695e610cca6ecb753df643ab9380.
* | Merge commit 'fae753af709537fc75ff1c4ce21fc1f4429af929'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fae753af709537fc75ff1c4ce21fc1f4429af929': avplay: drop -vismv option which does not do anything anymore Conflicts: Changelog ffplay.c Not merged, the vismv option works fine in ffplay Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avplay: drop -vismv option which does not do anything anymoreAnton Khirnov2013-10-31
| |
* | Merge commit 'ccc71298456d97f64f539e303c771d04dcb33c53'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | * commit 'ccc71298456d97f64f539e303c771d04dcb33c53': lavc: deprecate FF_DEBUG_MV and remove all traces of its use Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate FF_DEBUG_MV and remove all traces of its useAnton Khirnov2013-10-31
| | | | | | | | | | | | It has not been actually used since 37045e422903695e610cca6ecb753df643ab9380, when the broken vismv code was removed.
* | Merge commit 'b6a4701612514c97d22f7ffb37993539f7718352'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'b6a4701612514c97d22f7ffb37993539f7718352': mpegts: Support HEVC demuxing Conflicts: Changelog libavformat/version.h See: 93c1fe4de3937df63c3d68e87dd7d2fabd5203c0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Support HEVC demuxingMickaël Raulet2013-10-31
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075': matroskadec: Support HEVC demuxing Conflicts: Changelog libavformat/matroskadec.c libavformat/version.h See: 16b6839de6767924c4640d6e9204b6eeb5c53910 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: Support HEVC demuxingYusuke Nakamura2013-10-31
| |
* | Merge commit 'ea29f965dc71182f77b8efe819630f55e48b0ab7'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ea29f965dc71182f77b8efe819630f55e48b0ab7': mov: Support HEVC demuxing Conflicts: Changelog libavformat/mov.c libavformat/version.h See: 53f903b7c5427cb18659f7775714e860c1c5fc39 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Support HEVC demuxingYusuke Nakamura2013-10-31
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '5846646296e377e093441dfe9eadde38ff1f7c99'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '5846646296e377e093441dfe9eadde38ff1f7c99': Add raw HEVC demuxer Conflicts: Changelog libavformat/hevcdec.c libavformat/version.h See: 902a5fa7228d92bf7e0a8f523a25cf72d31afab4 and later commits Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add raw HEVC demuxerDirk Farin2013-10-31
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'e1c058dba930c1f6f180e04d9e26dbda261cedbc'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e1c058dba930c1f6f180e04d9e26dbda261cedbc': FATE: Add HEVC tests Conflicts: tests/fate/hevc.mak tests/ref/fate/hevc-conformance-DBLK_A_SONY_3 tests/ref/fate/hevc-conformance-DBLK_B_SONY_3 tests/ref/fate/hevc-conformance-DBLK_C_SONY_3 tests/ref/fate/hevc-conformance-DELTAQP_B_SONY_3 tests/ref/fate/hevc-conformance-DELTAQP_C_SONY_3 tests/ref/fate/hevc-conformance-POC_A_Bossen_3 tests/ref/fate/hevc-conformance-RPS_D_ericsson_5 tests/ref/fate/hevc-conformance-WP_B_Toshiba_3 tests/ref/fate/hevc-conformance-WP_MAIN10_B_Toshiba_3 See: fb3cea4be339f4544ca37fb0bc917d734d063a1f and later commits Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * FATE: Add HEVC testsGuillaume Martres2013-10-31
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '064698d381e1e7790f21b0199a8930ea04e2e942'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '064698d381e1e7790f21b0199a8930ea04e2e942': Add HEVC decoder Conflicts: Changelog libavcodec/Makefile libavcodec/allcodecs.c libavcodec/hevc.c libavcodec/hevc.h libavcodec/hevc_cabac.c libavcodec/hevc_filter.c libavcodec/hevc_mvs.c libavcodec/hevc_parser.c libavcodec/hevc_ps.c libavcodec/hevc_refs.c libavcodec/hevc_sei.c libavcodec/hevcdsp.c libavcodec/hevcdsp_template.c libavcodec/hevcpred.c libavcodec/hevcpred_template.c libavcodec/version.h cosmetics from hevc.h & hevc_ps.c mostly merged, other files left as they where in ffmpeg. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add HEVC decoderGuillaume Martres2013-10-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initially written by Guillaume Martres <smarter@ubuntu.com> as a GSoC project. Further contributions by the OpenHEVC project and other developers, namely: Mickaël Raulet <mraulet@insa-rennes.fr> Seppo Tomperi <seppo.tomperi@vtt.fi> Gildas Cocherel <gildas.cocherel@laposte.net> Khaled Jerbi <khaled_jerbi@yahoo.fr> Wassim Hamidouche <wassim.hamidouche@insa-rennes.fr> Vittorio Giovara <vittorio.giovara@gmail.com> Jan Ekström <jeebjp@gmail.com> Anton Khirnov <anton@khirnov.net> Martin Storsjö <martin@martin.st> Luca Barbato <lu_zero@gentoo.org> Yusuke Nakamura <muken.the.vfrmaniac@gmail.com> Reimar Döffinger <Reimar.Doeffinger@gmx.de> Diego Biurrun <diego@biurrun.de> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | lavd/xv: free graphics contextLukasz Marek2013-11-01
| | | | | | | | | | | | | | | | Valgrind detects mem leak from XCreateGC. Free it with XFreeGC. Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | Merge commit '0a9e94bba8f8a40156438a43e4fe0e9ae36236cb'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | * commit '0a9e94bba8f8a40156438a43e4fe0e9ae36236cb': webp: stop using deprecated avcodec_set_dimensions Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * webp: stop using deprecated avcodec_set_dimensionsAnton Khirnov2013-10-31
| |
* | Merge commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be': vp8: stop using deprecated avcodec_set_dimensions vp56: stop using deprecated avcodec_set_dimensions vp3: stop using deprecated avcodec_set_dimensions txd: stop using deprecated avcodec_set_dimensions truemotion1: stop using deprecated avcodec_set_dimensions Conflicts: libavcodec/txd.c libavcodec/vp56.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vp8: stop using deprecated avcodec_set_dimensionsAnton Khirnov2013-10-31
| |
| * vp56: stop using deprecated avcodec_set_dimensionsAnton Khirnov2013-10-31
| |
| * vp3: stop using deprecated avcodec_set_dimensionsAnton Khirnov2013-10-31
| |
| * txd: stop using deprecated avcodec_set_dimensionsAnton Khirnov2013-10-31
| |