summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* mp3demux: Rewrite xing TOC based seekingMichael Niedermayer2012-10-21
| | | | | | | | | | The libav code depends on mp3 startcodes only occuring at the start of frames. But there is nothing in mp3 that prevents them occuring elsewhere by chance. Thus the code would fail randomly, the new code searches for 3 consecutive valid frames. If this turns out to be still insufficient the number can be raised further, or additional checks added. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/webvttdec: fix potential timing overflows.Clément Bœsch2012-10-21
| | | | Should fix CID733781 and CID733782.
* lavf/subviewerdec: fix potential timing overflows.Clément Bœsch2012-10-21
| | | | Should fix CID733779 and CID733780.
* udp: add missing mutex unlockMichael Niedermayer2012-10-20
| | | | | Fixes CID703688 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* rtpdec: check av_new_packet() return valueMichael Niedermayer2012-10-20
| | | | | Fixes CID733715 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* rtmp_write_amf_data: remove dead codeMichael Niedermayer2012-10-20
| | | | | Fixes CID732199 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* riff_has_valid_tags: remove unused variableMichael Niedermayer2012-10-20
| | | | | Fixes CID739471 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* nutdec: fix integer overflowMichael Niedermayer2012-10-20
| | | | | Fixes CID700575 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* nsvdec: fix division by 0Michael Niedermayer2012-10-20
| | | | | Fixes CID717749 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat_free_context: allow NULL as argumentMichael Niedermayer2012-10-20
| | | | | Fixes CID703682 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mmsh: fix integer overflow in mmsh_seek()Michael Niedermayer2012-10-20
| | | | | Fixes CID703745 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* matroskaenc: Fix hypothetical integer overflowsMichael Niedermayer2012-10-20
| | | | | Fixes CID700562-7 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* matroskaenc: check avio_open_dyn_buf() retuen codeMichael Niedermayer2012-10-20
| | | | | Fixes CID703629 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* matroskadec: fix double negation typoMichael Niedermayer2012-10-20
| | | | | Fixes CID602563 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* matroska_parse_rm_audio: check for malloc failureMichael Niedermayer2012-10-20
| | | | | Fixes CID733712 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed'Michael Niedermayer2012-10-20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed': fate-vc1: add dependencies ARM: fix overreads in neon h264 chroma mc rtsp: Make sure the ret variable is initialized in ff_rtsp_fetch_packet gitignore: ignore files created by msvc fate: Add proper dependencies for the tests in video.mak configure: Disable Snow decoder and encoder by default lzo: Drop obsolete fast_memcpy reference build: Drop OBJS declaration for non-existing PCM_DVD encoder mpeg4videodec: Disable frame multithreading for GMC, its not implemented at all Conflicts: libavcodec/mpegvideo.c libavformat/rtsp.c tests/fate/microsoft.mak tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: Make sure the ret variable is initialized in ff_rtsp_fetch_packetMartin Storsjö2012-10-20
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | hlsproto: fix integer overflowMichael Niedermayer2012-10-19
| | | | | | | | | | Fixes CID703743 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | gxfenc: fix null ptr dereferenceMichael Niedermayer2012-10-19
| | | | | | | | | | Fixes CID703677 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hls: fix integer overflowMichael Niedermayer2012-10-19
| | | | | | | | | | Fixes CID717892 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avio: fix sizeof argumentMichael Niedermayer2012-10-19
| | | | | | | | | | Fixes CID732284 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | url_alloc_for_protocol: fix use of uninitialized variableMichael Niedermayer2012-10-19
| | | | | | | | | | Fixes CID703830 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: remove unneeded null checkMichael Niedermayer2012-10-19
| | | | | | | | | | Fixes CID29555 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov.c: Check for stsd + m1s tag indicating MOV-wrapped MPEG-PS, and force ↵Petter Ericson2012-10-19
| | | | | | | | | | | | | | continued probing if found. Fixes Ticket241 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2'Michael Niedermayer2012-10-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1cd432e167b1a80853760c89a33606e2b5f229c2': configure: fix libcdio check rtsp: Allow setting the reordering buffer size via an AVOption rtsp: Vertically align a constant definition rtp: Update the check for distinguishing between RTP and RTCP aac: fix build with hardcoded tables fate: dependencies for screen codec tests riff: Move functions around to be covered by appropriate #ifdefs Conflicts: configure tests/fate/screen.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: Allow setting the reordering buffer size via an AVOptionMartin Storsjö2012-10-18
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtsp: Vertically align a constant definitionMartin Storsjö2012-10-18
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtp: Update the check for distinguishing between RTP and RTCPMartin Storsjö2012-10-18
| | | | | | | | | | | | | | Also add enums for more RTCP packet types, according to the IANA list of registered types. Signed-off-by: Martin Storsjö <martin@martin.st>
| * riff: Move functions around to be covered by appropriate #ifdefsDiego Biurrun2012-10-18
| | | | | | | | This fixes compilation with --disable-muxers.
* | Merge commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95'Michael Niedermayer2012-10-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95': avformat: Fix references to the removed function av_write_header in comments changelog: Mention the MSVC DLL support fate: add dependencies for misc microsoft codecs fate-twinvq: add dependencies fate-mpc: add dependencies fate-indeo: add dependencies fate-als: add dependencies fate: dependencies for demux tests Conflicts: Changelog tests/Makefile tests/fate/demux.mak tests/fate/microsoft.mak tests/fate/mpc.mak tests/fate/vqf.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Fix references to the removed function av_write_header in commentsMartin Storsjö2012-10-18
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72'Michael Niedermayer2012-10-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72': fate: add a dependency helper macro Add support for building shared libraries with MSVC avcodec: Rename avpriv_frame_rate_tab to ff_mpeg12_frame_rate_tab gxf: Add a local copy of the relevant parts of the frame rate table configure: Split out msvc as a separate target OS aviobuf: Remove a senseless ifdef in avio_seek Conflicts: configure libavcodec/dirac.c libavcodec/mpeg12data.h libavcodec/mpeg12enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * gxf: Add a local copy of the relevant parts of the frame rate tableMartin Storsjö2012-10-18
| | | | | | | | | | | | | | | | | | | | | | | | | | This avoids having to share this table across the library boundaries. This shared table used to be problematic, if always declaring all exported data symbols with the dllimport attribute (even while building that same library), since it needs to be a link-time constant when it is used in AVCodec declarations (in mpeg12enc.c). Signed-off-by: Martin Storsjö <martin@martin.st>
| * aviobuf: Remove a senseless ifdef in avio_seekMartin Storsjö2012-10-18
| | | | | | | | | | | | | | | | | | This seemed to assume that one never used writing avio unless muxers or networking was enabled. This ifdef is a remnant since 8fa641f8. Signed-off-by: Martin Storsjö <martin@martin.st>
* | riff: retry reading metadata without padding if it fails withMichael Niedermayer2012-10-18
| | | | | | | | | | | | | | Fixes Ticket1821 Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | riff: dont discard truncated metadataMichael Niedermayer2012-10-18
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cache: check lseek() returnMichael Niedermayer2012-10-18
| | | | | | | | | | Fixes CID717496 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmdec: check av_new_packet() return valueMichael Niedermayer2012-10-17
| | | | | | | | | | Fixes CID733711 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmdec: fix hypothetical overflowsMichael Niedermayer2012-10-17
| | | | | | | | | | Fixes CID703739 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffm_seek: fix division by zeroMichael Niedermayer2012-10-17
| | | | | | | | | | Fixes CID732202 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov_probe: fix integer overflowsMichael Niedermayer2012-10-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-17
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: configure: Add support for Tilera processors wavdec: check size before reading the data, not after. Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wavdec: check size before reading the data, not after.Anton Khirnov2012-10-16
| |
| * wav: do not fail on empty INFO tagsAnton Khirnov2012-10-16
| | | | | | | | | | | | Fixes Bug 379 CC: libav-stable@libav.org
* | Merge commit '31c54711cc3f1484af101d629bbb805820d37ad1'Michael Niedermayer2012-10-17
|\| | | | | | | | | | | | | | | | | | | * commit '31c54711cc3f1484af101d629bbb805820d37ad1': lavf: split wav muxer and demuxer into separate files. Conflicts: libavformat/wavdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: split wav muxer and demuxer into separate files.Anton Khirnov2012-10-16
| |
* | Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56'Michael Niedermayer2012-10-17
|\| | | | | | | | | | | | | | | | | | | | | * commit '58b619c8a226cc4564ad5af291bc99a04f89ee56': wav muxer: write metadata Conflicts: Changelog libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wav muxer: write metadataVictor Vasiliev2012-10-16
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '0bca0283ccded5e32da143a462168ad1988a58fd'Michael Niedermayer2012-10-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0bca0283ccded5e32da143a462168ad1988a58fd': riff: do not write empty INFO tags Conflicts: tests/ref/fate/vsynth1-cljr tests/ref/fate/vsynth1-ffvhuff tests/ref/fate/vsynth1-h261 tests/ref/fate/vsynth1-h263 tests/ref/fate/vsynth1-h263-obmc tests/ref/fate/vsynth1-h263p tests/ref/fate/vsynth1-huffyuv tests/ref/fate/vsynth1-jpegls tests/ref/fate/vsynth1-mjpeg tests/ref/fate/vsynth1-mpeg4-adap tests/ref/fate/vsynth1-mpeg4-adv tests/ref/fate/vsynth1-mpeg4-error tests/ref/fate/vsynth1-mpeg4-nr tests/ref/fate/vsynth1-mpeg4-qpel tests/ref/fate/vsynth1-mpeg4-qprd tests/ref/fate/vsynth1-mpeg4-rc tests/ref/fate/vsynth1-mpeg4-thread tests/ref/fate/vsynth1-msmpeg4 tests/ref/fate/vsynth1-msmpeg4v2 tests/ref/fate/vsynth1-rgb tests/ref/fate/vsynth1-wmv1 tests/ref/fate/vsynth1-wmv2 tests/ref/fate/vsynth1-yuv tests/ref/fate/vsynth2-cljr tests/ref/fate/vsynth2-ffvhuff tests/ref/fate/vsynth2-h261 tests/ref/fate/vsynth2-h263 tests/ref/fate/vsynth2-h263-obmc tests/ref/fate/vsynth2-h263p tests/ref/fate/vsynth2-huffyuv tests/ref/fate/vsynth2-jpegls tests/ref/fate/vsynth2-mjpeg tests/ref/fate/vsynth2-mpeg4-adap tests/ref/fate/vsynth2-mpeg4-error tests/ref/fate/vsynth2-mpeg4-nr tests/ref/fate/vsynth2-mpeg4-qpel tests/ref/fate/vsynth2-mpeg4-qprd tests/ref/fate/vsynth2-mpeg4-rc tests/ref/fate/vsynth2-mpeg4-thread tests/ref/fate/vsynth2-msmpeg4 tests/ref/fate/vsynth2-msmpeg4v2 tests/ref/fate/vsynth2-rgb tests/ref/fate/vsynth2-wmv1 tests/ref/fate/vsynth2-wmv2 tests/ref/fate/vsynth2-yuv tests/ref/lavf/avi tests/ref/seek/h261_avi tests/ref/seek/h263_avi tests/ref/seek/h263p_avi tests/ref/seek/lavf_avi tests/ref/seek/mjpeg_avi tests/ref/seek/mpeg4_adap_avi tests/ref/seek/mpeg4_error_avi tests/ref/seek/mpeg4_nr_avi tests/ref/seek/mpeg4_qpel_avi tests/ref/seek/mpeg4_qprd_avi tests/ref/seek/mpeg4_rc_avi tests/ref/seek/mpeg4_thread_avi tests/ref/seek/msmpeg4_avi tests/ref/seek/msmpeg4v2_avi tests/ref/seek/wmv1_avi tests/ref/seek/wmv2_avi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: do not write empty INFO tagsVictor Vasiliev2012-10-16
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>