summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'c84ea750cf765c9d8845fca5546eb0ae25b9c855'Michael Niedermayer2013-08-06
|\ | | | | | | | | | | | | * commit 'c84ea750cf765c9d8845fca5546eb0ae25b9c855': mpegts: Make discard_pid() faster for single-program streams Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Make discard_pid() faster for single-program streamsBen Avison2013-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | When a stream contains a single program, there's no point in doing a PID -> program lookup. Normally the one and only program isn't disabled, so no packets should be discarded. Before After Mean StdDev Mean StdDev Change discard_pid() 73.8 9.4 20.2 1.5 +264.8% Overall 2300.8 28.0 2253.1 20.6 +2.1% Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'cabb1681697555e2c319c37c1f30f149207e9434'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | * commit 'cabb1681697555e2c319c37c1f30f149207e9434': mpegts: Remove one memcpy per packet Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Remove one memcpy per packetBen Avison2013-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was being performed to ensure that a complete packet was held in contiguous memory, prior to parsing the packet. However, the source buffer is typically large enough that the packet was already contiguous, so it is beneficial to return the packet by reference in most cases. Before After Mean StdDev Mean StdDev Change memcpy 720.7 32.7 649.8 25.1 +10.9% Overall 2372.7 46.1 2291.7 21.8 +3.5% Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'daf1e0d3de03bd424016e2a7520e4e94ece5c0ac'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | * commit 'daf1e0d3de03bd424016e2a7520e4e94ece5c0ac': avio: Add an internal function for reading without copying Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: Add an internal function for reading without copyingBen Avison2013-08-05
| | | | | | | | | | | | | | | | As long as there is enough contiguous data in the avio buffer, just return a pointer to it instead of copying it to the caller provided buffer. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '22a154e4363b351dd9f321003de01dffebd2fa18'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | * commit '22a154e4363b351dd9f321003de01dffebd2fa18': build: Add missing img2.o dependency to apetag.o Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Add missing img2.o dependency to apetag.oDiego Biurrun2013-08-05
| |
* | Merge commit 'bea3d6f4363ff1bbbd99c1717f7498b9fdb12cfc'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | * commit 'bea3d6f4363ff1bbbd99c1717f7498b9fdb12cfc': ismindex: Replace mkdir ifdeffery by os_support.h #include Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: Replace mkdir ifdeffery by os_support.h #includeDiego Biurrun2013-08-05
| | | | | | | | os_support.h contains more precise workarounds for non-POSIX mkdir().
* | avcodec/vdpau: include attributes.h, needed for attribute_deprecatedMichael Niedermayer2013-08-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vdpau.h: define FF_API_BUFS_VDPAU if its not definedMichael Niedermayer2013-08-06
| | | | | | | | | | | | Similar to 50fb8c1114b9c2b7d299cbc17a18a457d12069a8 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f824535a4a79c260b59d3178b8d958217caffd78'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | * commit 'f824535a4a79c260b59d3178b8d958217caffd78': vdpau: deprecate bitstream buffers within the hardware context Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: deprecate bitstream buffers within the hardware contextRémi Denis-Courmont2013-08-05
| | | | | | | | | | | | | | | | The bitstream buffers are now private and freed by libavcodec. For backward compatibility, the hold bitstream buffer pointer is left NULL (applications were supposed to av_freep() it). Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '2852740e23f91d6775714d7cc29b9a73e1111ce0'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | * commit '2852740e23f91d6775714d7cc29b9a73e1111ce0': vdpau: store picture data in picture's rather than codec's context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: store picture data in picture's rather than codec's contextRémi Denis-Courmont2013-08-05
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avcodec/vdpau.h: define FF_API_CAP_VDPAU if its not definedMichael Niedermayer2013-08-06
| | | | | | | | | | | | | | | | Prevent build failure for applicatins using the old API This could be replaced be a include of version.h but some applications would then need extern C wrapers Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '549294fbbe1c00fee37dc4d3f291b98945e11094'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | * commit '549294fbbe1c00fee37dc4d3f291b98945e11094': vdpau: deprecate VDPAU codec capability Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: deprecate VDPAU codec capabilityRémi Denis-Courmont2013-08-05
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | * commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909': vdpau: deprecate old codec-specific pixel formats Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: deprecate old codec-specific pixel formatsRémi Denis-Courmont2013-08-05
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8': vdpau: remove old-style decoders Conflicts: libavcodec/allcodecs.c libavcodec/h263dec.c libavcodec/h264.c libavcodec/mpeg12dec.c libavcodec/mpeg4videodec.c libavcodec/vc1dec.c libavcodec/vdpau.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: remove old-style decodersRémi Denis-Courmont2013-08-05
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | | | * commit '488a0fa68973d48e264d54f1722f7afb18afbea7': avconv: support -t as an input option. Conflicts: Changelog ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: support -t as an input option.Anton Khirnov2013-08-05
| | | | | | | | It limits the duration of the data read from a given input.
* | ffmpeg_opt: Remove support for specifying -t anywhere to set the durationMichael Niedermayer2013-08-06
| | | | | | | | | | | | This would otherwise conflict with the semantics of using -t for the input Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '811bd0784679dfcb4ed02043a37c92f9df10500e'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '811bd0784679dfcb4ed02043a37c92f9df10500e': avconv: make input -ss accurate when transcoding Conflicts: Changelog doc/ffmpeg.texi ffmpeg.h ffmpeg_filter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: make input -ss accurate when transcodingAnton Khirnov2013-08-05
| | | | | | | | | | Insert (a)trim filters on the corresponding inputs, so the extra frames are decoded and discarded.
* | Merge commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | | | * commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8': avconv: distinguish between -ss 0 and -ss not being used Conflicts: ffmpeg.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: distinguish between -ss 0 and -ss not being usedAnton Khirnov2013-08-05
| | | | | | | | | | Using -ss 0 to drop frames with negative timestamps is a perfectly valid use case.
* | Merge commit '2e661f26f8b12195f75ae3b07d9591e395135bc7'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | * commit '2e661f26f8b12195f75ae3b07d9591e395135bc7': avconv: insert extra filters in the same way for both graph inputs and outputs Conflicts: ffmpeg_filter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: insert extra filters in the same way for both graph inputs and outputsAnton Khirnov2013-08-05
| | | | | | | | | | This will allow using the same code when one filter can be inserted both on input and output.
* | Merge commit '3799376dd3373ee255651ed542c75b15665801a8'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | * commit '3799376dd3373ee255651ed542c75b15665801a8': lavfi/fifo: fix flushing when using request_samples Conflicts: libavfilter/fifo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi/fifo: fix flushing when using request_samplesAnton Khirnov2013-08-05
| | | | | | | | | | If any samples are still buffered when request_frame returns EOF, they won't be returned currently.
* | Merge commit '06cd4c5a68e23f5be199c0d2d563da80989f839f'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | * commit '06cd4c5a68e23f5be199c0d2d563da80989f839f': avconv: fix usage of deprecated lavfi API Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: fix usage of deprecated lavfi APIAnton Khirnov2013-08-05
| |
* | Merge commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | * commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7': avserver: do not use a static string as a default for a string option See: 19c41c6d8ef6cc34cfde6bf877e059689e763bb7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avserver: do not use a static string as a default for a string optionAnton Khirnov2013-08-04
| | | | | | | | | | | | Fixes an invalid free. Bug-id: 448
* | mpegts: add fix_teletext_pts mpegts demuxer optionMarton Balint2013-08-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes since v1 of the patch: - enable option by default - add documentation - move up PTS override code after PES header parsing, to ensure we use the last PCR before the first packet of the teletext PES packet. The option overrides teletext packet PTS and DTS values with the timestamps calculated from the PCR of the first program which the teletext stream is part of and is not discarded. Using the same teletext PID for multiple programs is possible, therefore we need some kind of heuristics to know which program PCR we should synchronize to. Using the first non-discarded PCR pid among the programs of the teletext stream seemed like a good choice. The patch does not do PCR interpolation to estimate the PCR of the teltetext packet, it just uses the last PCR of the program, which may cause a slight error (0.1 sec) in the teletext packet pts-es. Based on a patch by Reimar Döffinger. http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2012-September/131610.html Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Set bits_per_raw_sample when decoding pnm.Carl Eugen Hoyos2013-08-06
| |
* | rtp: Make ff_rtp_codec_id() case insensitiveWei-Cheng Pan2013-08-05
| | | | | | | | | | | | Fixes handling of lower case pcmu Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libxvid: Reduce the size of an arrayTimothy Gu2013-08-05
| | | | | | | | | | | | It is not possible to have a plugin[] array with 5 or more elements. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libxvid: Partially check plugins array size with assertMichael Niedermayer2013-08-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libxvid: set lumi_aq for lumimaskingMichael Niedermayer2013-08-05
| | | | | | | | | | | | Simplifies check and should fix lumi+vari warning Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: Add vorbiscomment cover art testJames Almer2013-08-05
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tta: use init_get_bits8()Michael Niedermayer2013-08-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/takdec: use init_get_bits8()Michael Niedermayer2013-08-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/eatgq: use init_get_bits8()Michael Niedermayer2013-08-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/diracdec: use init_get_bits8()Michael Niedermayer2013-08-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ra144dec: use init_get_bits8()Michael Niedermayer2013-08-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-28 10:11:07 +0000