summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | Merge commit '880391ed2d2faf796ca3a16f63cec69767546a21'Michael Niedermayer2013-08-08
|\| | | | | | | | | | | | | | | | | | | * commit '880391ed2d2faf796ca3a16f63cec69767546a21': libavutil: use avpriv_open() Conflicts: libavutil/random_seed.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavutil: use avpriv_open()Rémi Denis-Courmont2013-08-07
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | libavutil: Don't use fcntl if the function does not existDerek Buitenhuis2013-08-08
| | | | | | | | | | | | | | Not all platforms have the function. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '869b04e89154cd92d2bcfdabcecbe3217864c099'Michael Niedermayer2013-08-08
|\| | | | | | | | | | | | | * commit '869b04e89154cd92d2bcfdabcecbe3217864c099': libavutil: add avpriv_open() to open files with close-on-exec flag Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavutil: add avpriv_open() to open files with close-on-exec flagRémi Denis-Courmont2013-08-07
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '22c879057ead189c0f59241cb9eeb926381e3299'Michael Niedermayer2013-08-08
|\| | | | | | | | | | | | | * commit '22c879057ead189c0f59241cb9eeb926381e3299': mpegvideo_enc: drop outdated copy_picture_attributes() in favour of a modern av_frame_copy_props() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo_enc: drop outdated copy_picture_attributes() in favour of a modern ↵Vittorio Giovara2013-08-07
| | | | | | | | | | | | av_frame_copy_props() Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'f4d371b9737c0405b3bc46d7ca0c856c0a8616b1'Michael Niedermayer2013-08-08
|\| | | | | | | | | | | | | * commit 'f4d371b9737c0405b3bc46d7ca0c856c0a8616b1': rtsp: Don't include the listen flag in the SDP demuxer flags Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: Don't include the listen flag in the SDP demuxer flagsMartin Storsjö2013-08-07
| | | | | | | | | | | | | | It's only relevant for the RTSP demuxer. Similarly, the custom_io flag is only present in the SDP demuxer options list. Signed-off-by: Martin Storsjö <martin@martin.st>
* | swscale/utils: Fix potential overflow of srcPos*C before converting to 64bitMichael Niedermayer2013-08-08
| | | | | | | | | | | | Fixes CID1061054 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale/utils: Fix potential overflow of dstPos*xInc before converting to 64bitMichael Niedermayer2013-08-08
| | | | | | | | | | | | Fixes CID1061053 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/opt: fix types passed to the format string "%s"Michael Niedermayer2013-08-08
| | | | | | | | | | | | | | | | Fixes gcc warnings Fixes CID1061056 Fixes CID1061057 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2013-08-07
|\ \ | | | | | | | | | | | | | | | | | | | | | * cigaes/master: ffmpeg: remove obsolete workaround in trim insertion. lavu/log: do not skip overwritten lines. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ffmpeg: remove obsolete workaround in trim insertion.Nicolas George2013-08-07
| | | | | | | | | | | | | | | | | | | | | | | | The bug it was working seems to have been fixed. This change causes ffmpeg to use the trim filter to implement the -t option. FATE tests are updated due to the more accurate handling of the last packets.
| * | lavu/log: do not skip overwritten lines.Nicolas George2013-08-07
| | | | | | | | | | | | | | | | | | If the line ends with \r, it will not flood the tty, and the "Last message repeated" line would overwrite it. Fix bug introduced by c25d1ba.
* | | av_frame_copy_props: fix unintended self assignmentMichael Niedermayer2013-08-07
| | | | | | | | | | | | | | | | | | Fixes CID1061052 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/oggparsevorbis: fix leak of ttMichael Niedermayer2013-08-07
| | | | | | | | | | | | | | | | | | Fixes CID1061059 Fixes fate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/oggparsevorbis: fix leak of ctMichael Niedermayer2013-08-07
| | | | | | | | | | | | | | | | | | | | | Fixes CID1061058 Fixes fate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | ff_flac_parse_picture: assert that len is within the arrayMichael Niedermayer2013-08-07
| | | | | | | | | | | | | | | | | | | | | The check that gurantees this isnt recognized by coverity for example Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/g2meet: fix src pointer checks in kempf_decode_tile()Michael Niedermayer2013-08-07
|/ / | | | | | | | | | | Fixes Ticket2842 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: check sample sepration for validityMichael Niedermayer2013-08-07
| | | | | | | | | | | | | | Fixes division by 0 Fixes Ticket2841 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-07
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: deprecate AV_CODEC_ID_VOXWARE and introduce AV_CODEC_ID_METASOUND instead Conflicts: libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * deprecate AV_CODEC_ID_VOXWARE and introduce AV_CODEC_ID_METASOUND insteadKostya Shishkov2013-08-07
| | | | | | | | | | Voxware is the name of company, it has produced several audio codecs e.g. MetaVoice family and MetaSound.
* | Merge commit '62572435d4106098c090fb8f129a9090e41ff1eb'Michael Niedermayer2013-08-07
|\| | | | | | | | | | | | | * commit '62572435d4106098c090fb8f129a9090e41ff1eb': rtpenc_chain: Check for errors from ffio_fdopen and ffio_open_dyn_packet_buf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_chain: Check for errors from ffio_fdopen and ffio_open_dyn_packet_bufMartin Storsjö2013-08-07
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f542dedf72091af8e6f32a12bd64289c58857c21'Michael Niedermayer2013-08-07
|\| | | | | | | | | | | | | * commit 'f542dedf72091af8e6f32a12bd64289c58857c21': rtspenc: Check the return value from ffio_open_dyn_packet_buf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtspenc: Check the return value from ffio_open_dyn_packet_bufMartin Storsjö2013-08-07
| | | | | | | | | | | | | | Also clear the AVIOContext handle after freeing, to avoid possible dangling pointers if the later call fails. Signed-off-by: Martin Storsjö <martin@martin.st>
* | configure: Add -lstdc++ to the requirements for linking with libgme.Stephen Hutchinson2013-08-07
| | | | | | | | | | | | Needed for cross-compiling with MinGW-w64 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Exit gracefully when trying to serve video from v2.5.8.Stephen Hutchinson2013-08-07
| | | | | | | | | | | | | | | | | | 'Fixes' ticket #2526 insofar as it stops 2.5.8 from crashing and tells the user to upgrade to 2.6 if they want to make video input work. A real solution to #2526 would be to get video input from 2.5.8 to work right. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: CosmeticsStephen Hutchinson2013-08-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | MAINTAINERS: alphabetical sortMichael Niedermayer2013-08-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | MAINTAINERS: Add some maintainers for parts of libavutilMichael Niedermayer2013-08-07
| | | | | | | | | | | | | | | | | | Developers added are active and in the copyright of the specified files, If anyone wants to maintain anything else, send a patch that adds you to MAINTAINERS. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: fix memleak with nobufferMichael Niedermayer2013-08-07
| | | | | | | | | | | | Fixes Ticket2802 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/hmac: make const tables static constMichael Niedermayer2013-08-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/spdifenc make const tables static constMichael Niedermayer2013-08-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/smoothstreamingenc: Make const tables static constMichael Niedermayer2013-08-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: remove usage of MOD_UNLIKELY()Michael Niedermayer2013-08-06
| | | | | | | | | | | | Its not needed and doing nothing is faster than doing a optimized MOD Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | * qatar/master: pcm_bluray: Return AVERROR_INVALIDDATA instead of -1 on header errors Conflicts: libavcodec/pcm-mpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pcm_bluray: Return AVERROR_INVALIDDATA instead of -1 on header errorsChristian Schmidt2013-08-06
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '6fb65973c9501d3fe94a5a9195c01cd20083066e'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | * commit '6fb65973c9501d3fe94a5a9195c01cd20083066e': configure: Properly split dv1394 indev dependencies Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Properly split dv1394 indev dependenciesDiego Biurrun2013-08-06
| |
* | Merge commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | * commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7': configure: Properly set zlib dependencies for all components Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Properly set zlib dependencies for all componentsDiego Biurrun2013-08-06
| |
* | Merge commit 'a7d45e06e9757f49ea4e105cbefc3462a7324e9a'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | * commit 'a7d45e06e9757f49ea4e105cbefc3462a7324e9a': configure: The W64 demuxer should select the WAV demuxer, not depend on it Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: The W64 demuxer should select the WAV demuxer, not depend on itDiego Biurrun2013-08-06
| |
* | Merge commit '406e6c0ba5393fa302080202fe77bd09187889a1'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | * commit '406e6c0ba5393fa302080202fe77bd09187889a1': configure: Properly split avserver component and system dependencies Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Properly split avserver component and system dependenciesDiego Biurrun2013-08-06
| |
* | Merge commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | | | * commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b': riff: Move demuxing code to a separate file. Conflicts: configure libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Move demuxing code to a separate file.Diego Biurrun2013-08-06
| |
* | Merge commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | | | * commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472': riff: Move muxing code to a separate file Conflicts: configure libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-30 00:08:38 +0000