summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* presets: remove moldering iPod presetsLou Logan2014-06-17
| | | | | | | | | | | | | | * Some users are trying to use them for non-ancient iDevices when baseline profile and level 1.3/3.0 would not be required. * "640" and "320" no longer make sense. * Some recommended options can be viewed at: <https://trac.ffmpeg.org/wiki/Encode/H.264#iOS> Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '9affa784a0743b95bde135b5acfce2183afc35d8'Michael Niedermayer2014-06-18
|\ | | | | | | | | | | | | | | | | | | | | * commit '9affa784a0743b95bde135b5acfce2183afc35d8': vp9 encoder: use a decent default speed setting Conflicts: libavcodec/libvpxenc.c See: 34e32d6464135a03da14d5b0aef1d42796939eae Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vp9 encoder: use a decent default speed settingRafaël Carré2014-06-17
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '74bc9458057f07c0820c3d3264396c4c64442e47'Michael Niedermayer2014-06-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '74bc9458057f07c0820c3d3264396c4c64442e47': flvenc: Don't over-count metadata. Conflicts: tests/ref/lavf/flv_fmt tests/ref/vsynth/vsynth1-flashsv tests/ref/vsynth/vsynth1-flv tests/ref/vsynth/vsynth2-flashsv tests/ref/vsynth/vsynth2-flv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvenc: Don't over-count metadata.Josh Allmann2014-06-17
| | | | | | | | | | | | Over-counting occurs if framerate is not set. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '49106844929b7b71ac719064d640f8aa56c89b1f'Michael Niedermayer2014-06-18
|\| | | | | | | | | | | | | | | | | | | * commit '49106844929b7b71ac719064d640f8aa56c89b1f': tiffenc: fix packet size calculation Conflicts: libavcodec/tiffenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiffenc: fix packet size calculationTristan Matthews2014-06-17
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avfilter/vf_spp: Use av_malloc_array()Michael Niedermayer2014-06-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_sab: use av_malloc_array()Michael Niedermayer2014-06-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'fe4d5fe9361162f9033ff1bd84bfc1b2091ba785'Michael Niedermayer2014-06-17
|\| | | | | | | | | | | | | | | | | | | | | * commit 'fe4d5fe9361162f9033ff1bd84bfc1b2091ba785': jpeg2000: Mark static data init functions as av_cold Conflicts: libavcodec/jpeg2000.c libavcodec/jpeg2000dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpeg2000: Mark static data init functions as av_coldDiego Biurrun2014-06-17
| |
* | ffplay: remove -ec handling codeMichael Niedermayer2014-06-17
| | | | | | | | | | | | Its handled by the generic option code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/hevc: new idct + asmplepere2014-06-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '71d6551e674c86d07c165439c2bf6613b3892307'Michael Niedermayer2014-06-17
|\| | | | | | | | | | | | | * commit '71d6551e674c86d07c165439c2bf6613b3892307': avconv: use the correct variable in comparison Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: use the correct variable in comparisonAnton Khirnov2014-06-17
| |
* | avcodec/cavsdec: fix low delay decodingMichael Niedermayer2014-06-17
| | | | | | | | | | | | Fixes Ticket1095 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvdec: Support live flv / NGINX RTMP streamsMichael Niedermayer2014-06-16
| | | | | | | | | | | | Fixes Ticket3553 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale/input: fix harmless integer overflowMichael Niedermayer2014-06-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | version string: add copyright line to version stringSimon Thelen2014-06-16
| | | | | | | | | | | | | | Show the copyright when running `ffmpeg -version'. This is useful for end users trying to determine whether they are using FFmpeg or Libav. Signed-off-by: Simon Thelen <ffmpeg@c-14.de>
* | avcodec/bitstream: try to make vlc init code inherently thread safeMichael Niedermayer2014-06-16
| | | | | | | | | | | | also remove spinlock, it doesnt work on AIX Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/bitstream: fill invalid vlc tables entries as last pass instead of firstMichael Niedermayer2014-06-16
| | | | | | | | | | | | This avoids writing entries twice Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/bitstream: zero vlc tables on allocationMichael Niedermayer2014-06-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Force aix strip to work on 32 and 64 bit by default.Carl Eugen Hoyos2014-06-16
| |
* | avcodec/h264: fix frame skip codeMichael Niedermayer2014-06-16
| | | | | | | | | | | | Fixes Ticket3475 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264_slice: support skipping loop filtering for non key framesMichael Niedermayer2014-06-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: use the correct level for droping non intra framesMichael Niedermayer2014-06-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb'Michael Niedermayer2014-06-16
|\| | | | | | | | | | | | | * commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb': configure: Directly support Android as target OS Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Directly support Android as target OSLuca Barbato2014-06-16
| |
* | Merge commit '766f2d965ff1948749c37f26a714adb8aa89c4a9'Michael Niedermayer2014-06-16
|\| | | | | | | | | | | | | * commit '766f2d965ff1948749c37f26a714adb8aa89c4a9': gitignore: add dylib and swp entries Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * gitignore: add dylib and swp entriesVittorio Giovara2014-06-16
| |
* | Merge commit '711aa2a82727907f778fb8aa9a93aff2120170f2'Michael Niedermayer2014-06-16
|\| | | | | | | | | | | | | | | | | | | * commit '711aa2a82727907f778fb8aa9a93aff2120170f2': lavf: dump stream side data when probing Conflicts: libavformat/dump.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: dump stream side data when probingVittorio Giovara2014-06-14
| |
* | avformat/dump: put copyright back from the file from which dump.c was split outMichael Niedermayer2014-06-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb'Michael Niedermayer2014-06-16
|\| | | | | | | | | | | | | | | | | | | * commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb': lavf: group dump functions together Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: group dump functions togetherVittorio Giovara2014-06-14
| |
* | Merge commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f'Michael Niedermayer2014-06-16
|\| | | | | | | | | | | | | * commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f': vf_showinfo: print display transformation values Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_showinfo: print display transformation valuesVittorio Giovara2014-06-14
| |
* | Add nointra AVDiscard levelMichael Niedermayer2014-06-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-06-16
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Do not suggest to use gas-preprocessor on aix where it doesn't work. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Do not suggest to use gas-preprocessor on aix where it doesn't work.Carl Eugen Hoyos2014-06-16
| | |
* | | swr: reindent.Ronald S. Bultje2014-06-16
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/huffyuvdec: Fix fill value for truncated bitstreamsMichael Niedermayer2014-06-16
| | | | | | | | | | | | | | | Found-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | huffyuvdec: use unsafe bitstream readerChristophe Gisquet2014-06-16
|/ / | | | | | | | | | | | | | | | | | | | | | | The reader reads in chunks of 11 bits at most, and at most 3 times. The unsafe reader therefore may read 6 chunks instead of 1 in worst case, ie 8 bytes, which is within the padding tolerance. The reader ends up being ~10% faster. Cumulative effect of unsafe reading and code block swapping on 3 sequences is for 1 thread, decoding time goes from 23.3s to 19.0s. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | huffyuv: fate: add a BGR24 testChristophe Gisquet2014-06-16
| | | | | | | | | | | | It was previously untested. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc: Fix 4K sample videoKieran2014-06-15
| | | | | | | | | | Reviewed-by: smarter Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/smoothstreamingenc: Use av_mallocz_array()Michael Niedermayer2014-06-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix compilation on ppc64 and ppc with pic if gas-preprocessor is installed.Carl Eugen Hoyos2014-06-15
| |
* | avcodec/dvbsubdec: Split save_subtitle_set() outAnshul Maheshwari2014-06-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dvbsubdec: add AVClass to contextAnshul Maheshwari2014-06-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dvbsubdec: restructure version checkAnshul Maheshwari2014-06-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>