summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* swr-test: drop one const, silence most const qualifer warnings.Michael Niedermayer2011-12-03
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr-test_: Fix mixed declaration and statements:Michael Niedermayer2011-12-03
| | | | | | | swresample_test.c:123:21: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] swresample_test.c:127:25: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libavutil: increase struct SampleFmtInfo member 'name' length to 8Giorgio Vazzana2011-12-03
| | | | | | This is necessary since some sample format names are longer than 3 characters. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swscale: Fix all cast qualifier warnings:Michael Niedermayer2011-12-03
| | | | | | | | | libswscale/swscale.c:2744:40: warning: to be safe all intermediate pointers in cast from ‘int16_t **’ to ‘const int16_t **’ must be ‘const’ qualified [-Wcast-qual] libswscale/swscale.c:2745:41: warning: to be safe all intermediate pointers in cast from ‘int16_t **’ to ‘const int16_t **’ must be ‘const’ qualified [-Wcast-qual] libswscale/swscale.c:2746:41: warning: to be safe all intermediate pointers in cast from ‘int16_t **’ to ‘const int16_t **’ must be ‘const’ qualified [-Wcast-qual] libswscale/swscale.c:2747:78: warning: to be safe all intermediate pointers in cast from ‘int16_t **’ to ‘const int16_t **’ must be ‘const’ qualified [-Wcast-qual] Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swscale_mmx: Fix cast qualifier warnings:Michael Niedermayer2011-12-03
| | | | | | | | libswscale/x86/swscale_mmx.c:131:36: warning: to be safe all intermediate pointers in cast from ‘int16_t **’ to ‘const int16_t **’ must be ‘const’ qualified [-Wcast-qual] libswscale/x86/swscale_mmx.c:132:37: warning: to be safe all intermediate pointers in cast from ‘int16_t **’ to ‘const int16_t **’ must be ‘const’ qualified [-Wcast-qual] libswscale/x86/swscale_mmx.c:133:74: warning: to be safe all intermediate pointers in cast from ‘int16_t **’ to ‘const int16_t **’ must be ‘const’ qualified [-Wcast-qual] Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* sws: remove unused variableMichael Niedermayer2011-12-03
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* doc/example/muxing: fix video timestampsMichael Niedermayer2011-12-02
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* muxing example: set encoder defaultsMichael Niedermayer2011-12-02
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* pictordec: support uncompressed imagesPeter Ross2011-12-02
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Be less verbose when skipping RBSP data in H264 PPS.Carl Eugen Hoyos2011-12-02
| | | | Fixes ticket #693.
* Be less verbose when skipping MPEG-4 ASP frames.Carl Eugen Hoyos2011-12-02
| | | | Fixes ticket #560.
* Support yuva420p encoding via libopenjpeg.Carl Eugen Hoyos2011-12-02
|
* Support tiff RGBA encoding.Carl Eugen Hoyos2011-12-02
|
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-02
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (25 commits) rtpenc: Add support for G726 audio rtpdec: Interpret the different G726 names as bits_per_coded_sample rtpenc: Change rtp_send_samples to handle sample sizes other than even bytes rtpenc: Cast a rescaling parameter to int64_t h264: cap max has_b_frames at MAX_DELAYED_PIC_COUNT - 1. ARM: fix indentation in ff_dsputil_init_neon() ARM: NEON put/avg_pixels8/16 cosmetics ARM: add remaining NEON avg_pixels8/16 functions ARM: clean up NEON put/avg_pixels macros fate: split acodec-pcm into individual tests swscale: #include "libavutil/mathematics.h" pmpdec: don't use deprecated av_set_pts_info. rv34: align temporary block of "dct" coefs Add PlayStation Portable PMP format demuxer proto: Realign struct initializers proto: Use .priv_data_size to allocate the private context mmsh: Properly clean up if the second ffurl_alloc failed rtmp: Clean up properly if the handshake failed md5proto: Remove the get_file_handle function applehttpproto: Use the close function if the open function fails ... Conflicts: libavcodec/vble.c libavformat/mmsh.c libavformat/pmpdec.c libavformat/udp.c tests/ref/acodec/pcm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc: Add support for G726 audioMartin Storsjö2011-12-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpdec: Interpret the different G726 names as bits_per_coded_sampleMartin Storsjö2011-12-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For the standardized 8 kHz sample rate, this works exactly the same. For nonstandard sample rates, the different predefined G726 names (G726-16, G726-24, G726-32, G726-40) are interpreted as an indication of the bits per coded sample, even though their actual bitrates aren't what the name specifies. This feels more sane than using free-form names for nonstandard sample rate/bitrate combinations, e.g like G726-22, G726-33 for 11025 Hz. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpenc: Change rtp_send_samples to handle sample sizes other than even bytesMartin Storsjö2011-12-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpenc: Cast a rescaling parameter to int64_tMartin Storsjö2011-12-01
| | | | | | | | | | | | | | This avoids overflow if frame_size is over 2147, since both frame_size and AV_TIME_BASE are plain integers. Signed-off-by: Martin Storsjö <martin@martin.st>
| * h264: cap max has_b_frames at MAX_DELAYED_PIC_COUNT - 1.Ronald S. Bultje2011-12-01
| | | | | | | | | | This prevents frame allocation overflows, and fixed fate-h264-conformance-mr3_tandberg_b with 2 threads.
| * ARM: fix indentation in ff_dsputil_init_neon()Mans Rullgard2011-12-01
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * ARM: NEON put/avg_pixels8/16 cosmeticsMans Rullgard2011-12-01
| | | | | | | | | | | | | | This makes whitespace and register names consistent with the style used in more recent code. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * ARM: add remaining NEON avg_pixels8/16 functionsMans Rullgard2011-12-01
| |
| * ARM: clean up NEON put/avg_pixels macrosMans Rullgard2011-12-01
| | | | | | | | | | | | Although this adds a few lines, the macro calls are less convoluted. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * fate: split acodec-pcm into individual testsJustin Ruggles2011-12-01
| | | | | | | | | | this removes 2 redundant tests for pcm in mkv. we can add the coverage back in later as fate-lavf tests if needed.
| * swscale: #include "libavutil/mathematics.h"Reinhard Tartler2011-12-01
| | | | | | | | | | | | | | | | this file uses the M_PI macro since 4e74187db2f5db52f88729efc662df9d6bc763e1, so include the correct header directly. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * pmpdec: don't use deprecated av_set_pts_info.Anton Khirnov2011-12-01
| |
| * rv34: align temporary block of "dct" coefsMans Rullgard2011-12-01
| | | | | | | | | | | | This is needed for optimised transforms. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Add PlayStation Portable PMP format demuxerReimar Döffinger2011-12-01
| | | | | | | | | | | | | | | | | | Not yet complete, for demuxing AAC the AAC header must be generated manually. Possibly the decoder could accept the header as extradata to simplify this. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * proto: Realign struct initializersMartin Storsjö2011-12-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * proto: Use .priv_data_size to allocate the private contextMartin Storsjö2011-12-01
| | | | | | | | | | | | | | | | This simplifies the open functions by avoiding one function call that needs error checking, reducing the amount of extra bulk code. Signed-off-by: Martin Storsjö <martin@martin.st>
| * mmsh: Properly clean up if the second ffurl_alloc failedMartin Storsjö2011-12-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtmp: Clean up properly if the handshake failedMartin Storsjö2011-12-01
| | | | | | | | | | | | This prevents memory leaks if this function returns an error. Signed-off-by: Martin Storsjö <martin@martin.st>
| * md5proto: Remove the get_file_handle functionMartin Storsjö2011-12-01
| | | | | | | | | | | | | | The private data pointer isn't a file handle, this protocol doesn't have any file handle to return. Signed-off-by: Martin Storsjö <martin@martin.st>
| * applehttpproto: Use the close function if the open function failsMartin Storsjö2011-12-01
| | | | | | | | | | | | This should clean up leaked memory. Signed-off-by: Martin Storsjö <martin@martin.st>
| * http: Make sure proxyauth is initializedMartin Storsjö2011-12-01
| | | | | | | | | | | | | | | | | | This string will be passed to ff_http_auth_create_response even if no proxy is used, resulting in reading uninitialized memory. The other auth string is always initialized by av_url_split. Signed-off-by: Martin Storsjö <martin@martin.st>
| * vble: use dsp.add_hfyu_median_prediction() this allows asm optimizations to ↵Michael Niedermayer2011-11-30
| | | | | | | | | | | | | | be used. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * vble: remove flags copy, its not used in any speed relevant code.Michael Niedermayer2011-11-30
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * vble: merge len and val arraysDerek Buitenhuis2011-11-30
| | | | | | | | | | | | | | | | | | | | There's no reason to use two arrays for this. Based off commit 2fea60c60084c4e70d7cef128ea3bca5690ce465 to FFmpeg by Michael Niedermayer. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * vble: remove unused variable len.Michael Niedermayer2011-11-30
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Support transparency in 32bit bmp files.Carl Eugen Hoyos2011-12-02
| |
* | Revert "libutvideodec: Make buf_size local"Derek Buitenhuis2011-12-01
| | | | | | | | | | | | | | | | | | | | This change was dependent on a different patch that never actually made it into FFmpeg, and it actually ended up breaking builds. This reverts commit 70cf7bb958899c369f778e29b8bd4203723bed04. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix id3v2 extended header handling.Adrian Drzewiecki2011-12-01
| | | | | | | | | | | | | | | | When skipping over the extended header, take into account that the size field has already been read. The extended header also takes up space, so adjust total header length accordingly. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: add forgotten libx264rgb_encoder_depsMichael Niedermayer2011-12-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2011-12-01
|\ \ | | | | | | | | | | | | | | | | | | * cus/stable: ffplay: Copy audio side data too. This fixes handling of some rare nellymoser files that change the sample rate mid stream (sample file at: http://trac.videolan.org/vlc/ticket/5586) Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ffplay: Copy audio side data too. This fixes handling of some rare ↵Michael Niedermayer2011-12-01
| | | | | | | | | | | | | | | | | | | | | nellymoser files that change the sample rate mid stream (sample file at: http://trac.videolan.org/vlc/ticket/5586) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Marton Balint <cus@passwd.hu>
* | | libx264: Implement rgb24 support through a seperate AVCodec.Michael Niedermayer2011-12-01
|/ / | | | | | | | | | | | | This avoids people mistakely encoding in a way that many players dont support. Fixes Ticket658 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libx264: fix generic boolean supportMichael Niedermayer2011-12-01
| | | | | | | | | | | | Fixes Ticket660 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1_parser: fix NULL pointer dereferenceMichael Niedermayer2011-12-01
| | | | | | | | | | | | Fixes Ticket456 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support ffmpeg -dn to disable copying data streams.Carl Eugen Hoyos2011-12-01
| | | | | | | | Fixes ticket #647.
* | h264: More restrictive more_rbsp_data_in_pps()Michael Niedermayer2011-12-01
| | | | | | | | | | | | Fixes Ticket697 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-15 17:33:53 +0000