summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '944f60866f507e3c0850ae9c2f30dac1da54587c'Hendrik Leppkes2015-08-07
|\ | | | | | | | | | | | | * commit '944f60866f507e3c0850ae9c2f30dac1da54587c': asfdec: read values properly Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * asfdec: read values properlyAlexandra Hájková2015-08-04
| | | | | | | | | | | | | | The length of BOOL values is 16 bits in the Metadata Object but 32 bits in the Extended Content Description Object. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | aacenc: Move local encoder specific tables to a separate fileRostislav Pehlivanov2015-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves any tables specific to the encoder from aacenc and aaccoder to a separate file called 'aacenctab.c/.h'. This was done as a clean up attempt as the encoder was filled with tables pasted in between functions which made it confusing to follow and track where each table and definition had been used. This commit solves this by simply exporting the smaller tables out to the aacenctab.h while the larger ones are compiled using aacenctab.c and are referenced from the header file. Signed-off-by: Claudio Freire <klaussfreire@gmail.com>
* | x86/sbrdsp: remove an unnecessary mova in sbr_autocorrelateJames Almer2015-08-06
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | tests/fate/mp3: increase mp3-float-extra_overread FUZZ for ↵Michael Niedermayer2015-08-07
| | | | | | | | | | | | ppc64be-RHEL7.0-gcc-4.8.2-ibmcrl to 23 from 20 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/movtextdec: check that ftab has been allocated before dereferencing itMichael Niedermayer2015-08-06
| | | | | | | | | | | | Fixes potential null pointer dereference on deallocation Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | movtextdec.c: Add support for font namesNiklesh2015-08-06
| | | | | | | | Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
* | vc1dec: propagate error codes and return meaningful error codeswm42015-08-06
| |
* | avfilter/avf_showspectrum: use av_calloc()Paul B Mahol2015-08-06
| |
* | avcodec/diracdec: Move reference to DiracFrame, avoid use of the deprecated ↵Michael Niedermayer2015-08-06
| | | | | | | | | | | | field from AVFrame Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/options: Silence deprecated warning about coded_frameMichael Niedermayer2015-08-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavc: propagate hwaccel errorswm42015-08-06
| | | | | | | | | | | | | | | | At least the new videotoolbox decoder does not actually set a frame if end_frame fails. This causes the API to return success and signals that a picture was decoded, even though AVFrame->data[0] is NULL. Fix this by propagating end_frame errors.
* | avformat/matroskaenc: Avoid "for (int i" syntax for better compatibilityMichael Niedermayer2015-08-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | checkasm: Remove unnecessary includeHenrik Gramner2015-08-05
| |
* | avcodec: loongson optimized h264pred with mmi v2周晓勇2015-08-05
| | | | | | | | | | Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavformat/matroska: Write stream durations in metadata, in the format of ↵Sasi Inguva2015-08-05
| | | | | | | | | | | | | | | | | | mkvmerge. Compute individual stream durations in matroska muxer. Write them as string tags in the same format as mkvmerge tool does. Signed-off-by: Sasi Inguva <isasi@google.com>
* | ffplay: do not block audio thread on WIN32Marton Balint2015-08-05
| | | | | | | | | | | | | | | | | | | | | | The windows SDL audio driver plays the old data in the buffer in a loop if it is not updated in time. So instead of waiting for data and blocking the the audio thread, return silence if no data is available. Should fix ticket #2289. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* | x86inc: warn if XOP integer FMA instruction emulation is impossibleAnton Mitrofanov2015-08-05
| | | | | | | | Signed-off-by: Henrik Gramner <henrik@gramner.com>
* | avcodec/avcodec: Define CODEC_CAP_* based on AV_CODEC_CAP_*Michael Niedermayer2015-08-05
| | | | | | | | | | | | | | Avoid duplicating the literal numeric values Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/avcodec: Replace AV_CODEC_FLAG* values by 1 << C style for consistencyMichael Niedermayer2015-08-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/hapenc: Remove use of deprecated ff_alloc_packet()Michael Niedermayer2015-08-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | vf_psnr: add psnr_avg to stats file.Ronald S. Bultje2015-08-05
| |
* | Merge commit 'b197f78329615893201c0e241d00b71b7c749dbb'Hendrik Leppkes2015-08-05
|\| | | | | | | | | | | | | * commit 'b197f78329615893201c0e241d00b71b7c749dbb': configure: Silence error messages when probing compiler Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * configure: Silence error messages when probing compilerShiz2015-08-04
| | | | | | | | | | | | | | | | | | | | | | On Xcode's clang on OS X, $cc --version will output a 'Configured with:' line to stderr, which clobbers the configure script output. As this line serves no further purpose, it should be silenced. The same applies to apple-gcc 4.2.1, which complains that it can not understand the kernel version it is running on. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '98c9ade9853a9c413534ef243174d65f3f7506fa'Hendrik Leppkes2015-08-05
|\| | | | | | | | | | | | | | | | | * commit '98c9ade9853a9c413534ef243174d65f3f7506fa': drawtext: Move the strftime expansion in a separate function Not merged, the code does not exist anymore. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * drawtext: Move the strftime expansion in a separate functionLuca Barbato2015-08-02
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'fe026ba960790a004adfcff33f44f96b05538e5c'Hendrik Leppkes2015-08-05
|\| | | | | | | | | | | | | | | | | | | * commit 'fe026ba960790a004adfcff33f44f96b05538e5c': drawtext: Drop stray guards Conflicts: libavfilter/vf_drawtext.c Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * drawtext: Drop stray guardsLuca Barbato2015-08-02
| | | | | | | | | | | | There is a fallback for localtime_r and it is in use already. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '4fee11ab05fc8569ef35c0ce86a60375c903eefb'Hendrik Leppkes2015-08-05
|\| | | | | | | | | | | | | | | | | | | * commit '4fee11ab05fc8569ef35c0ce86a60375c903eefb': png: Be more informative regarding signature errors Conflicts: libavcodec/pngdec.c Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * png: Be more informative regarding signature errorsLuca Barbato2015-08-02
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avcodec/dvbsubdec: Do not stop decoding at a invalid depthMichael Niedermayer2015-08-05
| | | | | | | | | | | | | | | | This corrects parsing the later elements Fixes Ticket4754 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/nvenc: Add support for 2pass rc in vbr modeTimo Rothenpieler2015-08-04
| | | | | | | | | | | | Thanks to WereCatf for pointing out this now exists. Github: Closes #143
* | avcodec/nvenc: Only set h264 parameter when encoding h264Timo Rothenpieler2015-08-04
| |
* | avcodec/nvenc: Fix indentationTimo Rothenpieler2015-08-04
| |
* | wmv2enc: remove duplicate priv_class in codec definitionHendrik Leppkes2015-08-04
| |
* | lavf/swf: Fix auto-detection of compressed files.Carl Eugen Hoyos2015-08-04
| | | | | | | | | | | | Fixes auto-detection of compressed swf files as in http://samples.ffmpeg.org/SWF/compressed-swf/ Reported by forum user Zard1096.
* | x86inc: Drop SECTION_TEXT macroHenrik Gramner2015-08-04
| | | | | | | | | | The .text section is already 16-byte aligned by default on all supported platforms so `SECTION_TEXT` isn't any different from `SECTION .text`.
* | x86inc: Support arbitrary stack alignmentsHenrik Gramner2015-08-04
| | | | | | | | | | | | Change ALLOC_STACK to always align the stack before allocating stack space for consistency. Previously alignment would occur either before or after allocating stack space depending on whether manual alignment was required or not.
* | ffmpeg: remove access to private FILE struct members on WindowsHendrik Leppkes2015-08-04
| | | | | | | | | | | | | | | | The FILE struct is opaque in MSVC 2015, and the members of this struct were never meant to be accessed in any case. No conditions are known where this check was needed to get characters from stdin.
* | ffmpeg: avoid scanf in keyboard command parsingHendrik Leppkes2015-08-04
| | | | | | | | Mixing stdio and low-level IO on stdin is not safe.
* | MAINTAINERS: Add myself to vdpau maintainersPhilip Langdale2015-08-04
| |
* | avcodec/vdpau_hevc: Properly signal the num_delta_pocs from the SPS RPSPhilip Langdale2015-08-04
| | | | | | | | | | | | This is the same fix that Hendrik made to dxva2_hevc. It should be equally required here, although I don't see any visual difference. Nevertheless, best to stay consistent.
* | avcodec/vdpau_hevc: Remove experimental flagPhilip Langdale2015-08-04
| | | | | | | | | | | | | | The latest nvidia 355.06 drivers fixes the interleaving bug when video surfaces are rendered. It still seems to be broken for read-back with getBits but that's sufficiently uninteresting that I don't think we need to wait for it to remove the flag.
* | avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP8 functionsShivraj Patil2015-08-04
| | | | | | | | Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
* | avfilter/avf_showspectrum: reindentPaul B Mahol2015-08-04
| |
* | lavc/dvbsub: Do not fail on clut depth 0.Carl Eugen Hoyos2015-08-04
| | | | | | | | Fixes ticket #4752.
* | lavd/v4l2: Use AVSTREAM_PARSE_FULL_ONCE when reading a h264 stream.Carl Eugen Hoyos2015-08-04
| | | | | | | | | | Reported, debugged and tested by trac user noah. Fixes ticket #4644.
* | avcodec/dvbsubdec: Allow selecting the substream, or all substreamsMichael Niedermayer2015-08-04
| | | | | | | | | | | | Fixes Ticket 2161 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/mxfdec: support segmented frame layout as separate fields layoutMatthieu Bouron2015-08-04
| | | | | | | | | | | | | | | | | | According to S377M, segmented frame layout is identical to separate field layout except that the two fields are taken from a single scan of the incoming image, ie: they are coincident in time. Thus the resulting frame is progressive. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | configure: Silence error messages when probing compiler.Shiz2015-08-04
| | | | | | | | | | | | | | | | | | | | | | | | On Xcode's clang on OS X, $cc --version will output a 'Configured with:' line to stderr, which clobbers the configure script output. As this line serves no further purpose, it should be silenced. The same applies to apple-gcc 4.2.1, which complains that it can not understand the kernel version it is running on. Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>