summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '852c329a69ddfd635807f60454df07d021c64901'Michael Niedermayer2014-06-191-2/+1
|\ | | | | | | | | | | | | | | | | | | * commit '852c329a69ddfd635807f60454df07d021c64901': configure: Drop duplicate pkg-config entry from help output Conflicts: configure Merged-by: Michael Niedermayer <[email protected]>
| * configure: Drop duplicate pkg-config entry from help outputDiego Biurrun2014-06-191-2/+1
| |
* | Merge commit 'b2290bf10b12b7772f55fcab014a47e18e9fdef2'Michael Niedermayer2014-06-191-0/+4
|\| | | | | | | | | | | | | * commit 'b2290bf10b12b7772f55fcab014a47e18e9fdef2': i263: skip dummy frames Merged-by: Michael Niedermayer <[email protected]>
| * i263: skip dummy framesDirk Ausserhaus2014-06-191-0/+4
| | | | | | | | | | | | | | Intel i263 codec has special 8-byte dummy frames that should not be decoded, so do not even attempt to decode them and skip them instead. Signed-off-by: Kostya Shishkov <[email protected]>
* | avcodec: add simpleauto idctMichael Niedermayer2014-06-196-0/+8
| | | | | | | | | | | | This will pick the "best" simple idct compatible idct Signed-off-by: Michael Niedermayer <[email protected]>
* | lavf/Makefile: fix standalone compilation of live_flv demuxerJames Almer2014-06-191-0/+1
| | | | | | | | | | Signed-off-by: James Almer <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | configure: fix NASM output format on Win64James Almer2014-06-191-1/+6
| | | | | | | | | | Signed-off-by: James Almer <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | x86/hevc_idct: fix movd parameter size in DC_ADD_INITJames Almer2014-06-191-1/+1
| | | | | | | | | | | | | | Fixes compilation with NASM x86_64 Signed-off-by: James Almer <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | x86/blockdsp: move asm code out of dsputilJames Almer2014-06-194-64/+88
| | | | | | | | | | | | | | | | Also replace INLINE_<opt> with EXTERNAL_<opt> that were wrongly changed by commit 2b05db4f8102148d013755ac2a7e47f6d79ff7ca Signed-off-by: James Almer <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | huffyuv: change statistics initializationChristophe Gisquet2014-06-1923-64/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normally, a Laplace distribution is more typical of the residuals encoded, but for noisy input, it's both better and simpler to be safe and use a 1/d^2 distribution. Second hunk could use some renormalization but it has effectively little impact. Output size of ffvhuff on various 4:2:0 sequences: context=0,1/d: 851974 27226 1137281 context=0,1/d²: 619081 25069 1051500 context=0,1/d³: 501983 30454 1290561 context=0,lapl: 500650 31754 1304082 Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/x86/lossless_videodsp: Fix size of values read for left/left_topMichael Niedermayer2014-06-191-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'Michael Niedermayer2014-06-1955-295/+625
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9': dsputil: Split clear_block*/fill_block* off into a separate context Conflicts: configure libavcodec/asvdec.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dsputil.h libavcodec/eamad.c libavcodec/intrax8.c libavcodec/mjpegdec.c libavcodec/ppc/dsputil_ppc.c libavcodec/vc1dec.c libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <[email protected]>
| * dsputil: Split clear_block*/fill_block* off into a separate contextDiego Biurrun2014-06-1853-361/+677
| |
* | ppc: Fix the bug of fft for little endian environment on POWER7 and laterRong Yan2014-06-195-1/+1084
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '869fc416f7c78ed4e397e0208acd1545771c0502'Michael Niedermayer2014-06-181-1/+1
|\| | | | | | | | | | | | | * commit '869fc416f7c78ed4e397e0208acd1545771c0502': hevc: Mark num_bins_in_se as unused Merged-by: Michael Niedermayer <[email protected]>
| * hevc: Mark num_bins_in_se as unusedLuca Barbato2014-06-181-1/+1
| | | | | | | | Only its size is actually used. Silence a clang warning.
* | Merge commit 'c385313d2590fd26e26bb9bdacddef78162ab490'Michael Niedermayer2014-06-181-3/+16
|\| | | | | | | | | | | | | * commit 'c385313d2590fd26e26bb9bdacddef78162ab490': rtsp: Support misordered fmtp rtpmap Merged-by: Michael Niedermayer <[email protected]>
| * rtsp: Support misordered fmtp rtpmapJoshua Kordani2014-06-181-3/+16
| | | | | | | | Issue present in Avigilon IP cameras.
* | Merge commit 'c9c1e00f95350e7a36b0d05a03939c7f6438e371'Michael Niedermayer2014-06-181-9/+18
|\| | | | | | | | | | | | | * commit 'c9c1e00f95350e7a36b0d05a03939c7f6438e371': rtsp: Factor out fmtp parsing Merged-by: Michael Niedermayer <[email protected]>
| * rtsp: Factor out fmtp parsingLuca Barbato2014-06-181-9/+18
| |
* | Merge commit '49a242687cf44f86570b706db3c5912ff06bc6c2'Michael Niedermayer2014-06-181-3/+7
|\| | | | | | | | | | | | | | | | | | | * commit '49a242687cf44f86570b706db3c5912ff06bc6c2': doc: Document segment_list_type Conflicts: doc/muxers.texi Merged-by: Michael Niedermayer <[email protected]>
| * doc: Document segment_list_typeLuca Barbato2014-06-181-0/+6
| |
* | doc/bitstream_filters: document imxdumpLou Logan2014-06-181-1/+12
| | | | | | | | | | | | | | Partially addresses ticket #3198. Signed-off-by: Lou Logan <[email protected]> Tested-by: Dave Rice <[email protected]>
* | ffmpeg_opt: Dont exit on avformat_find_stream_info() failure if there are ↵Michael Niedermayer2014-06-181-2/+4
| | | | | | | | | | | | | | | | | | streams This allows "-codec copy -f framecrc" on files with only unindentifyable streams Reviewed-by: Stefano Sabatini <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mux: simplify ff_choose_timebase()Michael Niedermayer2014-06-181-5/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | dump_stream_format: fix division by 0Michael Niedermayer2014-06-181-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '194be1f43ea391eb986732707435176e579265aa'Michael Niedermayer2014-06-1818-41/+89
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '194be1f43ea391eb986732707435176e579265aa': lavf: switch to AVStream.time_base as the hint for the muxer timebase Conflicts: doc/APIchanges libavformat/filmstripenc.c libavformat/movenc.c libavformat/mxfenc.c libavformat/oggenc.c libavformat/swf.h libavformat/version.h tests/ref/lavf/mkv Merged-by: Michael Niedermayer <[email protected]>
| * lavf: switch to AVStream.time_base as the hint for the muxer timebaseAnton Khirnov2014-06-1818-43/+90
| | | | | | | | | | | | | | | | | | | | | | | | Previously, AVStream.codec.time_base was used for that purpose, which was quite confusing for the callers. This change also opens the path for removing AVStream.codec. The change in the lavf-mkv test is due to the native timebase (1/1000) being used instead of the default one (1/90000), so the packets are now sent to the crc muxer in the same order in which they are demuxed (previously some of them got reordered because of inexact timestamp conversion).
* | avcodec/ass: move playres parameters below scripttypeClément Bœsch2014-06-1817-17/+17
| | | | | | | | Suggested-by: wm4
* | avcodec/ass: explicit PlayRes[XY]Clément Bœsch2014-06-1817-16/+18
| | | | | | | | | | | | | | | | This avoids the following libass warning when using the subtitles filter: "Neither PlayResX nor PlayResY defined. Assuming 384x288" Subtitles tests change because the output is ASS and the PlayRes[XY] ends up in the output.
* | Merge commit 'd754ed41727b1fcbab335b510248a9758a73320c'Michael Niedermayer2014-06-184-18/+19
|\| | | | | | | | | | | | | | | | | | | * commit 'd754ed41727b1fcbab335b510248a9758a73320c': riffenc: take an AVStream instead of an AVCodecContext Conflicts: libavformat/nutenc.c Merged-by: Michael Niedermayer <[email protected]>
| * riffenc: take an AVStream instead of an AVCodecContextAnton Khirnov2014-06-184-18/+19
| | | | | | | | | | | | It will be useful in the following commits. Also, rename the AVCodecContext pointer name from 'stream' to 'codec'.
* | Merge commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228'Michael Niedermayer2014-06-189-0/+9
|\| | | | | | | | | | | | | | | | | | | * commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228': lavf: add the notimestamps flag to the muxers missing it Conflicts: libavformat/adtsenc.c Merged-by: Michael Niedermayer <[email protected]>
| * lavf: add the notimestamps flag to the muxers missing itAnton Khirnov2014-06-189-0/+9
| |
* | Merge commit 'cfbdd7ffbd9fe14d110fd1bb89bf52f0f7bde016'Michael Niedermayer2014-06-181-1/+6
|\| | | | | | | | | | | | | * commit 'cfbdd7ffbd9fe14d110fd1bb89bf52f0f7bde016': rtpenc: base max_frames_per_packet on avg_frame_rate, not codec timebase Merged-by: Michael Niedermayer <[email protected]>
| * rtpenc: base max_frames_per_packet on avg_frame_rate, not codec timebaseAnton Khirnov2014-06-181-1/+6
| | | | | | | | | | Fall back to 1 (which is what is used for most cases anyway) when the framerate is not set.
* | Merge commit '894682a9739eb8d4bfc024b0d4e5757fcfe47378'Michael Niedermayer2014-06-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '894682a9739eb8d4bfc024b0d4e5757fcfe47378': Remove avserver. Conflicts: .gitignore Changelog Makefile configure doc/ffserver.conf doc/ffserver.texi doc/general.texi ffserver.c libavformat/Makefile libavformat/ffm.h libavformat/ffmdec.c libavformat/ffmenc.c tests/fate/avformat.mak tests/lavf-regression.sh tests/ref/lavf/ffm tests/ref/seek/lavf-ffm Not merged, ffserver does have a maintainer co maintainers are welcome and needed though ! Merged-by: Michael Niedermayer <[email protected]>
| * Remove avserver.Anton Khirnov2014-06-1818-6199/+7
| | | | | | | | | | | | | | It has not been properly maintained for years and there is little hope of that changing in the future. It appears simpler to write a new replacement from scratch than unbreaking it.
* | avcodec/huffyuvdec: do not leave alpha values uninitializedMichael Niedermayer2014-06-181-1/+2
| | | | | | | | | | | | fixes fate failure under valgrind Signed-off-by: Michael Niedermayer <[email protected]>
* | Revert "Fix compilation on ppc64 and ppc with pic if gas-preprocessor is ↵Carl Eugen Hoyos2014-06-181-1/+1
| | | | | | | | | | | | | | installed." It broke gas-preprocessor detection on PPC64 Linux. This reverts commit b67bcd784dde7ad2b1a167ce7ffef14f8a0c8074.
* | swr: remove div/mod from DSP functions.Ronald S. Bultje2014-06-183-12/+19
| | | | | | | | | | | | Also fix a bug with resample_compensation resetting dst_incr. Signed-off-by: Michael Niedermayer <[email protected]>
* | Fix all VDPAU decoders.Carl Eugen Hoyos2014-06-181-0/+3
| | | | | | | | Fixes ticket #3726.
* | avcodec/dcadec: remove unsignedness from constantMichael Niedermayer2014-06-181-8/+1
| | | | | | | | | | | | | | POSIX gurantees >=32bit so it all fits in signed int Also >=32bit ints are assumed througout the codebase Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'f2ce63246f5c934429f9cb857a794e07624d7912'Michael Niedermayer2014-06-181-0/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2ce63246f5c934429f9cb857a794e07624d7912': dcadec: replace ldexpf with a multiplication by a constant Conflicts: libavcodec/dcadec.c See: 6da06ef6bbc01b713f67ffb94e7697eb2393ebe4 See: 9ccb5455ca8c63eb330abd3c2ed6a9b0ae3b755e See: 6b88f22e895314164eef00ccbdbf11ad97a7c56f Merged-by: Michael Niedermayer <[email protected]>
| * dcadec: replace ldexpf with a multiplication by a constantNiels Möller2014-06-181-1/+1
| | | | | | | | Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit '44671b57866aab8dd36715ff010e985e25baaf19'Michael Niedermayer2014-06-181-9/+12
|\| | | | | | | | | | | | | * commit '44671b57866aab8dd36715ff010e985e25baaf19': AVFrame: factor out freeing the side data Merged-by: Michael Niedermayer <[email protected]>
| * AVFrame: factor out freeing the side dataRoman Savchenko2014-06-181-9/+12
| | | | | | | | Signed-off-by: Anton Khirnov <[email protected]>
* | swscale/swscale: replace potentially slow % by &Michael Niedermayer2014-06-181-6/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/cavsdec: simplify % 512 operationsMichael Niedermayer2014-06-181-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | swresample/audioconvert: fix () in FMT_PAIR_FUNC()Michael Niedermayer2014-06-181-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>