summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* estimate_timings_from_bit_rate: Check timebase and bitrateMichael Niedermayer2013-03-28
| | | | | | | Fixes integer overflow and assertion failure Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* electronicarts: check timebase, fix assertion failureMichael Niedermayer2013-03-28
| | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Fix heap-buffer-overflow in matroska_parse_blockDale Curtis2013-03-27
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat: change some seeking related assert to av_assertsMichael Niedermayer2013-03-27
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Fix avisynth_context_create constructor error handling.d s2013-03-27
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Support pcm_mulaw in Hikvision CCTV mpeg program streams.Carl Eugen Hoyos2013-03-27
| | | | Fixes decoding the sample from videolan trac ticket #8344.
* Fix a typo in the Monkey's Audio demuxer.Carl Eugen Hoyos2013-03-27
|
* Only test the first frame for missing aac_adtstoasc bistream filter.Carl Eugen Hoyos2013-03-26
| | | | | | | Many players ignore broken aac frames, so don't abort mov or flv muxing when encountering one, just print a warning instead. Fixes ticket #2380.
* mpegtsenc: Only test the first frame for missing h264_mp4toannexb filter.Carl Eugen Hoyos2013-03-26
| | | | | | | | Many video players accept broken frames in a transport stream, so there is no reason to abort remuxing when encountering one, just print a warning instead. Fixes ticket #1758.
* Merge commit 'f1e9398621af0bc9d166014e4ce6996bb4f141d0'Michael Niedermayer2013-03-26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f1e9398621af0bc9d166014e4ce6996bb4f141d0': lavc: Rename avpriv_mpv_find_start_code after moving out from mpegvideo Conflicts: libavcodec/h264_parser.c libavcodec/internal.h libavcodec/mpeg12.c libavcodec/utils.c libavformat/mpegtsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Rename avpriv_mpv_find_start_code after moving out from mpegvideoMartin Storsjö2013-03-26
| | | | | | | | | | | | | | Also move the declaration to internal.h, and add restrict qualifiers to the declaration (as in the implementation). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f'Michael Niedermayer2013-03-26
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f': ape: 3.80-3.92 decoding support h264: Remove an unused variable Conflicts: libavcodec/apedec.c libavformat/ape.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ape: 3.80-3.92 decoding supportKostya Shishkov2013-03-25
| |
* | lavf/mux: add the flush_packets option.Nicolas George2013-03-24
| | | | | | | | Note: a lot of muxers already do the flushing explicitly.
* | libspeex: support ZygoAudio (quality 10 mode)Piotr Bandurski2013-03-23
| | | | | | | | | | | | Fixes "quality 10" mode from Ticket1873 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskadec: switch to av_assertMichael Niedermayer2013-03-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | img2: WebP supportMichael Niedermayer2013-03-22
| | | | | | | | | | Reviewed-by: Pascal Massimino <pascal.massimino@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | AviSynth demuxer rewrite.d s2013-03-21
| | | | | | | | | | | | | | | | Dynamically loads the library itself, rather than through VfW. Supports AvxSynth on Linux and OS X. Supports the new colorspaces added in AviSynth 2.6 when used with AviSynth 2.6.
* | avformat/avs: increase probe score to preempt conflict with avxsynthMichael Niedermayer2013-03-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2013-03-20
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cigaes/master: lavfi/vf_yadif: use standard options parsing. lavfi/vf_unsharp: use standard options parsing. lavfi/vf_transpose: use standard options parsing. lavfi/vf_pad: use standard options parsing. lavfi/vf_fps: use standard options parsing. lavfi/vf_fade: use standard options parsing. lavi/vf_drawbox: use standard options parsing. lavfi/vf_delogo: use standard options parsing. lavfi/vf_decimate: use standard options parsing. lavfi/vf_crop: use standard options parsing. lavfi/af_volume: use standard options parsing. lavfi/vf_tile: use standard options parsing. lavfi/avf_concat: use standard options parsing. lavfi: add common code to handle options parsing. lavf/vobsub: free index pseudo-packet. ffmpeg: fix freeing of sub2video frame. lavfi: add sine audio source. lavu/opt: add AV_OPT_TYPE_DURATION. lavfi/concat: fix silence duration computation. lavf/concatdec: support seeking. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavf/vobsub: free index pseudo-packet.Nicolas George2013-03-20
| | |
| * | lavf/concatdec: support seeking.Nicolas George2013-03-20
| | |
* | | matroskadec: Add support for parsing Matroska ContentEncKeyIDFrank Galligan2013-03-20
|/ / | | | | | | | | | | | | | | | | This patch adds the enums for the ContentEncryption elements. This patch also adds support for parsing the ContentEncKeyID. The ContentEncKeyID is then base64 encoded and stored in the stream's metadata. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: Fix infinite probing that reads the whole fileMichael Niedermayer2013-03-20
| | | | | | | | | | | | | | Fixes: otonajoshi_avformat_tries_to_load_whole.ts Reported-by: JEEB (on IRC) Thanks-to: nevcairiel Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | av_find_stream_info: change read_size to 64bitMichael Niedermayer2013-03-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: avformat_seek_file(): validate stream_index.Nicolas George2013-03-20
| |
* | lavf/concatdec: fix possible leak in case of malloc failure.Nicolas George2013-03-20
| | | | | | | | Fix CID 747737.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-03-20
|\| | | | | | | | | | | | | * qatar/master: rtmp: Pass the parameters to do_adobe_auth in the right order Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Pass the parameters to do_adobe_auth in the right orderMartin Storsjö2013-03-20
| | | | | | | | | | | | | | | | | | | | | | do_adobe_auth takes the parameters in the order "opaque, challenge". Due to the way they are treated, this didn't matter in the tested setups though - if both are set, we only use one. In the tested setups (Wowza and Akamai) either one of them were null or they were both set to the same value, which is why this worked before. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2c328a907978b61949fd20f7c991803174337855'Michael Niedermayer2013-03-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2c328a907978b61949fd20f7c991803174337855': pixdesc: add a function for counting planes in a pixel format. avplay: remove the -debug option. Revert "asfenc: return error on negative timestamp" Conflicts: doc/APIchanges doc/ffplay.texi ffplay.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Revert "asfenc: return error on negative timestamp"Anton Khirnov2013-03-19
| | | | | | | | | | This reverts commit d1bec33b46091546c5b2e6815210e73f87abf413, it breaks FATE.
* | lavf/avformat.h: fix a few typos in AVFormatContext:avoid_negative_ts doxyStefano Sabatini2013-03-19
| |
* | lmlm4: check packet_size against lower limit tooMichael Niedermayer2013-03-19
| | | | | | | | | | | | Fixes CID732224 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/tee: add forgotten ret assignmentMichael Niedermayer2013-03-19
| | | | | | | | | | Fixes CID991840 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroska_parse_frame: fix memleakMichael Niedermayer2013-03-19
| | | | | | | | | | Fixes CID991856 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: do not make a hard dep on internal subtitles helpers.Clément Bœsch2013-03-19
| |
* | avidec: fix duration and bitrate of truncated filesMichael Niedermayer2013-03-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mxfdec: read field dominance flagMatthieu Bouron2013-03-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | segment: copy metadataMichael Niedermayer2013-03-18
| | | | | | | | | | | | Fixes Ticket2230 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix termination of mov_ch_layouts_wav array lookupThierry Foucu2013-03-18
| | | | | | | | | | | | | | | | Problem found using ASAN. In some case, the ff_mov_get_channel_layout_tag function will not find 0 as termination for lookup in the array mov_ch_layouts_wav. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | append_packet_chunked: remove outcommented codeMichael Niedermayer2013-03-18
| | | | | | | | | | | | | | our variant works fine and should be better also remove related unused variable Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '50c449ac24fbb4c03c15d2e2026cef2204b80385'Michael Niedermayer2013-03-18
|\| | | | | | | | | | | | | | | | | | | | | * commit '50c449ac24fbb4c03c15d2e2026cef2204b80385': iff: validate CMAP palette size asfenc: return error on negative timestamp Conflicts: libavformat/iff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * iff: validate CMAP palette sizeKostya Shishkov2013-03-18
| | | | | | | | | | | | | | | | | | Fixes CVE-2013-2495 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Luca Barbato <lu_zero@gentoo.org> CC: libav-stable@libav.org
| * asfenc: return error on negative timestampLuca Barbato2013-03-18
| | | | | | | | | | | | | | According to the specification the timestamp is represented by a 32bit unsigned. CC: libav-stable@libav.org
* | rmdec: flush audio packet on seekingMichael Niedermayer2013-03-18
| | | | | | | | | | | | Fixes Ticket1605 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpeg: Add passing DVD navigation packets (startcode 0x1bf) to caller to ↵Richard2013-03-17
| | | | | | | | | | | | | | | | | | allow better playback handling of DVDs. The two types of packets (PCI and DSI) are passed untouched but combined by the new codec ID AV_CODEC_ID_DVD_NAV. The first 980 bytes in the packet contain the PCI data. The next 1018 are the DSI data. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: remove unecessary a64enc include.Clément Bœsch2013-03-17
| |
* | append_packet_chunked: Remove unused initialization.Michael Niedermayer2013-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'aa3c77998404cc32233cb76e961ca27db8565459'Michael Niedermayer2013-03-16
|\| | | | | | | | | | | | | | | | | | | * commit 'aa3c77998404cc32233cb76e961ca27db8565459': lavf: sanity check size in av_get/append_packet(). Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: sanity check size in av_get/append_packet().Anton Khirnov2013-03-15
| | | | | | | | | | | | To avoid allocating ridiculous amounts of memory for corrupted files, read the input in chunks limited to filesize or an arbitrary large amount when that is not known (chosen to be 50M).