summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '205fdd4ea5e1264946917a26fde01e137a485f5a'Michael Niedermayer2014-06-113-0/+15
|\ | | | | | | | | | | | | * commit '205fdd4ea5e1264946917a26fde01e137a485f5a': ppc: Fix runtime CPU detection for apedsp, huffyuvdsp, svq1enc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ppc: Fix runtime CPU detection for apedsp, huffyuvdsp, svq1encDiego Biurrun2014-06-103-0/+15
| |
* | Merge commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd'Michael Niedermayer2014-06-102-1/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd': mpegts: Provide an option to override the pcr period Conflicts: doc/muxers.texi libavformat/mpegtsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Provide an option to override the pcr periodLuca Barbato2014-06-102-1/+7
| | | | | | | | Certain hardware demuxer have specific restrictions for PCR periodicity.
* | Fix standalone compilation of the webvtt encoder.Carl Eugen Hoyos2014-06-101-1/+1
| |
* | Merge commit '3f7e94eccd1c0d64679f2c4eda8bb942a158dfac'Michael Niedermayer2014-06-101-44/+44
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '3f7e94eccd1c0d64679f2c4eda8bb942a158dfac': mpegts: Move the option section to the bottom Conflicts: libavformat/mpegtsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Move the option section to the bottomLuca Barbato2014-06-101-35/+35
| | | | | | | | | | Makes it consistent with the rest of the formats and ease usage of macros constants for the defaults.
* | Merge commit 'a736ae1e96b8718af0962106aa40df5f4b246b55'Michael Niedermayer2014-06-101-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'a736ae1e96b8718af0962106aa40df5f4b246b55': doc: Document mpegts muxrate Conflicts: doc/muxers.texi See: 5b76c3a1204944a74f4c1fb4ce1ebe58940e7f78 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: Document mpegts muxrateLuca Barbato2014-06-101-0/+2
| |
* | tests: add a third, 34x34, targetChristophe Gisquet2014-06-1061-2/+259
| | | | | | | | | | | | This should exercise the corner cases of numerous codecs. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '570d4b21863b6254d6bbca9c528bede471bb4478'Michael Niedermayer2014-06-101-5/+5
|\ \ | |/ | | | | | | | | | | * commit '570d4b21863b6254d6bbca9c528bede471bb4478': x86: h264: Don't keep data in the redzone across function calls on 64 bit unix Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: h264: Don't keep data in the redzone across function calls on 64 bit unixMartin Storsjö2014-06-101-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We know that the called function (ff_chroma_inter_body_mmxext) doesn't touch the redzone, and thus will be kept intact - thus, this doesn't fix any bug per se. However, valgrind's memcheck tool intentionally assumes that the redzone is clobbered on every function call and function return (see a long comment in valgrind/memcheck/mc_main.c). This avoids false positives in that tool, at the cost of an extra stack pointer adjustment. The other alternative would be a valgrind suppression for this issue, but that's an extra burden for everybody that wants to run libavcodec within valgrind. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0776e0ef6ba4160281ef3fabea43e670f3792b4a'Michael Niedermayer2014-06-100-0/+0
|\ \ | |/ | | | | | | | | | | | | * commit '0776e0ef6ba4160281ef3fabea43e670f3792b4a': adpcm: Write the proper predictor in trellis mode in IMA QT See: fa8f060b75bf9074792a0f9ff4ed002652ef62b8 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adpcm: Write the proper predictor in trellis mode in IMA QTMartin Storsjö2014-06-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The actual predictor value, set by the trellis code, never was written back into the variable that was written into the block header. This was accidentally removed in b304244b. This significantly improves the audio quality of the trellis case, which was plain broken since b304244b. Encoding IMA QT with trellis still actually gives a slightly worse quality than without trellis, since the trellis encoder doesn't use the exact same way of rounding as in adpcm_ima_qt_compress_sample and adpcm_ima_qt_expand_nibble. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-06-105-9/+22
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Allow values >31bit for -analyzeduration. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Allow values >31bit for -analyzeduration.Carl Eugen Hoyos2014-06-105-9/+22
| | |
* | | avformat/nutenc: cleaner version checkMichael Niedermayer2014-06-101-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/nutenc: Fix error handling in nut_write_packet()Michael Niedermayer2014-06-101-10/+17
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/rawdec: Increase probe score when "Content-Type: image/jpeg" is ↵Michael Niedermayer2014-06-101-3/+11
| | | | | | | | | | | | | | | | | | | | | found at the file start Based-on code by: Carl Eugen Hoyos and Andrey Utkin Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/utils: dont wait for a first dts on demuxers which have ↵Michael Niedermayer2014-06-101-0/+1
| | | | | | | | | | | | | | | | | | AVFMT_NOTIMESTAMPS set Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/rawdec: mark raw vc1 and mjpeg as having no timestampsMichael Niedermayer2014-06-101-2/+2
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/rawdec: add FF_DEF_RAWVIDEO_DEMUXER2, which allows specifying the flagsMichael Niedermayer2014-06-101-2/+5
|/ / | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nutenc: Fix error handling in write_sm_data()Michael Niedermayer2014-06-101-5/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tools/fourcc2pixfmt: Avoid using non public AV_PIX_FMT_NBMichael Niedermayer2014-06-101-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mpegts: Reduce number of "Predefined SLConfigDescriptor" warnings shown.Carl Eugen Hoyos2014-06-091-1/+3
| |
* | ffprobe: add rc_max_rate to stream outputBilly Shambrook2014-06-097-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | The value is used by some bitstream to mark the maximum bit rate. See thread: Subject: [FFmpeg-devel] [PATCH] Add rc_max_rate to ffprobe stream output Date: Sun, 1 Jun 2014 17:36:36 +0100 To: ffmpeg-devel@ffmpeg.org http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/178461 Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | avcodec/x86/dct_init: fix build failure with clang && disable-optimizationsMichael Niedermayer2014-06-091-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: add mjpeg_probe()Michael Niedermayer2014-06-091-1/+59
| | | | | | | | | | | | Fixes Ticket3679 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_zoompan: fix mixing of declarations and statementsMichael Niedermayer2014-06-091-2/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1619274fb393f55a365cc10f88faa173c9a8e772'Michael Niedermayer2014-06-091-1/+4
|\ \ | |/ | | | | | | | | | | * commit '1619274fb393f55a365cc10f88faa173c9a8e772': av_dict_set: fix potential memory leak with AV_DICT_DONT_OVERWRITE Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * av_dict_set: fix potential memory leak with AV_DICT_DONT_OVERWRITEJanne Grunau2014-06-091-1/+4
| | | | | | | | | | av_dict_set leaks it key/value arguments if AV_DICT_DONT_OVERWRITE is combined with AV_DICT_DONT_STRDUP_{KEY,VAL} and the key exists.
* | Merge commit '7b06ddb8352fe7f434414d7911ced94956bb25b2'Michael Niedermayer2014-06-091-0/+4
|\ \ | |/ | | | | | | | | | | * commit '7b06ddb8352fe7f434414d7911ced94956bb25b2': configure: use .altmacro for gnu as check on arm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: use .altmacro for gnu as check on armJanne Grunau2014-06-091-0/+4
| | | | | | | | | | | | Clang's integrated assembler (after 3.4) does not yet support the '.altmacro' directive which is only used in arm asm. Support is planned: http://llvm.org/bugs/show_bug.cgi?id=18918
* | swr: handle 64bit overflow check in multiple_resample().Ronald S. Bultje2014-06-092-2/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utvideoenc: skip unused huffman entriesMichael Niedermayer2014-06-0912-502/+502
| | | | | | | | | | | | This very slightly improves compression Found-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utvideodec: fix use of get_vlc2()Michael Niedermayer2014-06-091-1/+1
| | | | | | | | | | | | | | The max depth is 3 Found-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/huffman/ff_huff_gen_len_table: support skiping stat=0 entriesMichael Niedermayer2014-06-094-10/+19
| | | | | | | | | | | | | | This is probably not the simplest solution but as this is needed for a bugfix, simplification is left for later. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utvideodec: Increase vlc lenCarl Eugen Hoyos2014-06-091-1/+1
| | | | | | | | | | | | | | Fixes a regression since fb3e380 similar to ticket #2661, reported by fluffrabbit at aol dot com. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Zoom & Pan filterPaul B Mahol2014-06-097-1/+403
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | cavsdec: fix qp fixed slice handlingMichael Niedermayer2014-06-092-1/+3
| | | | | | | | | | | | Fixes Ticket3400 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/cavsvideodec: Fix probing when the file extension is avsMichael Niedermayer2014-06-091-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/scale: fix xmm register count for hscale*_sse2James Almer2014-06-091-1/+1
| | | | | | | | | | | | | | xmm6 was being clobbered in ff_hscale8to{15,19}_8_sse2 on Win64 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/dct32: don't build ff_dct32_float_sse on x86_64James Almer2014-06-092-1/+3
| | | | | | | | | | | | | | | | There's an SSE2 version already, and technically the SSE version on x86_64 was wrong (using pshufd and pshuflw, SSE2 instructions). Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/options_table: improve max/min rate help textMichael Niedermayer2014-06-081-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/float_dsp: add missing femmsJames Almer2014-06-081-0/+3
| | | | | | | | | | | | | | | | It was lost during the port. Should fix fate on 3dnowext machines. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pthread_slice: Use av_malloc(z)_array()Michael Niedermayer2014-06-081-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pthread_frame: Use av_mallocz_array()Michael Niedermayer2014-06-081-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: fix () in TRANSPOSE macroMichael Niedermayer2014-06-082-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: use av_malloc(z)_array()Michael Niedermayer2014-06-081-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/aacpsy: Use av_mallocz_array()Michael Niedermayer2014-06-081-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud