summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | avcodec/mjpegdec: factorize some parts of the pix_fmt_id switch()Michael Niedermayer2014-07-011-12/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/mjpegdec: handle luma upscale detection genericallyMichael Niedermayer2014-07-011-2/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/mjpegdec: set upscale_h/upscale_v using generic code instead of ↵Michael Niedermayer2014-07-011-8/+11
| | | | | | | | | | | | | | | | hardcoding a list Some code is left to handle corner cases Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/mjpegdec: Support pix_fmt_id==0x11222200Michael Niedermayer2014-07-011-2/+11
| | | | | | | | | | | | Fixes: 4858286_300.jpg Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/mjpegdec: fix width for non chroma in rescalingMichael Niedermayer2014-07-011-4/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | mjpegdec: Support pix_fmt_id == 0x22112200Michael Niedermayer2014-07-011-2/+3
| | | | | | | | | | | | Fixes 4780490_300.jpg Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4'Michael Niedermayer2014-07-011-8/+16
|\| | | | | | | | | | | | | | | | | | | * commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4': matroska: Factor out mkv_write_stereo_mode Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <[email protected]>
| * matroska: Factor out mkv_write_stereo_modeLuca Barbato2014-07-011-17/+22
| |
* | Merge commit 'b75a1f9892b5b715397edbf837e4d4cda337907b'Michael Niedermayer2014-07-011-251/+275
|\| | | | | | | | | | | | | | | | | | | * commit 'b75a1f9892b5b715397edbf837e4d4cda337907b': matroska: Factor out write_track from mkv_write_tracks Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <[email protected]>
| * matroska: Factor out write_track from mkv_write_tracksLuca Barbato2014-07-011-169/+193
| |
* | Merge commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e'Michael Niedermayer2014-07-011-204/+247
|\| | | | | | | | | | | | | | | | | | | * commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e': matroska: K&R formatting cosmetics Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <[email protected]>
| * matroska: K&R formatting cosmeticsLuca Barbato2014-07-011-168/+212
| |
* | Merge commit 'd0449e754553b0c110b6cd75f6725b82144fbd2a'Michael Niedermayer2014-07-010-0/+0
|\| | | | | | | | | | | | | | | * commit 'd0449e754553b0c110b6cd75f6725b82144fbd2a': vaapi: Update idct_permutation location after dsputil/idctdsp split See: 581b5f0b9b93969712e73e0ae6324bbd03e85d4e Merged-by: Michael Niedermayer <[email protected]>
| * vaapi: Update idct_permutation location after dsputil/idctdsp splitDiego Biurrun2014-07-012-2/+2
| |
* | x86/swr: convert resample_{common, linear}_double_sse2 to yasmJames Almer2014-07-014-169/+74
| | | | | | | | | | | | | | | | Signed-off-by: James Almer <[email protected]> 312531 -> 311528 dezicycles Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '20f95f21f9b9595608ba668a6eca78f2d508be67'Michael Niedermayer2014-07-012-3/+6
|\| | | | | | | | | | | | | * commit '20f95f21f9b9595608ba668a6eca78f2d508be67': mov: Support default-base-is-moof. Merged-by: Michael Niedermayer <[email protected]>
| * mov: Support default-base-is-moof.Yusuke Nakamura2014-07-012-3/+6
| | | | | | | | | | | | | | | | | | default-base-is-moof shall be set to track fragments compatible with DASH Media Segments. So, this is a fundamental support for ISOBMFF ver. DASH. This is meaningful only when base-data-offset-present is absent and two or more track fragments are present in a movie fragment. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '79793f833784121d574454af4871866576c0749d'Michael Niedermayer2014-07-0115-15/+15
|\| | | | | | | | | | | | | * commit '79793f833784121d574454af4871866576c0749d': Update Fiona's name in copyright statements. Merged-by: Michael Niedermayer <[email protected]>
| * Update Fiona's name in copyright statements.Diego Biurrun2014-07-0113-13/+13
| |
* | Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'Michael Niedermayer2014-07-0184-996/+1332
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e3fcb14347466095839c2a3c47ebecff02da891e': dsputil: Split off IDCT bits into their own context Conflicts: configure libavcodec/aic.c libavcodec/arm/Makefile libavcodec/arm/dsputil_init_arm.c libavcodec/arm/dsputil_init_armv6.c libavcodec/asvdec.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dvdec.c libavcodec/dxva2_mpeg2.c libavcodec/intrax8.c libavcodec/mdec.c libavcodec/mjpegdec.c libavcodec/mjpegenc_common.h libavcodec/mpegvideo.c libavcodec/ppc/dsputil_altivec.h libavcodec/ppc/dsputil_ppc.c libavcodec/ppc/idctdsp.c libavcodec/x86/Makefile libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c libavcodec/x86/dsputil_x86.h Merged-by: Michael Niedermayer <[email protected]>
| * dsputil: Split off IDCT bits into their own contextDiego Biurrun2014-06-3078-896/+1235
| |
* | Merge commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30'Michael Niedermayer2014-07-018-362/+430
|\| | | | | | | | | | | | | | | | | | | | | * commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30': mjpeg: Split off bits shared by MJPEG and LJPEG encoders Conflicts: libavcodec/mjpegenc.c libavcodec/mjpegenc.h Merged-by: Michael Niedermayer <[email protected]>
| * mjpeg: Split off bits shared by MJPEG and LJPEG encodersDiego Biurrun2014-06-308-295/+361
| | | | | | | | This obviates a dependency of the LJPEG encoder on mpegvideo.
* | avfilter/f_ebur128: Use av_malloc_array()Michael Niedermayer2014-07-011-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/hevc: Use av_malloc(z)_array()Michael Niedermayer2014-07-011-11/+11
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | cmdutils_opencl: Use av_malloc_array()Michael Niedermayer2014-07-011-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avfilter/showcqt: adding freetype supportMuhammad Faiz2014-06-302-29/+154
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avdevice/xv: fix missing {Michael Niedermayer2014-06-301-1/+1
| | | | | | | | | | Found-by: jamrial Signed-off-by: Michael Niedermayer <[email protected]>
* | swr: convert resample_common/linear_int16_mmx2/sse2 to yasm.Ronald S. Bultje2014-06-304-215/+187
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | lavd/xv: handle delete window messageLukasz Marek2014-06-301-0/+16
| | | | | | | | | | | | | | | | | | User may close X11 window by close button on tray. FFmpeg leaves in graceless way. This commit detects it and return EPIPE error. Signed-off-by: Lukasz Marek <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/pgssubdec: remove unused variablesMichael Niedermayer2014-06-301-3/+0
| | | | | | | | | | Found-by: ubitux Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/pgssubdec: Check input buffer size in parse_presentation_segment()Michael Niedermayer2014-06-301-0/+8
| | | | | | | | | | | | Might fix overread, no testcase known though. Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '253d0be6a1ecc343d29ff8e1df0ddf961ab9c772'Michael Niedermayer2014-06-301-120/+239
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '253d0be6a1ecc343d29ff8e1df0ddf961ab9c772': pgssubdec: handle more complex PGS scenarios Conflicts: libavcodec/pgssubdec.c Some of this has been split out and commited in cleanly split patches immedeately before this merge Merged-by: Michael Niedermayer <[email protected]>
| * pgssubdec: handle more complex PGS scenariosJohn Stebbins2014-06-301-130/+294
| | | | | | | | | | | | | | | | | | Add ability to handle multiple palettes and objects simultaneously. Each simultaneous object is given its own AVSubtitleRect. Note that there can be up to 64 currently valid objects, but only 2 at any one time can be "presented". Signed-off-by: Anton Khirnov <[email protected]>
* | avcodec/pgssubdec: fix end display timeJohn Stebbins2014-06-301-1/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/pgssubdec: Bail out of decode_rle() if error and AV_EF_EXPLODE is setJohn Stebbins2014-06-301-1/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/pgssubdec: better error codesJohn Stebbins2014-06-301-7/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/pgssubdec: Pass AVSubtitleRect to decode_rle()John Stebbins2014-06-301-11/+11
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/pgssubdec: split out flush_cache()John Stebbins2014-06-301-10/+14
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/pgssubdec: do not fail when part of the packet is faulty unless ↵John Stebbins2014-06-301-6/+11
| | | | | | | | | | | | AV_EF_EXPLODE is set Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/pgssubdec: rename PICTURE_SEGMENTJohn Stebbins2014-06-301-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | doc: remove trailing ':' at the end of sectionsClément Bœsch2014-06-301-4/+4
| | | | | | | | Also lowercase "options" in "Advanced Video Options" for consistency.
* | avformat/hdsenc: Use av_mallocz_array()Michael Niedermayer2014-06-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/rtsp: use av_malloc_array()Michael Niedermayer2014-06-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | swresample/resample_template: move division out of loop for float/double ↵Michael Niedermayer2014-06-301-2/+7
| | | | | | | | | | | | swri_resample_linear() Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-06-291-0/+1
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: configure: enable lto for icl compiler. Merged-by: Michael Niedermayer <[email protected]>
| * | configure: enable lto for icl compiler.Matthew Oliver2014-06-291-0/+1
| | |
* | | swresample/resample_template: flip order of operations in ↵Michael Niedermayer2014-06-291-1/+4
|/ / | | | | | | | | | | | | | | | | | | swri_resample_linear() for 32bit Fixes integer overflow Found-by: BBB Reviewed-by: "Ronald S. Bultje" <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | cmdutils: ignore sws_flags if swscale is not enabledMichael Niedermayer2014-06-291-0/+5
| | | | | | | | | | | | This avoids some failures during fate when swscale is disabled Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/huffyuvencdsp: try to fix misaligned accessMichael Niedermayer2014-06-291-1/+1
| | | | | | | | | | | | Should fix fate on MIPS Signed-off-by: Michael Niedermayer <[email protected]>