summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25'Michael Niedermayer2015-04-20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25': lavc: Replace av_dlog and tprintf with internal macros Conflicts: libavcodec/aacdec.c libavcodec/audio_frame_queue.c libavcodec/bitstream.c libavcodec/dcadec.c libavcodec/dnxhddec.c libavcodec/dvbsubdec.c libavcodec/dvdec.c libavcodec/dvdsubdec.c libavcodec/get_bits.h libavcodec/gifdec.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c libavcodec/h264_refs.c libavcodec/imc.c libavcodec/interplayvideo.c libavcodec/jpeglsdec.c libavcodec/libopencore-amr.c libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_parser.c libavcodec/pngdec.c libavcodec/ratecontrol.c libavcodec/rv10.c libavcodec/svq1dec.c libavcodec/vqavideo.c libavcodec/wmadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Replace av_dlog and tprintf with internal macrosVittorio Giovara2015-04-19
| |
* | Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'Michael Niedermayer2015-04-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a3eb042c704dea190c644def5b32c9cee8832b8': Replace av_dlog with normal av_log at trace level Conflicts: ffplay.c libavdevice/fbdev_dec.c libavfilter/avfilter.c libavfilter/internal.h libavfilter/setpts.c libavfilter/src_movie.c libavfilter/vf_crop.c libavfilter/vf_drawtext.c libavfilter/vf_fieldorder.c libavformat/assdec.c libavformat/avidec.c libavformat/flvdec.c libavformat/http.c libavformat/ipmovie.c libavformat/isom.c libavformat/mov.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/mpegtsenc.c libavformat/mux.c libavformat/mxfdec.c libavformat/nsvdec.c libavformat/oggdec.c libavformat/r3d.c libavformat/rtspdec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace av_dlog with normal av_log at trace levelVittorio Giovara2015-04-19
| | | | | | | | This applies to every library where performance is not critical.
* | Merge commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e'Michael Niedermayer2015-04-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e': log: Introduce a more verbose debug level Conflicts: doc/APIchanges doc/fftools-common-opts.texi libavutil/log.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * log: Introduce a more verbose debug levelVittorio Giovara2015-04-19
| | | | | | | | And deprecate av_dlog macro.
* | ffmpeg: Fix null pointer dereference in do_video_out()Michael Niedermayer2015-04-19
| | | | | | | | | | | | Fixes: CID1295087 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskadec: remove now duplicate doctype checkMichael Niedermayer2015-04-19
| | | | | | | | | | | | See: b8d7f3186e86234f6255f5e8ee9e98573b4d9a6e See: d9fe6b926cd619c311e45e0ae352cf09713c482c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg4videodec: Use check_marker()Michael Niedermayer2015-04-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/http: Fix 2 typosMichael Niedermayer2015-04-19
| | | | | | | | | | Found-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/http: Return an error in case of prematurely ending dataMichael Niedermayer2015-04-19
| | | | | | | | | | | | Fixes Ticket 4039 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil: remove pointless bmi1 defineJames Almer2015-04-18
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | cmdutils: indent protocols listingLou Logan2015-04-19
| | | | | | | | | | | | | | For readability. Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | alsdec: validate time diff indexAndreas Cadhalpun2015-04-19
| | | | | | | | | | | | | | | | | | | | If begin is smaller than t, the subtraction 'begin -= t' wraps around, because begin is unsigned. The same applies for end < t. This causes segmentation faults. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wavpackenc: use put_sbits()James Almer2015-04-18
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/riff: support G729APaul B Mahol2015-04-17
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/g729dec: support decoding packets with multiple framesPaul B Mahol2015-04-17
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'b8d7f3186e86234f6255f5e8ee9e98573b4d9a6e'Michael Niedermayer2015-04-18
|\| | | | | | | | | | | | | * commit 'b8d7f3186e86234f6255f5e8ee9e98573b4d9a6e': matroskadec: fix crash when parsing invalid mkv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: fix crash when parsing invalid mkvThomas Guillem2015-04-18
| | | | | | | | | | | | CC: libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | alsdec: limit avctx->bits_per_raw_sample to 32Andreas Cadhalpun2015-04-18
| | | | | | | | | | | | | | | | avctx->bits_per_raw_sample is used in get_sbits_long, which only supports up to 32 bits. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/alsdec: Use av_mallocz_array() for chan_data to ensure the arrays ↵Michael Niedermayer2015-04-18
| | | | | | | | | | | | never contain random data Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | alsdec: ensure channel reordering is reversibleAndreas Cadhalpun2015-04-18
| | | | | | | | | | | | | | | | | | | | If the same idx is used for more than one i, at least one entry in sconf->chan_pos remains uninitialized. This can cause segmentation faults. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | proresenc_anatoliy: use put_sbits()James Almer2015-04-18
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | adpcm: use av_clip_intp2()James Almer2015-04-18
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | dca_xll: use av_clip_intp2()James Almer2015-04-18
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | dcaenc: use put_sbits()James Almer2015-04-18
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | aaccoder: use put_sbits()James Almer2015-04-18
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | lavf: add documentation on directory listing APIMariusz Szczepańczyk2015-04-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/cabac: remove START/STOP_TIMER debug/benchmark codeMichael Niedermayer2015-04-18
| | | | | | | | | | Found-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Add HEVC to unreliable_tb()Michael Niedermayer2015-04-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Use codec_info_duration_fields in fps calculation end ↵Michael Niedermayer2015-04-18
| | | | | | | | | | | | | | | | | | decission when no timestamps and thus no duration_count is available This avoids waiting for a count to increase which will always be 0 and may reduce the startup delay for affected streams (rare) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hls: skip to next segment if the current is unavailablewm42015-04-17
| | | | | | | | | | | | | | | | | | Apparently, some live streams can delete segments too early, maybe because the client is too far behind. In this case, it's better to skip the segment, instead of returning EOF. (Yes, the HLS demuxer actually returns AVERROR_EOF if opening the segment returns a 404 HTTP error.) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tests/tiny_psnr: Make the search range extend both sides from the specified ↵Michael Niedermayer2015-04-17
| | | | | | | | | | | | | | | | shift value This is what one would expect from the help text Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1336bb06c9fbf9a14765e9f78616f2aad4f3a45a'Michael Niedermayer2015-04-17
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '1336bb06c9fbf9a14765e9f78616f2aad4f3a45a': configure: Simplify avisynth check Conflicts: configure No change as check_lib2 was already used Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Simplify avisynth checkDiego Biurrun2015-04-15
| |
* | Merge commit '247aa7af7d8197247c181e3fbfe8d93d75e41b29'Michael Niedermayer2015-04-17
|\| | | | | | | | | | | | | | | | | | | * commit '247aa7af7d8197247c181e3fbfe8d93d75e41b29': avisynth: Simplify shared library name construction Conflicts: libavformat/avisynth.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avisynth: Simplify shared library name constructionDiego Biurrun2015-04-15
| |
* | fate: gapless: test mp3 both with and without TOCwm42015-04-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: gapless: test seeking to a specific positionwm42015-04-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: gapless: fix a typo in commentwm42015-04-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mp3dec: fix gapless audio when seeking in CBR modewm42015-04-17
| | | | | | | | | | | | | | | | | | | | | | | | Removing a bunch of questionable hacks makes it work. These hacks apparently try to make concatenated mp3s with Lame headers seekable, which doesn't make too much sense anyway. The main change is that we trust the Xing header file size field now (the same field is used for seeking with Xing TOC). Note that a mp3 might contain an unknown number of unsupported additional tags, so we can't reliably compute this size manually. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC horizontal and ↵Shivraj Patil2015-04-17
| | | | | | | | | | | | | | | | vertical mc functions Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com> Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Makefile: Add support for MSA (MIPS-SIMD-Arch)Shivraj Patil2015-04-17
| | | | | | | | | | | | Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com> Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegaudiodec_template: use double to build csa tablesMichael Niedermayer2015-04-17
| | | | | | | | | | | | | | Fixes rounding difference between 32bit x86 and 64bit Fixes fate failure with gapless mp3 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/atrac3plusdsp: fix on stack alignmentMichael Niedermayer2015-04-17
| | | | | | | | Fixes fate failure on ARM
* | webmdashenc: Add better error handlingVignesh Venkatasubramanian2015-04-17
| | | | | | | | | | | | | | | | | | Return appropriate error codes and propagate the error codes from helper functions to the outer calls. Also fix a potential leak in call to av_realloc. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: remove old libdcadec checkJames Almer2015-04-16
| | | | | | | | | | | | | | | | | | It's obsolete after the addition of the pkg-config check. See http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/191983 for the relevant discussion Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | fate: add mp3 gapless testwm42015-04-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ac3: validate end in ff_ac3_bit_alloc_calc_maskAndreas Cadhalpun2015-04-16
| | | | | | | | | | | | | | | | | | | | | | This fixes an invalid read if end is 0: band_end = ff_ac3_bin_to_band_tab[end-1] + 1; Depending on what is before the array, this can cause stack smashing, when band_end becomes too large. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/assenc: handle extra sections after EventsRodger Combs2015-04-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-09 09:35:53 +0000