summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge commit 'bcbdeb318e0828cf00b458885ffa1e1596c85d06'Michael Niedermayer2014-12-151-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit 'bcbdeb318e0828cf00b458885ffa1e1596c85d06': asvenc: Forward the error instead of asserting on it Conflicts: libavcodec/asvenc.c Not merged, conditions which are impossible should be checked by assert*() adding impossible to be true error checks has the potential to confuse Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asvenc: Forward the error instead of asserting on itLuca Barbato2014-12-141-5/+11
| | | | | | | | | | Bug-Id: CID 732997 CC: libav-stable@libav.org
* | lavu/frame: fix malloc error path in av_frame_copy_props()wm42014-12-151-0/+1
| | | | | | | | | | | | | | The error path frees all side data, but forgets to reset the side data count. This can blow up later in av_frame_unref() and free_side_data(). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: Set the default for --shlibdir to --libdir.Carl Eugen Hoyos2014-12-151-2/+2
| | | | | | | | | | | | Fixes ticket #4183. Reviewed-by: Ivan Kalvachev
* | vp9/x86: sse2 MC assembly.Ronald S. Bultje2014-12-152-106/+323
| | | | | | | | | | | | | | Also a slight change to the ssse3 code, which prevents a theoretical overflow in the sharp filter. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mxfdec: Fix memleaks reading corrupt files.Carl Eugen Hoyos2014-12-151-6/+14
| | | | | | | | | | | | Fixes ticket #4173. Reviewed-by: Tomas Härdin
* | lavf/mxfdec: Factorize mxf_read_close().Carl Eugen Hoyos2014-12-151-29/+33
| | | | | | | | This will allow to fix leaks in a subsequent commit.
* | vp9/x86: 32bit and sse2 support for vp9 inverse transform assemblyRonald S. Bultje2014-12-152-719/+1737
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/dv: Use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer2014-12-151-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: use macros for device testLukasz Marek2014-12-141-6/+1
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | lavd/alsa-audio-common: mark default device in device listLukasz Marek2014-12-141-0/+2
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | lavd/avdevice: use better option types for caps optionsLukasz Marek2014-12-141-5/+5
| | | | | | | | | | | | | | Using dedicated types allows to use format/layout names, not just raw int values. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | Merge commit 'fd665f7f48fa7db89eb9a93ac33919f6adc40f9d'Michael Niedermayer2014-12-140-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'fd665f7f48fa7db89eb9a93ac33919f6adc40f9d': avconv: Use the mpeg12 private option scan_offset Conflicts: ffmpeg_opt.c See: e479013ae41050ad9b76429d8c6ab70684cddc93 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: Use the mpeg12 private option scan_offsetJulien Ramseier2014-12-141-1/+1
| | | | | | | | | | | | | | | | | | Introduced in aed790070486b1b01b48106310d9d0ca1730e459 Bug-Id: debian/773055 CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '559fa0d41b5cf8f7e1ba89d1ac70e74712eb2816'Michael Niedermayer2014-12-142-0/+13
|\ \ | |/ | | | | | | | | | | * commit '559fa0d41b5cf8f7e1ba89d1ac70e74712eb2816': vdpau: add mapping for H.264 Constrained Baseline profile and fallback Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: add mapping for H.264 Constrained Baseline profile and fallbackRémi Denis-Courmont2014-12-142-0/+13
| | | | | | | | | | | | | | Old VDPAU drivers do not support this newly defined profile, so falling back to Main profile is necessary for backward binary compatibility. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '8502c1e9ff9c1dbb6e467630c048d098f4064021'Michael Niedermayer2014-12-142-0/+8
|\ \ | |/ | | | | | | | | | | * commit '8502c1e9ff9c1dbb6e467630c048d098f4064021': vdpau: add mapping for H.264 Extended profile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: add mapping for H.264 Extended profileRémi Denis-Courmont2014-12-142-0/+8
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '8b51bcfed75721e0d20832e5a90e1d585318c9d9'Michael Niedermayer2014-12-141-16/+17
|\ \ | |/ | | | | | | | | | | * commit '8b51bcfed75721e0d20832e5a90e1d585318c9d9': vdpau: revector macro to reduce line span Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: revector macro to reduce line spanRémi Denis-Courmont2014-12-141-16/+17
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'e10e6651b50b4087f08813f3e503620db7413d3a'Michael Niedermayer2014-12-140-0/+0
|\ \ | |/ | | | | | | | | | | | | * commit 'e10e6651b50b4087f08813f3e503620db7413d3a': thread: use "" instead of <> for including the w32pthreads wrapper See: 32eadfe453c32788ea57968e6e80f673f434739d Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * thread: use "" instead of <> for including the w32pthreads wrapperAnton Khirnov2014-12-141-1/+1
| | | | | | | | Found-by: Dave Yeo <dave.r.yeo@gmail.com>
* | avformat/utils: Do not update programs streams from program-less streams in ↵Michael Niedermayer2014-12-141-0/+2
| | | | | | | | | | | | | | | | update_wrap_reference() Fixes Ticket3686 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mp3dec: Name the dummy variable as what it is, to avoid confusionMichael Niedermayer2014-12-141-2/+3
| | | | | | | | | | Found-by: nattyzs <nattyzs@163.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/aviobuf: Check that avio_seek() target is non negativeMichael Niedermayer2014-12-141-0/+3
| | | | | | | | | | | | | | Fixes out of array access Suggested-by: Andrew Scherkus <scherkus@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_dctdnoiz: use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer2014-12-141-5/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/f_sendcmd: Use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer2014-12-141-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/xiph: mark returned header pointers const from ↵Michael Niedermayer2014-12-148-8/+8
| | | | | | | | | | | | | | avpriv_split_xiph_headers() Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nutenc: store the actual r_frame_rate in the corresponding field if ↵Michael Niedermayer2014-12-142-2/+5
| | | | | | | | | | | | | | | | available Fixes Ticket 3629 part3 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: forward r_frame_rate to the muxer in case of stream copyMichael Niedermayer2014-12-141-0/+1
| | | | | | | | | | | | Fixes Ticket3629 part2 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: use r_frame_rate only in the demuxer for ↵Michael Niedermayer2014-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | ff_compute_frame_duration() This is primarly to maintain current behavior when r_frame_rate is set for muxers and could be reverted if it has some advantage Fixes Ticket3629 part1 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: fix wording in AVSubtitleRect doxyClément Bœsch2014-12-131-1/+1
| |
* | swresample/soxr_resample: fix error handlingRob Sykes2014-12-131-2/+6
| | | | | | | | | | | | Fixes CID1257659 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fix "than" typoMichael Niedermayer2014-12-131-1/+1
| | | | | | | | | | Found-by reimar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Do not estimate the container bitrate from the streams if ↵Michael Niedermayer2014-12-131-0/+5
| | | | | | | | | | | | one video stream lacks the bitrate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_uspp: fix gray pixfmt handlingMichael Niedermayer2014-12-131-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_uspp: fix used chroma subsampling factorsMichael Niedermayer2014-12-131-11/+21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_uspp: fix used pix_fmtMichael Niedermayer2014-12-131-1/+1
| | | | | | | | | | Found-by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dvdsubdec: Avoid strerror() due to thread safteyMichael Niedermayer2014-12-131-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libxvid_rc: Avoid strerror() for thread safteyMichael Niedermayer2014-12-131-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Simplify code by using OFFSET() and FLAGS macrosMichael Niedermayer2014-12-131-9/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_kerndeint: use av_freep(), avoid leaving stale pointers in memoryMichael Niedermayer2014-12-131-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_unsharp: use av_freep() avoid leaving stale pointers in memoryMichael Niedermayer2014-12-131-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_uspp: Add grayscale supportMichael Niedermayer2014-12-131-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_uspp: assert that the qp_type is validMichael Niedermayer2014-12-131-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc: add FFREPORT exampleLou Logan2014-12-121-5/+13
| | | | | | | | | | | | And fix a few nits. Signed-off-by: Lou Logan <lou@lrcd.com>
* | lavu/dict: check for malloc failureswm42014-12-121-1/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: check for malloc failurewm42014-12-121-0/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/avpacket: check for malloc failurewm42014-12-121-1/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Delete mp=usppArwa Arif2014-12-125-401/+1
| |
OpenPOWER on IntegriCloud