summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* swscale/swscale: fix integer overflowMichael Niedermayer2014-03-24
| | | | | | Should fix fate failure with clang ftrapv Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* fate: add tests for linearly interpolated resamplingMichael Niedermayer2014-03-24
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* tests/tiny_psnr: Print information about the supported sample types in the ↵Michael Niedermayer2014-03-24
| | | | | | help and error texts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample/resample: sse float linear interpolationJames Almer2014-03-24
| | | | | | | About two times faster Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample/resample: mmx2/sse2 int16 linear interpolationJames Almer2014-03-24
| | | | | | | About three times faster Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-24
|\ | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: Split h264 slice decoding from nal decoding Conflicts: libavcodec/Makefile libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Split h264 slice decoding from nal decodingLuca Barbato2014-03-23
| |
* | Merge commit 'e9a77f4bc084e5174baba3a8bc869ce4d102c4f0'Michael Niedermayer2014-03-24
|\| | | | | | | | | | | | | | | | | | | | | * commit 'e9a77f4bc084e5174baba3a8bc869ce4d102c4f0': h264: move macroblock decoding into its own file Conflicts: libavcodec/Makefile libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move macroblock decoding into its own fileVittorio Giovara2014-03-23
| |
* | Merge commit 'ede2b451ccb1b2317858c7a32784a9b739ba45f4'Michael Niedermayer2014-03-24
|\| | | | | | | | | | | | | | | | | | | * commit 'ede2b451ccb1b2317858c7a32784a9b739ba45f4': build: Sort h264 objects Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Sort h264 objectsLuca Barbato2014-03-23
| |
* | Merge commit 'fb7127b2c836b53ad5168887cd12871312c8708d'Michael Niedermayer2014-03-24
|\| | | | | | | | | | | | | | | | | | | * commit 'fb7127b2c836b53ad5168887cd12871312c8708d': build: h264 parser depends on full h264 decoder Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: h264 parser depends on full h264 decoderLuca Barbato2014-03-23
| |
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2014-03-24
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * cigaes/master: lavu: add myself as dynarray.h maintainer. ffmpeg: sub2video: send a last blank frame before closing. tools: add dvd2concat. lavf/concatdec: allow to match streams by id. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavu: add myself as dynarray.h maintainer.Nicolas George2014-03-23
| | |
| * | ffmpeg: sub2video: send a last blank frame before closing.Nicolas George2014-03-23
| | | | | | | | | | | | Fix trac ticket #3420.
| * | tools: add dvd2concat.Nicolas George2014-03-23
| | |
| * | lavf/concatdec: allow to match streams by id.Nicolas George2014-03-23
| | | | | | | | | | | | | | | | | | That makes the concat demuxer usable with MPEG-PS streams, even when the streams in the different parts are detected in different order.
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-23
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | * qatar/master: RELEASE_NOTES: mention new filters Conflicts: doc/RELEASE_NOTES Not merged as these things where in past ffmpeg releases already. Or at least some of them where, volunteers to checks this and update our release notes are welcome Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * RELEASE_NOTES: mention new filtersVittorio Giovara2014-03-23
| |
* | Always pass the configure option sysroot to --sysroot and -isysroot.Carl Eugen Hoyos2014-03-23
| | | | | | | | On darwin, --sysroot may be ignored.
* | Autodetect VDA like all other hardware acccelerations.Carl Eugen Hoyos2014-03-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/x86/h264_qpel: Fix typo introduced by ↵Michael Niedermayer2014-03-23
| | | | | | | | | | | | 322a1dda973e802db7b57f2007fad3efcd5bab81 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Move avpriv_find_pix_fmt() to utils.cMichael Niedermayer2014-03-23
| | | | | | | | | | | | Fixes build with --disable-everything Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | http: restructure http_connect error handling pathwm42014-03-23
| | | | | | | | | | | | | | | | The authstr memory allocations make it annoying to error in the middle of the header setup code, so apply the usual C error handling idiom to make it easier to error at any point. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-23
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: drop ff_pixfmt_list_420 Conflicts: libavcodec/flvdec.c libavcodec/msmpeg4dec.c libavcodec/rv10.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: drop ff_pixfmt_list_420Vittorio Giovara2014-03-23
| |
* | Merge commit 'd5717bc4e9cc253a933ae8130eea3a9c8bc33c0b'Michael Niedermayer2014-03-23
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'd5717bc4e9cc253a933ae8130eea3a9c8bc33c0b': changelog: switch libx265 and compand entries Conflicts: Changelog Not many changes as libx265 and compand are placed correctly for us Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * changelog: switch libx265 and compand entriesVittorio Giovara2014-03-23
| |
* | Merge commit '0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1'Michael Niedermayer2014-03-23
|\| | | | | | | | | | | | | | | | | | | * commit '0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1': configure: Always use -DOPJ_STATIC when checking for openjpeg Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Always use -DOPJ_STATIC when checking for openjpegLuca Barbato2014-03-23
| | | | | | | | | | | | Unbreaks windows systems not providing pkgconf files. Reported-By: Rafaël Carré <funman@videolan.org>
* | Merge commit '1e9db41e2a2166be5671b088ef4ad06a40af459f'Michael Niedermayer2014-03-23
|\| | | | | | | | | | | | | | | | | | | * commit '1e9db41e2a2166be5671b088ef4ad06a40af459f': movenc: Allow override of major brand in ftyp atom Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Allow override of major brand in ftyp atomJohn Stebbins2014-03-23
| | | | | | | | Signed-off-by: Tim Walker <tdskywalker@gmail.com>
* | avcodec: Add padding after the remaining AVFramesMichael Niedermayer2014-03-23
| | | | | | | | | | | | | | | | | | | | This limits ABI issues in case libavcodec is linked to a libavutil with larger AVFrame Which can happen if they are shiped in seperate binary packages and libavutil is upgraded A cleaner alternative would be to replace them by pointers but this would likely cause a small speedloss Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2014-03-22
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * cus/stable: mpegts: fix teletext pts of streams with standalone pcr pid mpegts: add pcr filter for tracking standalone pcr pids mpegts: factorize mpegts filter creator code mpegts: move last_pcr to MpegTSFilter level Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mpegts: fix teletext pts of streams with standalone pcr pidMarton Balint2014-03-22
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | mpegts: add pcr filter for tracking standalone pcr pidsMarton Balint2014-03-22
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | mpegts: factorize mpegts filter creator codeMarton Balint2014-03-22
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | mpegts: move last_pcr to MpegTSFilter levelMarton Balint2014-03-22
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-22
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | * qatar/master: lagarith: Fix typo in printf format string Conflicts: libavcodec/lagarith.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lagarith: Fix typo in printf format stringDiego Biurrun2014-03-22
| | | | | | | | | | | | libavcodec/lagarith.c:671:16: warning: '#' flag used with ‘%u’ gnu_printf format [-Wformat]
* | | Merge commit '57f09608e1600d1cf1679885a46f5004d522d68f'Michael Niedermayer2014-03-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '57f09608e1600d1cf1679885a46f5004d522d68f': dsputil: Move thirdpel-related bits into their own context Conflicts: libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | dsputil: Move thirdpel-related bits into their own contextDiego Biurrun2014-03-22
| | |
* | | Merge commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f'Michael Niedermayer2014-03-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f': x86: dsputil: Move hpeldsp-related declarations to a separate header Conflicts: libavcodec/x86/dsputil_x86.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | x86: dsputil: Move hpeldsp-related declarations to a separate headerDiego Biurrun2014-03-22
| | |
* | | Merge commit 'ae116cd3ed908d28b69d5198712217ec743d74f6'Michael Niedermayer2014-03-22
|\| | | | | | | | | | | | | | | | | | | | * commit 'ae116cd3ed908d28b69d5198712217ec743d74f6': ppc: dsputil: Move hpeldsp-related declarations to a separate header Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ppc: dsputil: Move hpeldsp-related declarations to a separate headerDiego Biurrun2014-03-22
| | |
* | | Merge commit '6655c933a887a2d20707fff657b614aa1d86a25b'Michael Niedermayer2014-03-22
|\| | | | | | | | | | | | | | | | | | | | * commit '6655c933a887a2d20707fff657b614aa1d86a25b': x86: dsputil: Move fpel declarations to a separate header Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | x86: dsputil: Move fpel declarations to a separate headerDiego Biurrun2014-03-22
| | |
* | | Merge commit '322a1dda973e802db7b57f2007fad3efcd5bab81'Michael Niedermayer2014-03-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '322a1dda973e802db7b57f2007fad3efcd5bab81': dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros Conflicts: libavcodec/arm/hpeldsp_init_arm.c libavcodec/x86/dsputil_x86.h Merged-by: Michael Niedermayer <michaelni@gmx.at>