summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* avformat/omadec: only compute timestamps based on bitrate if its setMichael Niedermayer2015-02-07
| | | | | | Fixes division by zero Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'e352520e3ed7f08f19e63cd60e95da6bb6f037c1'Michael Niedermayer2015-02-07
|\ | | | | | | | | | | | | * commit 'e352520e3ed7f08f19e63cd60e95da6bb6f037c1': oma: Report a timestamp Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oma: Report a timestampLuca Barbato2015-02-07
| | | | | | | | | | | | Reported-By: jb@videolan.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '8029af586fd5a5f2a0803001f9eff386e5545fe2'Michael Niedermayer2015-02-07
|\| | | | | | | | | | | | | | | * commit '8029af586fd5a5f2a0803001f9eff386e5545fe2': dxva2_hevc: properly fill the scaling list structure See: b11994593ae4c3856db735800f24d38293838759 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dxva2_hevc: properly fill the scaling list structureHendrik Leppkes2015-02-07
| | | | | | | | | | | | | | | | The scaling list can be specified in either the SPS or PPS. Additionally, compensate for the diagonal scan permutation applied in the decoder. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | x86: lavc/hevc_mc: fix commentsChristophe Gisquet2015-02-07
| | | | | | | | | | | | | | The width parameter is now completely at the back, and actually never used. This helps understanding the actual parameter list. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/faxcompr: use init_get_bits8()Paul B Mahol2015-02-07
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | hevc/sao: do in-place band filtering when possibleChristophe Gisquet2015-02-07
| | | | | | | | | | | | | | The copies are only needed when data must be restored, so skip them when it must not be. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86: lavc: share more constant through definesChristophe Gisquet2015-02-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mlv: Only add streams that are supposed to contain frames.Carl Eugen Hoyos2015-02-07
| | | | | | | | | | | | Fixes ticket #4296. Reviewed-by: Peter Ross
* | avcodec/twinvqdec: use init_get_bits8()Paul B Mahol2015-02-07
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavc/lossless_audiodsp: revert various commitsChristophe Gisquet2015-02-07
| | | | | | | | | | | | | | Their intent was to make the DSP work with wmalossless pro. The later was fixed to work with the DSP. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wmalossless: reset lms_updateChristophe Gisquet2015-02-07
| | | | | | | | | | | | | | It may contain garbage at the end, and zeroing allows using DSP with longer loops. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pixdesc: Include more functions in FF_DISABLE_DEPRECATION_WARNINGSTimothy Gu2015-02-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/pixfmt: Clarify meaning of the A/X bit in RGB555 / remove wording ↵Michael Niedermayer2015-02-07
| | | | | | | | | | | | | | about significant bit Found-by:wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/pixfmt: Clarify the meaning of the alpha bits in rgb444 and similar ↵Michael Niedermayer2015-02-07
| | | | | | | | | | | | formats Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/pixfmt: Clarify the meaning of the "alpha" bit in rgb555/bgr555Michael Niedermayer2015-02-07
| | | | | | | | | | | | Found-by: wm4 Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/pixfmt: Clarify the meaning of the alpha byte in RGB0 and similar formatsMichael Niedermayer2015-02-07
| | | | | | | | | | | | | | | | Found-by: wm4 Reviewed-by: wm4 <nfxjfg@googlemail.com> Reviewed-by: Paul B Mahol <onemda@gmail.com> Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ccaption_dec: Added Debug logsAnshul Maheshwari2015-02-07
| | | | | | | | | | Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ccaption_dec: handle error from ass_sub apiAnshul Maheshwari2015-02-07
| | | | | | | | | | Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ccaption_dec: Added Roll up functionalityAnshul Maheshwari2015-02-07
| | | | | | | | | | Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9295d10ea9d138462b7f67d16bf95ae9ca76aca6'Michael Niedermayer2015-02-07
|\| | | | | | | | | | | | | * commit '9295d10ea9d138462b7f67d16bf95ae9ca76aca6': fate: Add a test for AAC ELD480. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: Add a test for AAC ELD480.Alex Converse2015-02-06
| | | | | | | | The source is er_eld_2100np_48_ep0.mp4 from the official test set.
* | avcodec/h264_slice: assert that reinit does not occur after the first sliceMichael Niedermayer2015-02-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264_slice: ignore SAR changes in slices after the firstMichael Niedermayer2015-02-07
| | | | | | | | | | | | | | | | Fixes race condition and null pointer dereference Fixes: signal_sigsegv_1472ac3_468_cov_2915641226_CABACI3_Sony_B.jsv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264_slice: Check picture structure before setting the related fieldsMichael Niedermayer2015-02-07
| | | | | | | | | | | | This might fix a hypothetical race condition Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264_slice: Do not change frame_num after the first sliceMichael Niedermayer2015-02-07
| | | | | | | | | | | | | | | | Fixes potential race condition Fixes: signal_sigsegv_1472ac3_468_cov_2915641226_CABACI3_Sony_B.jsv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86: lavc: share more constantsChristophe Gisquet2015-02-06
| | | | | | | | | | Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2015-02-06
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: lavc/tscc: Make 32bit output opaque. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavc/tscc: Make 32bit output opaque.Carl Eugen Hoyos2015-02-06
| | | | | | | | | | | | Found-by: wm4
* | | avutil/opt: Fix type used to access AV_OPT_TYPE_SAMPLE_FMTMichael Niedermayer2015-02-06
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avutil/opt: Fix types used to access AV_OPT_TYPE_PIXEL_FMTMichael Niedermayer2015-02-06
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | x86/hevc_mc: use aligned loadsMickaël Raulet2015-02-06
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | x86/lossless_audiodsp: fix compilation with --disable-yasmJames Almer2015-02-06
|/ / | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | nutdec: Remove unused variablesTimothy Gu2015-02-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | img2dec: Remove dead codeTimothy Gu2015-02-06
| | | | | | | | | | | | Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/avfft: Add simple self testMichael Niedermayer2015-02-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | generate_wave_table: Add include for AVSampleFormatTimothy Gu2015-02-06
| | | | | | | | | | | | Fixes warning in `make checkheaders`. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | audioconvert: Add missing include for FF_API_AUDIO_CONVERTTimothy Gu2015-02-06
| | | | | | | | | | | | Fixes warning in `make checkheaders`. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/hevc_sao: fix loading of RIP addressJames Almer2015-02-06
| | | | | | | | | | | | | | | | | | | | | | pb_eo must be handled as a rip relative address for MSVC64, so an intermediate register is needed. Should fix link failures. Suggested by Hendrik Leppkes and Christophe Gisquet. Tested-By: Hendrik Leppkes <h.leppkes@gmail.com> Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | x86/hevc: use CLIPW macro when possibleMickaël Raulet2015-02-06
| | | | | | | | | | | | | | | | Conflicts: libavcodec/x86/hevc_mc.asm Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86: hevc_mc: use epel_hv 16-wide functionChristophe Gisquet2015-02-06
| | | | | | | | | | | | | | The epel_hv functions were still relying on only epel_hv 8-wide being the maximum width instanciated. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86: hevc_mc: add AVX2 optimizationsPierre Edouard Lepere2015-02-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before 33304 decicycles in luma_bi_1, 523066 runs, 1222 skips 38138 decicycles in luma_bi_2, 523427 runs, 861 skips 13490 decicycles in luma_uni, 516138 runs, 8150 skips after 20185 decicycles in luma_bi_1, 519970 runs, 4318 skips 24620 decicycles in luma_bi_2, 521024 runs, 3264 skips 10397 decicycles in luma_uni, 515715 runs, 8573 skips Conflicts: libavcodec/x86/hevc_mc.asm libavcodec/x86/hevcdsp_init.c Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rpl: check av_get_packet() for failurePaul B Mahol2015-02-06
| | | | | | | | | | | | Also make ret signed as it should be from start. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/h264: Be more strict on rejecting pps/sps changesMichael Niedermayer2015-02-06
| | | | | | | | | | | | | | | | Fixes race condition Fixes: signal_sigsegv_1472ac3_468_cov_2915641226_CABACI3_Sony_B.jsv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: Be more strict on rejecting pps_id changesMichael Niedermayer2015-02-06
| | | | | | | | | | Fixes race condition Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/thp: check av_get_packet() for failurePaul B Mahol2015-02-06
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/h264_ps: More completely check the bit depthsMichael Niedermayer2015-02-06
| | | | | | | | | | | | | | | | Fixes out of array read Fixes: asan_static-oob_30328b6_719_cov_3325483287_H264_artifacts_motion.h264 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/tta: only check for header and seek table crc if requestedJames Almer2015-02-05
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | Revert "avcodec/x86/lossless_audiodsp: Make scalarproduct_and_madd_int16 ↵Michael Niedermayer2015-02-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | prototypes more similar" This reverts commit 3b4ffba3af968ae702e3a44f6b5f53445efc7363. Unbreaks the SSSE3 code on mingw32 Conflicts: libavcodec/x86/lossless_audiodsp.asm Signed-off-by: Michael Niedermayer <michaelni@gmx.at>