summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '103391ca90b2f7c56ae756d76c76f7c3dfa28dd4'Michael Niedermayer2014-09-21
|\ | | | | | | | | | | | | * commit '103391ca90b2f7c56ae756d76c76f7c3dfa28dd4': dca: Remove some commented-out cruft Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dca: Remove some commented-out cruftDiego Biurrun2014-09-20
| |
* | avcodec/alacenc: Remove unused variableMichael Niedermayer2014-09-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | alacenc: remove unneeded maskingChristophe Gisquet2014-09-20
| | | | | | | | | | | | | | The extra bits have already been masked, so this was not doing anything. Noticed-by: Justin Ruggles Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | alacenc: fix incorrect buffer useChristophe Gisquet2014-09-20
| | | | | | | | | | | | | | The issue lies in actually dead code ("for now it's not used"). Noticed-by: Justin Ruggles Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mp3dec: fix gapless audio supportwm42014-09-20
| | | | | | | | | | | | | | | | | | | | | | | | The code already had skipping of initial padding, but discarding trailing frame padding was missing. This is somewhat questionable, because it will make the decoder discard any data after the declared file size in the LAME header. But note that skipping full frames at the end of the stream is required. Encoders actually create such files. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/idet: typo fix: PROGRSSIVE -> PROGRESSIVEPascal Massimino2014-09-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/me_cmp: port mmxext vsad functions to yasmJames Almer2014-09-19
| | | | | | | | | | | | | | | | | | | | Also add mmxext versions of vsad8 and vsad_intra8, and sse2 versions of vsad16 and vsad_intra16. Since vsad8 and vsad16 are not bitexact, they are accordingly marked as approximate. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec/dvdsubdec: fix VD/SD identifier nameMichael Niedermayer2014-09-19
| | | | | | | | | | Found-by: Nicholas Robbins <nickrobbins-at-yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/os_support: Add _DEFAULT_SOURCE to hide warning about _SVID_SOURCE ↵Daniel Bomar2014-09-19
| | | | | | | | | | | | | | | | | | | | depreciation As suggested, this just adds _DEFAULT_SOURCE while preserving _SVID_SOURCE for whatever old systems still need it. Signed-off-by: Daniel Bomar <dbdaniel42@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tests/utils: make arguments const that arent changedMichael Niedermayer2014-09-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dv_profile: deprecate internal function that shouldn't be publicJames Almer2014-09-19
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | postproc/postprocess: Avoid some ifs in do_a_deblock_C()Michael Niedermayer2014-09-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec/webp: treat out-of-bound palette index as translucent blackPascal Massimino2014-09-19
| | | | | | | | | | | | | | | | | | | | | | | | See https://code.google.com/p/webp/issues/detail?id=206 for a description of the problem/fix. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> This patch makes the decoder follow the recommendation of the spec. There is some disagreement (see "[FFmpeg-devel] [PATCH]: libavcodec/webp") about what would be best to be written in the spec, so in case the spec is changed again, this potentially would need to be amended or reverted
* | avcodec/libilbc: support for latest git of libilbcGianluigi Tiesi2014-09-19
| | | | | | | | | | | | | | | | | | | | | | | | in the latest git commits of libilbc developers removed WebRtc_xxx typedefs This commit uses int types instead, it's safe to apply also for previous versions since WebRtc_Word16 was always a typedef of int16_t and WebRtc_UWord16 a typedef of uint16_t Reviewed-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | postproc: Replace CLIP by av_clip_uint8Michael Niedermayer2014-09-19
| | | | | | | | | | | | drop "#define CLIP av_clip_uint8" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | postproc/postprocess: remove redundant castsMichael Niedermayer2014-09-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | postproc/postprocess: Use FF_ARRAY_ELEMS() in pp_free_context() instead of ↵Michael Niedermayer2014-09-18
| | | | | | | | | | | | hard-coding their size Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | postproc/postprocess: Remove unused argument from reallocAlign()Michael Niedermayer2014-09-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge branch 'postprocwork'Michael Niedermayer2014-09-18
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * postprocwork: postproc/postprocess: use av_strtok() postprocess: make some variables in pp_get_mode_by_name_and_quality() const postproc: simplify forwarding return codes libpostproc/postprocess: avoid some if() fate: add fate-filter-pp1 This is merged instead of just fast forward pushed due to a bug in the git hook which does not allow commits to change filter-video.mak except merge commits. filter-video.mak contains a few tabs, which are needed due to Makefile syntax Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | postproc/postprocess: use av_strtok()Michael Niedermayer2014-09-18
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * | postprocess: make some variables in pp_get_mode_by_name_and_quality() constMichael Niedermayer2014-09-18
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * | postproc: simplify forwarding return codesMichael Niedermayer2014-09-18
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * | libpostproc/postprocess: avoid some if()Michael Niedermayer2014-09-18
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * | fate: add fate-filter-pp1Michael Niedermayer2014-09-18
|/ / | | | | | | | | | | This tests a few more filters with forced quantizers Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/me_cmp: combine sad functions into a single macroJames Almer2014-09-17
| | | | | | | | | | | | | | | | No point in having the sad8 functions separate now that the loop is no longer unrolled. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '2bb2c2bd75e5f4b28a945511cda77e0a1a44c758'Michael Niedermayer2014-09-18
|\| | | | | | | | | | | | | | | * commit '2bb2c2bd75e5f4b28a945511cda77e0a1a44c758': rtpenc_chain: Pass the initial time_base hint on to the chained muxer See: [FFmpeg-devel] [PATCH] avformat/rtpenc_chain: Set timebase Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_chain: Pass the initial time_base hint on to the chained muxerMartin Storsjö2014-09-17
| | | | | | | | | | | | | | | | | | | | | | | | In practice this hint is ignored - the rtp muxer always overwrites the stream time base without taking the hint into account. But as a general practice this is the correct way to pass a time base hint on to a chained muxer. This avoids warnings about using the codec time base as hint being deprecated. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '3f2c70355ab722bc9f741bd3ed8224c7cfb62379'Michael Niedermayer2014-09-18
|\| | | | | | | | | | | | | | | * commit '3f2c70355ab722bc9f741bd3ed8224c7cfb62379': configure: Use the right variables in check_host_cpp See: 453944cc77b9ea27c74011eb7c0e20c887b321cf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Use the right variables in check_host_cppJörg Krause2014-09-17
| | | | | | | | | | | | HOSTCPPFLAGS and HOSTCFLAGS are only set in config.mak. Signed-off-by: Martin Storsjö <martin@martin.st>
* | vf_deshake: rename Transform.vector to Transform.vec to avoid compiler confusionAndreas Cadhalpun2014-09-18
| | | | | | | | | | | | | | | | | | The token 'vector' is a keyword in the Vector/SIMD Multimedia Extension data types and thus should not be used as a variable name. This fixes building on powerpc/ppc64el. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale/x86: do not expect registers to be preserved across inline ASM blocksVitor Sessak2014-09-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/x86/vp9lpf: Always include x86util.asmMichael Niedermayer2014-09-17
| | | | | | | | | | | | Fixes executable stack Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c5560e72d0bb69f8a1ac9536570398f84388f396'Michael Niedermayer2014-09-17
|\| | | | | | | | | | | | | * commit 'c5560e72d0bb69f8a1ac9536570398f84388f396': apetag: Fix APE tag size check Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * apetag: Fix APE tag size checkKaterina Barone-Adesi2014-09-17
| | | | | | | | | | | | | | | | | | | | The size variable is (correctly) unsigned, but is passed to several functions which take signed parameters, such as avio_read, sometimes after having numbers added to it. So ensure that size remains within the bounds that these functions can handle. CC: libav-stable@libav.org Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | fate: disable fate-ra4-288, the code uses floats and does not produce the ↵Michael Niedermayer2014-09-17
| | | | | | | | | | | | same results on different platforms Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '44caf99ecae7bc1b907fab849ecaa72dd340ba2e'Michael Niedermayer2014-09-17
|\| | | | | | | | | | | | | | | | | | | * commit '44caf99ecae7bc1b907fab849ecaa72dd340ba2e': fate: Add tests for RealAudio 1.0 (14.4) and RealAudio 2.0 (with 28.8) Conflicts: tests/fate/real.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: Add tests for RealAudio 1.0 (14.4) and RealAudio 2.0 (with 28.8)Katerina Barone-Adesi2014-09-17
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avfilter: remove obsolete FF_API_FILL_FRAME cruftJames Almer2014-09-17
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286'Michael Niedermayer2014-09-17
|\| | | | | | | | | | | | | | | | | | | * commit '2dd09ebf5597fd5e4a573bee9cccf21ae821f286': cmdutils: Print a more sensible message in show_filters() w/o libavfilter Conflicts: cmdutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: Print a more sensible message in show_filters() w/o libavfilterDiego Biurrun2014-09-16
| | | | | | | | Also avoid an unused variable warning for compilers w/o av_unused support.
* | avcodec/x86/me_cmp: fix sad8xhMichael Niedermayer2014-09-17
| | | | | | | | | | | | | | | | This adds back support for 8x4 and 8x16 it does not support 8x2, i think nothing uses that Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/me_cmp: port mmxext and sse2 sad functions to yasmJames Almer2014-09-17
| | | | | | | | | | | | | | | | | | | | Also add a missing c->pix_abs[0][0] initialization, and sse2 versions of sad16_x2, sad16_y2 and sad16_xy2 (%15 to %20 faster than mmxext). Since the _xy2 versions are not bitexact, they are accordingly marked as approximate. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/filters: remove aconvertPaul B Mahol2014-09-17
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter: remove obsolete FF_API_ACONVERT_FILTER cruftJames Almer2014-09-17
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | ffplay: try to fix build failure on appleMichael Niedermayer2014-09-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2014-09-17
|\ \ | | | | | | | | | | | | | | | | | | | | | * cus/stable: ffplay: use frame queue to determine last used pos ffplay: factorize frame queue operations Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ffplay: use frame queue to determine last used posMarton Balint2014-09-16
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: factorize frame queue operationsMarton Balint2014-09-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | Create a generic frame and a frame queue struct to handle video picture queues and subtitle picture queues with common code. Also add the possibility to queue AVFrames, however at the moment we only use SDL_Overlay buffers for video and AVSubtitles for subtitles. Signed-off-by: Marton Balint <cus@passwd.hu>
* | | avformat/avienc: Dont search for startcodes in inserted empty avi framesMichael Niedermayer2014-09-17
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>