summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* avformat/rtpenc: check av_packet_get_side_data() return, fix null ptr ↵Michael Niedermayer2013-12-13
| | | | | | | | dereference Fixes CID1035715 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/rtpdec_h264: fix null pointer dereferencesMichael Niedermayer2013-12-13
| | | | | | Fixes CID733716 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/sdp: fix memleak on errorMichael Niedermayer2013-12-13
| | | | | Fixes CID700640 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libavformat/hdsenc: check init_file() return codeMichael Niedermayer2013-12-12
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a'Michael Niedermayer2013-12-12
|\ | | | | | | | | | | | | | | | | | | | | * commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a': img2: add stereo 3d still picture file extensions Conflicts: libavformat/img2.c See: 6fe12c7ff2094c68a8b6e9aeea7744ca15594091 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * img2: add stereo 3d still picture file extensionsMartin Lambers2013-12-12
| |
* | Merge commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39'Michael Niedermayer2013-12-12
|\| | | | | | | | | | | | | | | | | | | | | * commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39': rtsp: suppress a incompatible pointer types warning Conflicts: libavformat/rtsp.c See: 00792322990188b1130ef2befd68ec1d51ab7365 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: suppress a incompatible pointer types warningVittorio Giovara2013-12-12
| |
* | avformat/hlsenc: copy metadataMichael Niedermayer2013-12-12
| | | | | | | | | | | | Fixes Ticket2296 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/oggparseopus: Check opus_duration() return valueJames Almer2013-12-12
| | | | | | | | | | | | | | | | | | | | Regression since 39d11d599cd292485fe991cd22e10d7a1738b3bc os->pduration would be wrongly assigned a negative value on invalid packets instead of aborting. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/oggdec: reset end_trimming when it has been used, so it cannot be ↵Michael Niedermayer2013-12-12
| | | | | | | | | | | | used twice by mistake Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/oggdec: reset end_trimming in ogg_reset()Dale Curtis2013-12-12
| | | | | | | | | | | | Fixes the output when seeking back to the start Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-12-12
|\| | | | | | | | | | | | | * qatar/master: rtspdec: Fix keep-alive request for ACTi cameras Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtspdec: Fix keep-alive request for ACTi camerasRumin Sam2013-12-11
| | | | | | | | | | | | | | Some ACTi cameras fail if "*" is passed as the URI. Signed-off-by: Ismael Luceno <ismael.luceno@corp.bluecherry.net> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '281a40e18f923510f2067d05c5b0cf08cc49dfee'Michael Niedermayer2013-12-12
|\| | | | | | | | | | | | | * commit '281a40e18f923510f2067d05c5b0cf08cc49dfee': lavf: remove an unneeded call to avcodec_get_frame_defaults(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove an unneeded call to avcodec_get_frame_defaults().Anton Khirnov2013-12-11
| | | | | | | | avcodec_decode_*() resets the frame itself.
* | Merge commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9'Michael Niedermayer2013-12-11
|\| | | | | | | | | | | | | | | | | | | * commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9': Replace all uses of avcodec_free_frame with av_frame_free(). Conflicts: doc/examples/decoding_encoding.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace all uses of avcodec_free_frame with av_frame_free().Anton Khirnov2013-12-11
| |
* | avformat/utils: Check avcodec_open2() return code in av_find_stream_info()Michael Niedermayer2013-12-11
| | | | | | | | | | | | Fixes CID1135750 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hdsenc: fix off by 1 error in array size checkMichael Niedermayer2013-12-11
| | | | | | | | | | | | Fixes CID1135763, CID1135764 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hdsenc: fix unintentional integer overflow in hds_write_packet()Michael Niedermayer2013-12-11
| | | | | | | | | | | | Fixes CID1135762 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hdsenc: Check rename() return valueMichael Niedermayer2013-12-11
| | | | | | | | | | Fixes CID1135748 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/aviobuf: fix null dereference in avio_close_dyn_buf()Michael Niedermayer2013-12-11
| | | | | | | | | | | | Fixes CID1135769 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Force one stream for raw muxers.Carl Eugen Hoyos2013-12-11
| | | | | | | | | | | | | | Based on eeb975f5 Fixes ticket #3217. Reviewed-by: Nicolas George
* | avformat/oggparseopus: calculate pts/dts for initial packets after seekingMichael Niedermayer2013-12-11
| | | | | | | | | | | | based on code from oggparsevorbis Fixes Ticket3124 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/oggparseopus: factor opus_duration() outMichael Niedermayer2013-12-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654'Michael Niedermayer2013-12-09
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd64341e498fa46c6cf4c23d408177d7489559654': configure: Prefix libc-related variables with "libc_" Conflicts: libavdevice/Makefile libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Prefix libc-related variables with "libc_"Diego Biurrun2013-12-09
| | | | | | | | Simplifies host/target libc detection splitting.
* | Fix remuxing of IMA_QT in mov.Carl Eugen Hoyos2013-12-09
| | | | | | | | Fixes ticket #1603.
* | Do not detect "00000000..." (and other non-changing values) as adp.Carl Eugen Hoyos2013-12-09
| |
* | Revert: flvenc: Don't pretend to support muxing "plain" VP6Carl Eugen Hoyos2013-12-09
| | | | | | | | | | | | Muxing VP6 is used by applications and works with Flashplayer. Reported-by: David Bertrand
* | Merge commit 'f0b234ab9e406efee85c17eb435db646092a943b'Michael Niedermayer2013-12-09
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'f0b234ab9e406efee85c17eb435db646092a943b': avformat: AviSynth demuxer rewrite Conflicts: configure libavformat/avisynth.c See: b9ad009475f3afb76bd2fbd92936dc4d4cd441ec (as well as later commits) Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: AviSynth demuxer rewrited s2013-12-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Directly loads AviSynth through LoadLibrary instead of relying on Video for Windows, and supports using AvxSynth (via dlopen) to open scripts on Linux and OS X. Error messages from AviSynth/AvxSynth are now reported through av_log and exit, rather than the traditional behavior of generating an error video that the user would need to watch to diagnose. The main rewrite was authored by d s <avxsynth.testing@gmail.com> from the AvxSynth team, with additional contributions by Oka Motofumi <chikuzen.mo@gmail.com> Stephen Hutchinson <qyot27@gmail.com> Diego Biurrun <diego@biurrun.de> Anton Khirnov <anton@khirnov.net> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * mxfdec: set extradata sizeAnton Khirnov2013-11-29
| | | | | | | | | | The line setting it was mistakenly removed in ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878
| * MSN Audio supportKostya Shishkov2013-11-26
| | | | | | | | | | | | | | This is essentially a MS GSM decoder extension that supports more sampling rates and lower bitrates. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * build: Integrate multilibrary examples into the build systemDiego Biurrun2013-11-25
| | | | | | | | This includes moving libavformat/output-example to doc/examples/output.
* | avformat/rtpdec: Enable GSM RTP depacketizationAndrey Utkin2013-12-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: remove unused variableMichael Niedermayer2013-12-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: reject poorly fitting rfps values earlierMichael Niedermayer2013-12-07
| | | | | | | | | | | | | | This avoids collecting statistics for rfps values that very likely will get rejected later. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: use rfps_add_frame() only for videoMichael Niedermayer2013-12-07
| | | | | | | | | | | | it makes no sense for other streams Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mux: Don't write "encoder" metadata tag when bitexact is requestedJames Almer2013-12-06
| | | | | | | | | | | | | | | | Since we don't write lavf's string when bitexact is requested, this will prevent the tag from being copied from the source stream. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | do O(1) instead of O(n) atomic operations in register functionsMichael Niedermayer2013-12-06
| | | | | | | | | | | | about 1ms faster startup time Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add Windows resource file support for shared librariesJames Almer2013-12-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally written by James Almer <jamrial@gmail.com> With the following contributions by Timothy Gu <timothygu99@gmail.com> * Use descriptions of libraries from the pkg-config file generation function * Use "FFmpeg Project" as CompanyName (suggested by Alexander Strasser) * Use "FFmpeg" for ProductName as MSDN says "name of the product with which the file is distributed" [1]. * Use FFmpeg's version (N-xxxxx-gxxxxxxx) for ProductVersion per MSDN [1]. * Only build the .rc files when --enable-small is not enabled. [1] http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058.aspx Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Ignore es_map_length when parsing mpeg program stream map.Carl Eugen Hoyos2013-12-05
| | | | | | | | Fixes ticket #3195.
* | avformat/mov: calculate rfps from the first 100 frames of the indexMichael Niedermayer2013-12-05
| | | | | | | | | | | | This reduces the amount of frames that need to be demuxed in av_find_stream_info() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: factor rfps calculation outMichael Niedermayer2013-12-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: provide more IO statistics in debug output at start and end ↵Michael Niedermayer2013-12-05
| | | | | | | | | | | | of av_find_streaminfo() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: move update_wrap_reference() upMichael Niedermayer2013-12-04
| | | | | | | | | | | | | | simplifies code also remove extra {} Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: reorder operations in update_wrap_reference()Michael Niedermayer2013-12-04
| | | | | | | | | | | | prevents a integer overflow Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: do not set pts for missing dts in video streamsRainer Hochecker2013-12-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>