aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge commit '68edd5be0980941924ae633d98589d56a8091bbd'Michael Niedermayer2013-10-161-5/+7
|\| | | | | | | | | | | | | * commit '68edd5be0980941924ae633d98589d56a8091bbd': FATE: use proper comparison mode in the lavr tests Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * FATE: use proper comparison mode in the lavr testsAnton Khirnov2013-10-151-5/+7
| |
* | Merge commit 'dd33637c18629c3e554ebb146bbeb45c9745a5cf'Michael Niedermayer2013-10-161-31/+87
|\| | | | | | | | | | | | | | | | | | | * commit 'dd33637c18629c3e554ebb146bbeb45c9745a5cf': tiny_psnr: switch f32 handling to floating point Conflicts: tests/tiny_psnr.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiny_psnr: switch f32 handling to floating pointAnton Khirnov2013-10-151-30/+84
| | | | | | | | Also add support for f64.
* | Merge commit '29c455ce3daf7fb369ba20cf77c74bd8e3b43b55'Michael Niedermayer2013-10-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | | * commit '29c455ce3daf7fb369ba20cf77c74bd8e3b43b55': bitstream: Check the result of av_malloc() Conflicts: libavcodec/bitstream.c See: aa74810fc6b9afe21c9be3725e3d078d10633670 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bitstream: Check the result of av_malloc()Diego Biurrun2013-10-151-0/+2
| |
* | Merge commit '3b4fa54866f58bf3d8a8dcc460c73ef6564c0ad8'Michael Niedermayer2013-10-161-45/+44
|\| | | | | | | | | | | | | * commit '3b4fa54866f58bf3d8a8dcc460c73ef6564c0ad8': cavs: more K&R formatting cosmetics Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cavs: more K&R formatting cosmeticsDiego Biurrun2013-10-151-45/+44
| |
* | Merge commit 'c0085f94fea89b180e5727b193484a83586d3490'Michael Niedermayer2013-10-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c0085f94fea89b180e5727b193484a83586d3490': mpegaudio_tablegen: Don't use llrint cos_tablegen: Don't use lrint tablegen: Don't use cbrtf in host tools tableprint: Fix use of a size_t print with MSVC Conflicts: libavcodec/cbrt_tablegen.h libavcodec/mpegaudio_tablegen.h See: e51692114354b8e460bf5c9f6def7089a6b969c0 See: 50867209930fd03c05b879bd6223b52c7305c90a See: 008014b5e72442fe7c8bf4a31e6bb74469b81359 See: 00aa24ffee91d52488765088ea0f60748e2a2083 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegaudio_tablegen: Don't use llrintDerek Buitenhuis2013-10-151-1/+2
| | | | | | | | | | | | | | | | You cannot count on it being present on all systems, and you cannot include libm.h in a host tool, so just hard code a baseline implementation. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * cos_tablegen: Don't use lrintDerek Buitenhuis2013-10-151-4/+9
| | | | | | | | | | | | | | | | You cannot count on it being present on all systems, and you cannot include libm.h in a host tool, so just hard code a baseline implementation. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * tablegen: Don't use cbrtf in host toolsDerek Buitenhuis2013-10-152-3/+6
| | | | | | | | | | | | | | | | You cannot count on them being present on all systems, and you cannot include libm.h in a host tool, so just hard code baseline implementations. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * tableprint: Fix use of a size_t print with MSVCDerek Buitenhuis2013-10-151-2/+12
| | | | | | | | | | | | | | %zu was introduced in C99, so MSVC has its own way to handle it, namely %Iu. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | hevc: fixing TSCL_A_VIDYO_5 decoding output order(cherry picked from commit ↵Mickaël Raulet2013-10-161-1/+1
| | | | | | | | | | | | 19c5d9ed28606e7a166d180fc9f1517cb174146f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: fix DBLK_A_MAIN10_VIXS_2 on big endianMichael Niedermayer2013-10-161-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | FATE: add HEVC testsGuillaume Martres2013-10-1642-0/+1697
| | | | | | | | | | | | | | The tests are disabled as 2 do not pass yet (fate-hevc-conformance-PPS_A_qualcomm_7 and fate-hevc-conformance-RAP_A_docomo_4) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: fix "correctly" typoMichael Niedermayer2013-10-161-1/+1
| | | | | | | | | | Found-by: Timothy Gu Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/matroskadec: Support HEVC demuxing.Yusuke Nakamura2013-10-162-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mov: Support HEVC demuxing.Yusuke Nakamura2013-10-162-3/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | valgrind cleanup(cherry picked from commit ↵gcocherel2013-10-162-16/+25
| | | | | | | | | | | | 0d5efa40b94c0de92a1fe5091b21e0e2d36bae3d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc: add ts demux supportMickaël Raulet2013-10-151-0/+1
| | | | | | | | | | | | cherry picked from commit 925ee44364a7bce58e2ac5bac91077ce0a75d883 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/hevc: mark decoder as experimentalMichael Niedermayer2013-10-151-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/hevc_ps: fix PIX_FMT enumsMichael Niedermayer2013-10-151-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: add a HEVC decoder.Guillaume Martres2013-10-1520-1/+11023
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initially written by Guillaume Martres <smarter@ubuntu.com> as a GSoC project. Further contributions by the OpenHEVC project and other developers, namely: Mickaël Raulet <mraulet@insa-rennes.fr> Seppo Tomperi <seppo.tomperi@vtt.fi> Gildas Cocherel <gildas.cocherel@laposte.net> Khaled Jerbi <khaled_jerbi@yahoo.fr> Wassim Hamidouche <wassim.hamidouche@insa-rennes.fr> Vittorio Giovara <vittorio.giovara@gmail.com> Jan Ekström <jeebjp@gmail.com> Anton Khirnov <anton@khirnov.net> Martin Storsjö <martin@martin.st> Luca Barbato <lu_zero@gentoo.org> Yusuke Nakamura <muken.the.vfrmaniac@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegaudio_tablegen: remove dead branchMichael Niedermayer2013-10-151-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: rename a few more h.265 to HEVCMichael Niedermayer2013-10-153-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: improve precission for cbrtf() emulationMichael Niedermayer2013-10-152-3/+3
| | | | | | | | | | | | | | | | cbrtf() took floats but it represented 1/3 exactly and even if not more precission should be better in theory for the table generation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegaudio_tablegen: Don't use llrintDerek Buitenhuis2013-10-151-1/+2
| | | | | | | | | | | | | | | | You cannot count on it being present on all systems, and you cannot include libm.h in a host tool, so just hard code a baseline implementation. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | cos_tablegen: Don't use lrintDerek Buitenhuis2013-10-151-4/+9
| | | | | | | | | | | | | | | | You cannot count on it being present on all systems, and you cannot include libm.h in a host tool, so just hard code a baseline implementation. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | tablegen: Don't use cbrtf in host toolsDerek Buitenhuis2013-10-152-3/+6
| | | | | | | | | | | | | | | | You cannot count on them being present on all systems, and you cannot include libm.h in a host tool, so just hard code baseline implementations. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | tableprint: Fix use of a size_t print with MSVCDerek Buitenhuis2013-10-151-2/+12
| | | | | | | | | | | | | | %zu was introduced in C99, so MSVC has its own way to handle it, namely %Iu. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | configure: Warn when inline asm is disabled for ICLMichael Niedermayer2013-10-151-0/+1
| | | | | | | | | | | | See Ticket3048 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/segment: simplify logic and fix !=0 check on segment_end return valueStefano Sabatini2013-10-151-5/+3
| | | | | | | | A successfull return value can be > 0.
* | lavf/segment: log segments as they end to AV_LOG_VERBOSEBilly Shambrook2013-10-151-0/+4
| | | | | | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | lavf/segment: simplify segment_count updateStefano Sabatini2013-10-151-6/+4
| | | | | | | | Now segment_count mark the segment_count of the current segment.
* | fate: add pxr24 exr testPaul B Mahol2013-10-152-0/+5
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/jpeg2000dec: fix context consistency with too large lowresMichael Niedermayer2013-10-151-4/+11
| | | | | | | | | | | | | | Fixes out of array accesses Fixes Ticket2898 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-151-1/+2
|\| | | | | | | | | | | | | | | | | | | * qatar/master: http: Check the auth string contents and not only the pointer Conflicts: libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * http: Check the auth string contents and not only the pointerMichael Niedermayer2013-10-141-1/+2
| | | | | | | | | | | | | | This makes sure we don't send the Except: 100-continue header if no authentication credentials have been provided. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/x86/dsputil_init: move ff_idct_xvid_mmxext initMichael Niedermayer2013-10-151-9/+13
| | | | | | | | | | | | This decreases the diff to libav Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/x86/dsputil_init: remove duplicated sse2 idct initMichael Niedermayer2013-10-151-6/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/x86/dsputil_init: fix cpu flag checksMichael Niedermayer2013-10-151-2/+2
| | | | | | | | | | | | Fixes linking failure with --disable-sse2 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc: make x11grab examples consistent with option namesLou Logan2013-10-142-8/+8
| | | | | | | | | | | | | | Change -r to -framerate, but either will work. Change -s to -video_size, but either will work. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | matroskadec: Demux support for SeekPreRoll and CodecDelayVignesh Venkatasubramanian2013-10-141-0/+15
| | | | | | | | | | | | | | | | Adds support for demuxing SeekPreRoll and CodecDelay container elements. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rpl: use avpriv_report_missing_feature/avpriv_request_samplePaul B Mahol2013-10-141-8/+4
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavc: Adding seek_preroll to AVCodecContextVignesh Venkatasubramanian2013-10-143-1/+12
| | | | | | | | | | | | | | | | | | seek_preroll field is added to the AVCodecContext struct. It indicates the number of samples to be discarded whenever there is a discontinuity. The minor version is bumped accordingly. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support H.264 fourcc UMSV.Carl Eugen Hoyos2013-10-141-0/+1
| | | | | | | | Fixes ticket #3046.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-141-0/+11
|\| | | | | | | | | | | | | * qatar/master: x86: more AVX2 framework Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: more AVX2 frameworkJason Garrett-Glaser2013-10-141-0/+11
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit 'c6908d6b4b377a04a5d055ba874bdbcf06c80497'Michael Niedermayer2013-10-142-1/+45
|\| | | | | | | | | | | | | * commit 'c6908d6b4b377a04a5d055ba874bdbcf06c80497': x86inc: FMA3/4 Support Merged-by: Michael Niedermayer <michaelni@gmx.at>