summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ffmpeg_dxva2: fix mixing of declarations and statementsMichael Niedermayer2014-04-291-1/+2
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a'Michael Niedermayer2014-04-293-6/+9
|\ | | | | | | | | | | | | | | | | | | | | * commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a': configure: rework dxva in avconv handling Conflicts: Makefile configure Merged-by: Michael Niedermayer <[email protected]>
| * configure: rework dxva in avconv handlingAnton Khirnov2014-04-283-5/+9
| | | | | | | | | | | | | | Move the dxva check after the dependencies have been detected, make sure the ole32 library exists. Fixes build on non-Windows.
* | Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'Michael Niedermayer2014-04-297-0/+637
|\| | | | | | | | | | | | | | | | | | | | | * commit '35177ba77ff60a8b8839783f57e44bcc4214507a': avconv: add support for DXVA2 decoding Conflicts: Makefile configure Merged-by: Michael Niedermayer <[email protected]>
| * avconv: add support for DXVA2 decodingHendrik Leppkes2014-04-287-0/+635
| | | | | | | | Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit 'b2b4afe8115fe3c8b005d663610e5af06f110165'Michael Niedermayer2014-04-290-0/+0
|\| | | | | | | | | | | | | | | * commit 'b2b4afe8115fe3c8b005d663610e5af06f110165': hwaccel: fix dxva2 & vaapi loop filter parameters See: 0ad8f73f137dad1f3d0f818e22bdb2949186e9ec Merged-by: Michael Niedermayer <[email protected]>
| * hwaccel: fix dxva2 & vaapi loop filter parametersMichael Niedermayer2014-04-282-4/+4
| | | | | | | | Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit 'ed4b757177f9b563412cdbc8ee3405d82e10fc05'Michael Niedermayer2014-04-292-1/+4
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'ed4b757177f9b563412cdbc8ee3405d82e10fc05': dxva2_h264: add a workaround for old Intel GPUs Conflicts: doc/APIchanges libavcodec/version.h See: 8b2a130d3fe61e348092714dffa425b63c4d796c Merged-by: Michael Niedermayer <[email protected]>
| * dxva2_h264: add a workaround for old Intel GPUsHendrik Leppkes2014-04-284-2/+12
| | | | | | | | | | | | | | | | | | | | Old Intel GPUs expect the reference frame index to the actual surface, instead of the index into RefFrameList as specified by the spec. This workaround should be set when using one of the "ClearVideo" decoder devices. Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit '2fcef90bee98bffeff1d95b7197738f50c450d86'Michael Niedermayer2014-04-290-0/+0
|\| | | | | | | | | | | | | | | | | | | | | * commit '2fcef90bee98bffeff1d95b7197738f50c450d86': dxva2_h264: set the correct ref frame index in the long slice struct Conflicts: libavcodec/dxva2_h264.c See: 276839b8de7ff836a529bbd6221f615a343b23e1 Merged-by: Michael Niedermayer <[email protected]>
| * dxva2_h264: set the correct ref frame index in the long slice structHendrik Leppkes2014-04-281-4/+14
| | | | | | | | | | | | | | | | | | | | The latest H.264 DXVA specification states that the index in this structure should refer to a valid entry in the RefFrameList of the picture parameter structure, and not to the actual surface index. Fixes H.264 DXVA2 decoding on recent Intel GPUs (tested on Sandy and Ivy) Signed-off-by: Anton Khirnov <[email protected]>
* | ffmpeg: print an error at the end if conversion failedMichael Niedermayer2014-04-291-0/+2
| | | | | | | | | | | | Fixes Ticket3477 Signed-off-by: Michael Niedermayer <[email protected]>
* | Fix convertion typosMichael Niedermayer2014-04-292-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/hevc_cabac: decrease CABAC_MAX_BINMichael Niedermayer2014-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | Prevents shifts with undefined behavior Fixes CID1206634 Fixes CID1206635 Fixed CID1206636 Reviewed-by: smarter Signed-off-by: Michael Niedermayer <[email protected]>
* | configure: add support for new CPUsJames Almer2014-04-281-4/+11
| | | | | | | | | | | | | | | | Add new -march values for Intel CPUs (introduced with GCC 4.9.x), add support for the missing AMD btver* CPUs, and improve SunCC flags accordingly. Signed-off-by: James Almer <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/utils: Set the average frame rate from the r_frame_rate if the ↵Michael Niedermayer2014-04-281-0/+9
| | | | | | | | | | | | | | | | stream appears to be cfr This permits the average fps to be set in more cases Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/utils: Ensure that average fps is probed if requested by the user ↵Michael Niedermayer2014-04-281-2/+3
| | | | | | | | | | | | even if tb_unreliable() is 0 Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '1eb57e1d9b59db0aa63348c21bf3290bd3f5efcb'Michael Niedermayer2014-04-280-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1eb57e1d9b59db0aa63348c21bf3290bd3f5efcb': lavc: eliminate tb_unreliable() Conflicts: libavformat/utils.c tb_unreliable() is used in several other parts of libavformat and thus isnt removed The remaining change is a removial of a call to tb_unreliable() which would cause a practically unconditional delay of about 1 second in startup for live streams. I will implement what the commit message claims the change should do in the next commit This is thus, not merged Merged-by: Michael Niedermayer <[email protected]>
| * lavc: eliminate tb_unreliable()Anton Khirnov2014-04-281-19/+1
| | | | | | | | | | If framerate estimation is enabled, it makes sense to always apply it, instead of limiting it to a few specific cases.
* | avformat/utils: prevent r frame rate from being set larger than 1/tbMichael Niedermayer2014-04-282-158/+159
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/utils: add gif to tb_unreliable()Michael Niedermayer2014-04-2811-1220/+1220
| | | | | | | | | | | | This improves the used timebases when gif is the source Signed-off-by: Michael Niedermayer <[email protected]>
* | avfilter/graphdump: Fix pointer to local outside scopeMichael Niedermayer2014-04-281-1/+2
| | | | | | | | | | Fixes CID1194435 Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/mpeg12enc: increase declared size of block function argumentMichael Niedermayer2014-04-281-2/+2
| | | | | | | | | | Fixes CID1047236 Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg_filter: make *jpeg_formats static constMichael Niedermayer2014-04-281-3/+5
| | | | | | | | | | Found-by: Reimar Döffinger <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/mjpegdec: make type of shift unsigned to avoid undefined behaviorMichael Niedermayer2014-04-281-1/+1
| | | | | | | | | | Found-by: Reimar Döffinger <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/h264_cabac: fix indentionMichael Niedermayer2014-04-281-1/+1
| | | | | | | | | | Fixes CID1087088 Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/g729postfilter: avoid potential negative shiftMichael Niedermayer2014-04-271-1/+1
| | | | | | | | | | | | Fixes CID1194402 Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/tiff: Support yuv 420 and 444Michael Niedermayer2014-04-271-6/+82
| | | | | | | | | | | | Fixes Ticket416 Trolled-by: jb Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/tiff: parse subsample factorsMichael Niedermayer2014-04-271-0/+11
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | lavd/fbdev_enc: fix not closed handlesLukasz Marek2014-04-271-1/+2
| | | | | | | | | | | | | | Fixes CID 1206651 Signed-off-by: Lukasz Marek <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mlvdec: close any additional .Mxx filesPeter Ross2014-04-271-0/+4
| | | | | | | | | | Signed-off-by: Peter Ross <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mlvdec: remove unused MlvContext.bufferPeter Ross2014-04-271-3/+0
| | | | | | | | | | Signed-off-by: Peter Ross <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Fix bistream typosMichael Niedermayer2014-04-272-2/+2
| | | | | | | | | | Found-by: wm4 Signed-off-by: Michael Niedermayer <[email protected]>
* | fix bistream typosMichael Niedermayer2014-04-272-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Fix overriden typosMichael Niedermayer2014-04-272-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Fix teh typosMichael Niedermayer2014-04-271-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Fix dont and doesnt typosMichael Niedermayer2014-04-273-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-04-271-1/+0
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: lavf/mpeg.h: Remove an unused definition. Merged-by: Michael Niedermayer <[email protected]>
| * | lavf/mpeg.h: Remove an unused definition.Carl Eugen Hoyos2014-04-271-1/+0
| | | | | | | | | | | | Fixes a warning when compiling mpegts.c.
* | | Fix skiping typosMichael Niedermayer2014-04-274-5/+5
|/ / | | | | | | | | Found-by: Alessandro Ghedini <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mlvdec: print unsigned chunk sizePeter Ross2014-04-271-1/+1
| | | | | | | | | | Signed-off-by: Peter Ross <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mlvdec: process ff_get_wav_header return valuePeter Ross2014-04-271-5/+17
| | | | | | | | | | | | | | Fixes CID1206640. Signed-off-by: Peter Ross <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mpegtsenc: Allow DTS audio copy to TS streamsgoodthanks2014-04-272-1/+8
| | | | | | | | | | | | | | | | | | This doesn't allow encoding of DTS or TrueHD. It just sets the correct stream ID in the TS output file when a DTS or TrueHD audio stream is copied. Fixes ticket #1398 Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-04-271-0/+3
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Try mov tags if the fourcc in V_MS/VFW mkv files cannot be found in bmp tags. Merged-by: Michael Niedermayer <[email protected]>
| * | Try mov tags if the fourcc in V_MS/VFW mkv files cannot be found in bmp tags.Carl Eugen Hoyos2014-04-271-0/+3
| | | | | | | | | | | | Fixes decoding of broken mkv files containing ProRes video from ticket #3434.
* | | avcodec/shorten: check bitshiftMichael Niedermayer2014-04-271-2/+9
|/ / | | | | | | | | | | | | Fixes invalid shift Fixes CID1194400 Signed-off-by: Michael Niedermayer <[email protected]>
* | avfilter/curves: fix resource leaks.Clément Bœsch2014-04-271-2/+4
| | | | | | | | Fixes CID1206650
* | avcodec/mjpegdec: Fix undefined shiftMichael Niedermayer2014-04-271-1/+1
| | | | | | | | | | | | Fixes CID1194388 Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/truemotion2: replace impossible condition by av_assert2Michael Niedermayer2014-04-271-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg_filter: fix pointer to local outside scopeMichael Niedermayer2014-04-271-3/+6
| | | | | | | | | | Fixes CID1206652 Signed-off-by: Michael Niedermayer <[email protected]>