summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* doc/indevs: Docs for Blackmagic high bit depth video/audioGeorg Lippitsch2015-02-091-3/+31
| | | | | Reviewed-by: Timothy Gu <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* hevcdsp: ARM NEON optimized transformsSeppo Tomperi2015-02-083-1/+495
| | | | | | cherry picked from commit b153f55935969c794de4640f8d34e01c58e027ae Signed-off-by: Michael Niedermayer <[email protected]>
* x86: hevc_mc: remove lea in EPEL_LOADChristophe Gisquet2015-02-081-12/+7
| | | | | | | The second parameter to the macro is always an immediate address, so no lea is needed. Signed-off-by: Michael Niedermayer <[email protected]>
* x86: hevc_mc: fewer gpr autoloads for _v filtersChristophe Gisquet2015-02-081-6/+12
| | | | | | In that case, it's just to load my, but mx/r3src is not used. Signed-off-by: Michael Niedermayer <[email protected]>
* doc/APIchanges: updated Data stream changes in APIChangeAnshul Maheshwari2015-02-081-0/+3
| | | | | Signed-off-by: Anshul Maheshwari <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2015-02-081-1/+5
|\ | | | | | | | | | | | | * cehoyos/master: Fix standalone compilation of the mov muxer with --disable-optimizations. Merged-by: Michael Niedermayer <[email protected]>
| * Fix standalone compilation of the mov muxer with --disable-optimizations.Carl Eugen Hoyos2015-02-081-1/+5
| | | | | | | | Reported-by: Bernhard Döbler
* | avfilter/hqdn3d: an invalid bit depth means a bug, not invalid read dataClément Bœsch2015-02-081-1/+1
| | | | | | | | This code looks clumsy, and an assert would probably be more welcome.
* | avformat/internal: fix av_interleaved_write_frame typo referenceClément Bœsch2015-02-081-1/+1
| |
* | avfilter/dctdnoiz: fix slice_h computationClément Bœsch2015-02-081-1/+1
| | | | | | | | | | | | | | ceilf() can only work if the reminder of the division is not 0. This fixes memory errors with for instance: ffmpeg -f lavfi -i testsrc=s=800x500 -threads 3 -vf dctdnoiz -frames:v 1 -f null -
* | avformat/mxfenc: Remove unused variablesMichael Niedermayer2015-02-081-2/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | lavfi/subtitles: add force_style optionEejya Singh2015-02-083-1/+34
| | | | | | | | | | Signed-off-by: Eejya Singh <[email protected]> Signed-off-by: Clément Bœsch <[email protected]>
* | avdevice/decklink_common: Use defined(__APPLE__) instead of __APPLE__Michael Niedermayer2015-02-081-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | x86/vp9dsp: fix clobbering of xmm6 on IDCT sse2 functionsJames Almer2015-02-081-0/+3
| | | | | | | | | | Reviewed-by: Ronald S. Bultje <[email protected]> Signed-off-by: James Almer <[email protected]>
* | avdevice/decklink_common: Fix Decklink for MacGeorg Lippitsch2015-02-081-0/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avdevice/decklink: 10 Bit support for Decklink input deviceGeorg Lippitsch2015-02-083-4/+16
| | | | | | | | | | | | | | Example to capture video clip at 1080i50 10 bit: ffmpeg -bm_v210 1 -f decklink -i 'UltraStudio Mini Recorder@11' -acodec copy -vcodec copy output.avi Signed-off-by: Michael Niedermayer <[email protected]>
* | libavformat/mxfenc.c: added mxf opatom muxerMark Reid2015-02-082-13/+127
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2015-02-082-1/+32
|\| | | | | | | | | | | | | | | * cehoyos/master: Support decoding yuv dpx images. Do not use -mdynamic-no-pic on OSX x86_64. Merged-by: Michael Niedermayer <[email protected]>
| * Support decoding yuv dpx images.Carl Eugen Hoyos2015-02-081-0/+31
| |
| * Do not use -mdynamic-no-pic on OSX x86_64.Carl Eugen Hoyos2015-02-081-1/+1
| | | | | | | | Fixes default compilation with icc.
* | avcodec/utils: Assert that dst->progress is clear before ff_thread_ref_frame()Michael Niedermayer2015-02-081-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/h264: Setup decoder to have matching reference to the EC codeMichael Niedermayer2015-02-082-9/+18
| | | | | | | | | | | | | | | | | | Also move EC ref initialization to where the EC code is called. Fixes out of array read Fixes: asan_heap-uaf_143f420_142_20110805_112659_ch0.mkv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/h264: Move COPY_PICTURE() to h264.h so it can be used from other ↵Michael Niedermayer2015-02-082-7/+7
|/ | | | | | parts of the h264 decoder Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/omadec: Subtract headersize in timestamp calculationMichael Niedermayer2015-02-071-2/+2
| | | | | | Fixes pts/dts Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/omadec: only compute timestamps based on bitrate if its setMichael Niedermayer2015-02-071-1/+1
| | | | | | Fixes division by zero Signed-off-by: Michael Niedermayer <[email protected]>
* Merge commit 'e352520e3ed7f08f19e63cd60e95da6bb6f037c1'Michael Niedermayer2015-02-071-3/+13
|\ | | | | | | | | | | | | * commit 'e352520e3ed7f08f19e63cd60e95da6bb6f037c1': oma: Report a timestamp Merged-by: Michael Niedermayer <[email protected]>
| * oma: Report a timestampLuca Barbato2015-02-071-3/+13
| | | | | | | | | | | | Reported-By: [email protected] Signed-off-by: Luca Barbato <[email protected]>
* | Merge commit '8029af586fd5a5f2a0803001f9eff386e5545fe2'Michael Niedermayer2015-02-070-0/+0
|\| | | | | | | | | | | | | | | * commit '8029af586fd5a5f2a0803001f9eff386e5545fe2': dxva2_hevc: properly fill the scaling list structure See: b11994593ae4c3856db735800f24d38293838759 Merged-by: Michael Niedermayer <[email protected]>
| * dxva2_hevc: properly fill the scaling list structureHendrik Leppkes2015-02-071-8/+14
| | | | | | | | | | | | | | | | 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 <[email protected]>
* | x86: lavc/hevc_mc: fix commentsChristophe Gisquet2015-02-071-7/+5
| | | | | | | | | | | | | | 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 <[email protected]>
* | avcodec/faxcompr: use init_get_bits8()Paul B Mahol2015-02-071-1/+2
| | | | | | | | Signed-off-by: Paul B Mahol <[email protected]>
* | hevc/sao: do in-place band filtering when possibleChristophe Gisquet2015-02-071-2/+9
| | | | | | | | | | | | | | The copies are only needed when data must be restored, so skip them when it must not be. Signed-off-by: Michael Niedermayer <[email protected]>
* | x86: lavc: share more constant through definesChristophe Gisquet2015-02-0712-37/+62
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | lavf/mlv: Only add streams that are supposed to contain frames.Carl Eugen Hoyos2015-02-071-13/+10
| | | | | | | | | | | | Fixes ticket #4296. Reviewed-by: Peter Ross
* | avcodec/twinvqdec: use init_get_bits8()Paul B Mahol2015-02-071-2/+3
| | | | | | | | Signed-off-by: Paul B Mahol <[email protected]>
* | lavc/lossless_audiodsp: revert various commitsChristophe Gisquet2015-02-072-25/+4
| | | | | | | | | | | | | | 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 <[email protected]>
* | wmalossless: reset lms_updateChristophe Gisquet2015-02-071-12/+14
| | | | | | | | | | | | | | It may contain garbage at the end, and zeroing allows using DSP with longer loops. Signed-off-by: Michael Niedermayer <[email protected]>
* | pixdesc: Include more functions in FF_DISABLE_DEPRECATION_WARNINGSTimothy Gu2015-02-071-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avutil/pixfmt: Clarify meaning of the A/X bit in RGB555 / remove wording ↵Michael Niedermayer2015-02-071-4/+4
| | | | | | | | | | | | | | about significant bit Found-by:wm4 Signed-off-by: Michael Niedermayer <[email protected]>
* | avutil/pixfmt: Clarify the meaning of the alpha bits in rgb444 and similar ↵Michael Niedermayer2015-02-071-4/+4
| | | | | | | | | | | | formats Signed-off-by: Michael Niedermayer <[email protected]>
* | avutil/pixfmt: Clarify the meaning of the "alpha" bit in rgb555/bgr555Michael Niedermayer2015-02-071-4/+4
| | | | | | | | | | | | Found-by: wm4 Reviewed-by: wm4 <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avutil/pixfmt: Clarify the meaning of the alpha byte in RGB0 and similar formatsMichael Niedermayer2015-02-071-4/+4
| | | | | | | | | | | | | | | | Found-by: wm4 Reviewed-by: wm4 <[email protected]> Reviewed-by: Paul B Mahol <[email protected]> Reviewed-by: Carl Eugen Hoyos <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/ccaption_dec: Added Debug logsAnshul Maheshwari2015-02-071-1/+6
| | | | | | | | | | Signed-off-by: Anshul Maheshwari <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/ccaption_dec: handle error from ass_sub apiAnshul Maheshwari2015-02-071-1/+4
| | | | | | | | | | Signed-off-by: Anshul Maheshwari <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/ccaption_dec: Added Roll up functionalityAnshul Maheshwari2015-02-071-29/+71
| | | | | | | | | | Signed-off-by: Anshul Maheshwari <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '9295d10ea9d138462b7f67d16bf95ae9ca76aca6'Michael Niedermayer2015-02-071-0/+4
|\| | | | | | | | | | | | | * commit '9295d10ea9d138462b7f67d16bf95ae9ca76aca6': fate: Add a test for AAC ELD480. Merged-by: Michael Niedermayer <[email protected]>
| * fate: Add a test for AAC ELD480.Alex Converse2015-02-061-0/+4
| | | | | | | | 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-071-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/h264_slice: ignore SAR changes in slices after the firstMichael Niedermayer2015-02-071-1/+3
| | | | | | | | | | | | | | | | 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 <[email protected]>
* | avcodec/h264_slice: Check picture structure before setting the related fieldsMichael Niedermayer2015-02-071-14/+17
| | | | | | | | | | | | This might fix a hypothetical race condition Signed-off-by: Michael Niedermayer <[email protected]>