summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | 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>
* | avformat/latmenc: use init_get_bits8()Michael Niedermayer2013-08-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-05
|\| | | | | | | | | | | | | * qatar/master: mxfenc: switch to av_reallocp_array() and check allocation errors Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxfenc: switch to av_reallocp_array() and check allocation errorsAlexandra Khirnova2013-08-04
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'a10c4ce24bd4a0dd557d5849aa53a0cc74677808'Michael Niedermayer2013-08-05
|\| | | | | | | | | | | | | | | | | | | * commit 'a10c4ce24bd4a0dd557d5849aa53a0cc74677808': aac: Forward errors properly in aac_decode_frame_int Conflicts: libavcodec/aacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aac: Forward errors properly in aac_decode_frame_intLuca Barbato2013-08-04
| | | | | | | | Incidentally also remove a warning.
* | Merge commit '71953ebcf94fe4ef316cdad1f276089205dd1d65'Michael Niedermayer2013-08-05
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '71953ebcf94fe4ef316cdad1f276089205dd1d65': aac: Check init_get_bits return value Conflicts: libavcodec/aacdec.c See: 73abc3a634d84e4cc8951787323b594c5476e4a8 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aac: Check init_get_bits return valueLuca Barbato2013-08-04
| | | | | | | | | | | | Some code paths can call it with invalid length. CC: libav-stable@libav.org
* | Merge commit '51fc88e7467169031b20b9983d80456b893a9fa3'Michael Niedermayer2013-08-05
|\| | | | | | | | | | | | | | | | | | | * commit '51fc88e7467169031b20b9983d80456b893a9fa3': avconv: improve some variable names Conflicts: ffmpeg_filter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: improve some variable namesAnton Khirnov2013-08-04
| | | | | | | | | | | | | | 'filter' is too generic, since the functions in question deal with several filters. Also add const qualifiers to those variables.
* | Merge commit '77cc958f60f73963be4281d6e82ef81707e40c26'Michael Niedermayer2013-08-05
|\| | | | | | | | | | | | | * commit '77cc958f60f73963be4281d6e82ef81707e40c26': lavfi: add const to the AVFilter parameter of avfilter_graph_create_filter() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: add const to the AVFilter parameter of avfilter_graph_create_filter()Anton Khirnov2013-08-04
| | | | | | | | This function should never modify the filter.
* | rdt: make const tables static constMichael Niedermayer2013-08-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mp3dec: make const tables static constMichael Niedermayer2013-08-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/fft: Fix "warning: unused variable"Michael Niedermayer2013-08-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskadec: make sipr_bit_rate static constMichael Niedermayer2013-08-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec: Implementation of 32 bit fixed point FFTNedeljko Babic2013-08-04
| | | | | | | | | | | | | | | | Iterative implementation of 32 bit fixed point split-radix FFT. Max FFT that can be calculated currently is 2^12. Signed-off-by: Nedeljko Babic <nbabic@mips.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/muxers: Document use case of mpegts muxer option tables_versionAndrey Utkin2013-08-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_scale: add force_original_aspect_ratioTimothy Gu2013-08-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | MAINTAINERS: order libavutil entries alphabeticallyMichael Niedermayer2013-08-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 20:25:29 +0000