summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* tests/fate: Add S302M testMichael Niedermayer2015-03-02
| | | | | Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avfilter/af_aphaser: Change type to int as its accessed as int via AVOptionsMichael Niedermayer2015-03-02
| | | | | | This fixes depending on implementation defined behavior Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avfilter/af_biquads: Change width_type to int as its accessed as int via ↵Michael Niedermayer2015-03-02
| | | | | | | | AVOptions This fixes depending on implementation defined behavior Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avfilter/af_volume: Change enums to int, which are accessed via AVOption as intMichael Niedermayer2015-03-02
| | | | | | This fixes depending on implementation defined behavior Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avfilter/avf_avectorscope: Change enums to int, which are accessed via ↵Michael Niedermayer2015-03-02
| | | | | | | | AVOption as int This fixes depending on implementation defined behavior Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avfilter/avf_showspectrum: Change enums to int, which are accessed via ↵Michael Niedermayer2015-03-02
| | | | | | | | AVOption as int This fixes depending on implementation defined behavior Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/libfdk-aacdec: Change conceal_method to int, its accessed via ↵Michael Niedermayer2015-03-02
| | | | | | | | AVOption as int This fixes depending on implementation defined behavior Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffprobe: Change string_validation to int, its accessed via AVOption as intMichael Niedermayer2015-03-02
| | | | | | This fixes depending on implementation defined behavior Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avfilter/vf_drawbox: Fix handling of max valuesMichael Niedermayer2015-03-02
| | | | | | Fixes Ticket4332 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avutil/common: minor simplification in av_clip_intp2_c()Michael Niedermayer2015-03-02
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* x86/hevc_sao: use unaligned movs for sao_{band,filter} with width 8James Almer2015-03-01
| | | | | | Suggested-by: Christophe Gisquet <christophe.gisquet@gmail.com> Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* avutil/opt: also test av_opt_show2()Michael Niedermayer2015-03-01
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avutil/opt: Remove odd trailing whitespace bytes from flags help descriptionMichael Niedermayer2015-03-01
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avutil/opt: Also test/compare the av_log output i the selftestMichael Niedermayer2015-03-01
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mpegenc: Ignore max_delay if no other options remainMichael Niedermayer2015-03-01
| | | | | | | Fixes assertion failure Fixes Ticket4335 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/mips/Makefile: Build fmtconvert_mips only if CONFIG_FMTCONVERT is setMichael Niedermayer2015-03-01
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Revert "rtsp: Interpret the text media type as AVMEDIA_TYPE_DATA"Gilles Chanteperdrix2015-03-01
| | | | | | | | | | | This reverts commit 26524e358147aade6e9dd18fff42d61b966bbc70. If we want the T.140 codec to have the AV_CODEC_ID_TEXT codec id, its type needs to be AVMEDIA_TYPE_SUBTITLE, so, keep interpreting the text media type as AVMEDIA_TYPE_SUBTITLE. Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat: map T.140 RTP codec to textGilles Chanteperdrix2015-03-01
| | | | | | | | This makes more sense than mapping to AV_CODEC_ID_SUBRIP. Nothing indicates that a T.140 track contains subrip sub-titles. Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avutil/ppc/intreadwrite: remove AV_??64 overriding codeMichael Niedermayer2015-03-01
| | | | | | | The code has undefined behavior and makes no difference when optimizations are enabled. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avfilter/af_volume: fix precision=fixed and volume=0 caseGilles Chanteperdrix2015-03-01
| | | | | | | | | | | | | When precision is fixed and volume is 0, filter_frame does not perform any operation on the output buffer. This works if the output buffer has been allocated and zeroed with ff_get_audio_buffer but not if the input buffer is used as output buffer. Fix this by not using the input buffer as output buffer if precision is fixed and volume is 0. Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '4f6cd883f06f7893a2b60a41e7a4f8ae633dac2f'Michael Niedermayer2015-03-01
|\ | | | | | | | | | | | | * commit '4f6cd883f06f7893a2b60a41e7a4f8ae633dac2f': rtpenc: Don't set max_frames_per_packet based on the packet frame size or frame rate Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc: Don't set max_frames_per_packet based on the packet frame size or ↵Martin Storsjö2015-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frame rate Instead check the timestamps while muxing, to avoid buffering a too long timestamp range into one single packet. This makes the AMR and AAC packetization slightly less efficient, since we set a possibly unnecessarily high max_frames_per_packet. (These packetizers end up doing a memmove of the TOC bytes if sending a packet before max_frames_per_packet is achieved, and we end up setting max_frames_per_packet to a value that should be high enough for most uses.) All packetizers that use max_frames_per_packet now set it either to a default value, or to a value calculated based on other parameters, so none of them rely on the previous default setting. For iLBC, copy one frame at a time, to allow checking the timestamp range for each of them - basically doing potentially multiple loops to simplify the code instead of trying to calculate the number of frames to buffer while honoring s1->max_delay. This is in preparation for reducing the coupling between libavformat and libavcodec, by not having the muxers use the encoder field frame_size (which may not be available during e.g. stream copy). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'bde2bba45c2f2df27a8534028bda09a6e7f835e2'Michael Niedermayer2015-03-01
|\| | | | | | | | | | | | | | | | | | | * commit 'bde2bba45c2f2df27a8534028bda09a6e7f835e2': rtpenc: Restructure if statements in packetizers to simplify adding more conditions Conflicts: libavformat/rtpenc_xiph.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc: Restructure if statements in packetizers to simplify adding more ↵Martin Storsjö2015-02-28
| | | | | | | | | | | | | | | | | | | | conditions Factorize out the s->num_frames check at the start of the if statements, simplifying adding more alternative causes for sending the buffered frames. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'd4c7fc02f9f59e721e76debf4a595df529707545'Michael Niedermayer2015-03-01
|\| | | | | | | | | | | | | * commit 'd4c7fc02f9f59e721e76debf4a595df529707545': rtpenc: Skip redundant initialization Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc: Skip redundant initializationMartin Storsjö2015-02-28
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f8c01257f93ceda3e03bc4e540a51022d1e2bff2'Michael Niedermayer2015-03-01
|\| | | | | | | | | | | | | * commit 'f8c01257f93ceda3e03bc4e540a51022d1e2bff2': rtpenc: Always do the default initialization regardless of codecs Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc: Always do the default initialization regardless of codecsMartin Storsjö2015-02-28
| | | | | | | | | | | | | | | | This avoids having to jump to the defaultcase in the switch. Manually override the stream time base back to 90 kHz for the few audio codecs that don't use the sample rate as time base (mp2, mp3). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '11edeaea3293c41ecf577a330422eabba35f76a2'Michael Niedermayer2015-03-01
|\| | | | | | | | | | | | | * commit '11edeaea3293c41ecf577a330422eabba35f76a2': rtpenc_xiph: Don't exclude headers from max_payload_size Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_xiph: Don't exclude headers from max_payload_sizeMartin Storsjö2015-02-28
| | | | | | | | | | | | | | This makes things more consistent by using the variable in the same way as in all other packetizers. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '7c1e2e64667421f931ab48141517f19d309c7eea'Michael Niedermayer2015-03-01
|\| | | | | | | | | | | | | | | | | | | * commit '7c1e2e64667421f931ab48141517f19d309c7eea': rtpenc_xiph: Use AV_WB16 instead of manual bitshifts Conflicts: libavformat/rtpenc_xiph.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_xiph: Use AV_WB16 instead of manual bitshiftsMartin Storsjö2015-02-28
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'd16c8d28d4e2fca3af1054ffbf635c8cee755fc8'Michael Niedermayer2015-03-01
|\| | | | | | | | | | | | | * commit 'd16c8d28d4e2fca3af1054ffbf635c8cee755fc8': rtpenc_aac: Use AV_WB16 instead of manual bitshifts Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_aac: Use AV_WB16 instead of manual bitshiftsMartin Storsjö2015-02-28
| | | | | | | | | | | | This makes the code slightly more readable and understandable. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '9c9b0218e85fcd969308632f75af48a4ce229541'Michael Niedermayer2015-03-01
|\| | | | | | | | | | | | | * commit '9c9b0218e85fcd969308632f75af48a4ce229541': rtpenc_aac: Merge a definition with a declaration Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_aac: Merge a definition with a declarationMartin Storsjö2015-02-28
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '1fc64e2e07787bbca82a72c146588e850e6d098a'Michael Niedermayer2015-03-01
|\| | | | | | | | | | | | | * commit '1fc64e2e07787bbca82a72c146588e850e6d098a': rtpenc: Write conditional statements on separate lines Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc: Write conditional statements on separate linesMartin Storsjö2015-02-28
| | | | | | | | | | | | | | Intentionally keeping some conditional statements on single lines in rtpenc_h263.c. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0662440b991361fdb5e732712d997a73e4692e34'Michael Niedermayer2015-03-01
|\| | | | | | | | | | | | | * commit '0662440b991361fdb5e732712d997a73e4692e34': rtpenc_aac: Set a default value for max_frames_per_packet at init Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_aac: Set a default value for max_frames_per_packet at initMartin Storsjö2015-02-28
| | | | | | | | | | | | | | This avoids having to conditionally set the default within the packetizer function. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '12b3459979f5ea6481660cd2c99a0381e2b5ba37'Michael Niedermayer2015-03-01
|\| | | | | | | | | | | | | * commit '12b3459979f5ea6481660cd2c99a0381e2b5ba37': rtpenc_amr: Use s->num_frames instead of s->buf_ptr - s->buf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_amr: Use s->num_frames instead of s->buf_ptr - s->bufMartin Storsjö2015-02-28
| | | | | | | | | | | | | | This doesn't fix any bug, but makes the code simpler for later patches, and more straightforward to read as is. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '98563953442560dd83aab938f86de3e5a22a891f'Michael Niedermayer2015-03-01
|\| | | | | | | | | | | | | * commit '98563953442560dd83aab938f86de3e5a22a891f': rtpenc_aac: Fix sending fragmented frames Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_aac: Fix sending fragmented framesMartin Storsjö2015-02-28
| | | | | | | | | | | | | | | | | | | | | | | | After sending a fragmented frame, len (s->buf_ptr - s->buf) isn't zero, while s->num_frames is zero as intended. Using s->num_frames makes it work as intended, and is less convoluted than keeping track of (resetting) s->buf_ptr. This avoids sending stray data after sending a fragmented aac packet. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '990e4a6639d0714198583c2812b1074b5751898f'Michael Niedermayer2015-03-01
|\| | | | | | | | | | | | | | | | | | | | | * commit '990e4a6639d0714198583c2812b1074b5751898f': Add a QSV decoding example. Conflicts: configure doc/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add a QSV decoding example.Anton Khirnov2015-02-28
| |
* | Merge commit 'ea1d0b7ece1881c2f1360f8c1e2116791105af21'Michael Niedermayer2015-03-01
|\| | | | | | | | | | | | | | | * commit 'ea1d0b7ece1881c2f1360f8c1e2116791105af21': avcodec/utils: use correct printf specifier in ff_set_sar See: 732c3ebffaff5005367d7f947fa903f3b6e92f68 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec/utils: use correct printf specifier in ff_set_sarAndreas Cadhalpun2015-02-28
| | | | | | | | | | Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '802987f8c7033ec8b82b35438d3822cf7f761166'Michael Niedermayer2015-03-01
|\| | | | | | | | | | | | | | | | | | | * commit '802987f8c7033ec8b82b35438d3822cf7f761166': x11grab: Unbreak building Conflicts: libavdevice/x11grab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x11grab: Unbreak buildingChristian Hujer2015-02-28
| | | | | | | | | | | | | | The correct macro is DEC not D. Broken in b31328d008985f87f0a7c83c700847cef1a4f08c Signed-off-by: Anton Khirnov <anton@khirnov.net>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 18:49:35 +0000