summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Allow decoding of slightly broken Nikon avi files.Carl Eugen Hoyos2014-01-20
| | | | Fixes ticket #3330.
* lavf: add avformat_get_mov_video_tags() and avformat_get_mov_audio_tags()wm42014-01-19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/matroskadec: identify SMI as SVQ3Michael Niedermayer2014-01-19
| | | | | | Fixes part of Ticket3256 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/matroskadec: support QDM2 as generated by mkvtoolnix-6.7.0Michael Niedermayer2014-01-19
| | | | | | Fixes part of Ticket3256 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/matroskadec: support SVQ3 as generated by mkvtoolnix-6.6.0Michael Niedermayer2014-01-19
| | | | | | Fixes part of Ticket3256 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/metadata: allow ff_metadata_conv() to be called with NULL saftelyMichael Niedermayer2014-01-17
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/riff: fix demuxing of h264 INMCMichael Niedermayer2014-01-17
| | | | | | | Its said that there was a mpeg4 sample with the same fourcc, but noone has it if someone finds it please tell me so i can fix detection of both. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '5ef11b8dcc054b230deb9b20493255c14a80597d'Michael Niedermayer2014-01-17
|\ | | | | | | | | | | | | * commit '5ef11b8dcc054b230deb9b20493255c14a80597d': yuv4mpeg: set average frame rate Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * yuv4mpeg: set average frame rateAnton Khirnov2014-01-17
| |
* | Merge commit '33018907bd07b34e0e70d5ae12097265eb3734d7'Michael Niedermayer2014-01-17
|\| | | | | | | | | | | | | | | | | | | | | * commit '33018907bd07b34e0e70d5ae12097265eb3734d7': mp3enc: allow omitting the id3v2 header with -id3v2_version 0 Conflicts: doc/muxers.texi libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mp3enc: allow omitting the id3v2 header with -id3v2_version 0Anton Khirnov2014-01-17
| |
* | Merge commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd'Michael Niedermayer2014-01-17
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd': mp3enc: add an option for disabling the Xing frame. Conflicts: doc/muxers.texi libavformat/mp3enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mp3enc: add an option for disabling the Xing frame.Anton Khirnov2014-01-17
| |
* | Warn if s16be is muxed into flv.Carl Eugen Hoyos2014-01-16
| | | | | | | | | | Players that conform to the specification can only playback such files correctly on big-endian hardware.
* | Never favour an audio stream with 0 channels in av_find_best_stream().Carl Eugen Hoyos2014-01-16
| | | | | | | | Fixes ticket #3311.
* | Do not read mkv audio bit_depth if bits_per_coded_sample is already set.Carl Eugen Hoyos2014-01-15
| | | | | | | | This allows decoding broken mkv files containing G.726 audio.
* | Do not set mkv bit_depth to av_get_bytes_per_sample() for G.726.Carl Eugen Hoyos2014-01-15
| | | | | | | | The value is wrong and leads to broken files.
* | avformat/jvdec: clear packet padding after downsizeMichael Niedermayer2014-01-15
| | | | | | | | | | | | | | Fixes: use of uninitialized memeory Fixes: msan_uninit-mem_7fbf26b5fefe_5981_intro.jv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: fix typo in error check of mxf_edit_unit_absolute_offset()Michael Niedermayer2014-01-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2620df13104ddaa136158eb6bb1195adbf9d7692'Michael Niedermayer2014-01-15
|\| | | | | | | | | | | | | * commit '2620df13104ddaa136158eb6bb1195adbf9d7692': mov: Free an earlier allocated array if allocating a new one Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Free an earlier allocated array if allocating a new oneMartin Storsjö2014-01-15
| | | | | | | | | | | | | | | | | | | | | | It could probably also be considered an error if the pointer isn't null at this point, but then we might risk rejecting some slightly broken files that we might have handled so far. Sample-Id: 00000496-google Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'd51f09962d5b4bc999fb70c040f330dd1873212e'Michael Niedermayer2014-01-15
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd51f09962d5b4bc999fb70c040f330dd1873212e': mov: Free intermediate arrays in the normal cleanup function Conflicts: libavformat/mov.c See: a6b3e6d0b49b47c9b874e59b88a8051af338f520 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Free intermediate arrays in the normal cleanup functionMartin Storsjö2014-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | These arrays are normally freed at the end of mov_read_trak, but make sure they're freed in case mov_read_trak returned early (due to errors) or in case the atoms that allocate arrays are encountered at some other point than within a trak (which we don't have checks against). Sample-Id: 00000496-google Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
| * mxf: Fix potential leak in mxf_read_local_tags()Tomas Härdin2014-01-14
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * mxf: Correctly support files from Pinnacle ThunderTomas Härdin2014-01-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Such files have IndexTableSegments which when parsed cover EditUnit ranges like this: [0,1) [249,250) [249,377) [0,249) where each interval is [IndexStartPosition, IndexStartPosition + IndexDuration) This would be reduced to a sparse index like: [0,1), [249,250) instead of the full range: [0,249), [249,377) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * mxf: Fix a possible leak of extradataMichael Niedermayer2014-01-14
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '1a4e4ad0e0c5486dcab05e54b587672a498dd7cf'Michael Niedermayer2014-01-14
|\| | | | | | | | | | | | | | | | | | | | | * commit '1a4e4ad0e0c5486dcab05e54b587672a498dd7cf': mxf: Use av_malloc_array Conflicts: libavformat/mxfdec.c See: 8ce41721a4a29711211f8dad0c86502caf86f4d3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Use av_malloc_arrayLuca Barbato2014-01-14
| |
| * mxf: Drop unnecessary checksLuca Barbato2014-01-14
| | | | | | | | av_reallocp_array does the check already.
* | Merge commit 'aa0cb16c15a5b30f78542f18e3fa65de005cf084'Michael Niedermayer2014-01-14
|\| | | | | | | | | | | | | | | | | | | | | * commit 'aa0cb16c15a5b30f78542f18e3fa65de005cf084': mxf: Fix off by one error in d10 aes3 decoding Conflicts: libavformat/mxfdec.c See: 3be02afb56f2a485fcdc747b6c2f77ed03adc6e5 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Fix off by one error in d10 aes3 decodingMarton Balint2014-01-14
| | | | | | | | Without this fix the last sample was missing from the packet.
* | Merge commit '42f9132218ca11a8e9a3c82a175b46bca092113e'Michael Niedermayer2014-01-14
|\| | | | | | | | | | | | | | | | | | | | | * commit '42f9132218ca11a8e9a3c82a175b46bca092113e': mxf: Do not use int to check the seek position Conflicts: libavformat/mxfdec.c See: 007989c7a2215f54aeaf2393ab3aff0c208e862f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Do not use int to check the seek positionLuca Barbato2014-01-14
| | | | | | | | | | | | Overly large files are to be expected. Reported-by: Jean-Baptiste Kempf <jb@videolan.org>
| * mxf: Set AV_FIELD_PROGRESSIVEReimar Döffinger2014-01-14
| | | | | | | | | | | | Needed for AVC-intra Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * lavf: make av_probe_input_buffer more robustAnton Khirnov2014-01-13
| | | | | | | | | | | | | | Always use the actually read size as the offset instead of making possibly invalid assumptions. Addresses: CVE-2012-6618
* | avcodec/flashsv: check avio_read() return in mov_read_udta_string()Michael Niedermayer2014-01-14
| | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f3f90a8606a_3018_Sequence_1-Apple_ProRes_422_LT.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/librtmp: Fix memory leak if RTMP_ConnectStream() failsAndrey Myznikov2014-01-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: av_probe_input_buffer2 decrease difference to libavMichael Niedermayer2014-01-14
| | | | | | | | | | | | | | | | This removes the initialization of 2 unused fields The change was part of c1868e7ee7b07b40a0fe15f50df89fe499a01a50 but wasnt merged as the fields could still be used Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils/av_probe_input_buffer2: fix buffer passed to ↵Michael Niedermayer2014-01-13
| | | | | | | | | | | | ffio_rewind_with_probe_data() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils/av_probe_input_buffer2: fix offset checkMichael Niedermayer2014-01-13
| | | | | | | | | | | | The check could fail if avio_read() read less than requested Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils/av_probe_input_buffer2: Fix pd.buf_sizeMichael Niedermayer2014-01-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8b76362836f3c373c3aadc544522edcbef16dd5f'Michael Niedermayer2014-01-13
|\| | | | | | | | | | | | | | | | | | | * commit '8b76362836f3c373c3aadc544522edcbef16dd5f': lavf: use a fixed width type Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: use a fixed width typeAnton Khirnov2014-01-13
| | | | | | | | It's shorter and more consistent with the rest of the code.
| * lavf: simplify handling of offset in av_probe_input_buuffer()Anton Khirnov2014-01-13
| |
* | mpegts muxer, DVB subtitles encoder: common DVB subtitles payloadSerhii Marchuk2014-01-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved DVB subtitles encoder to generate AVPacket.data in the same format as generates MPEGTS demuxer + DVB subtitles parser. So now single format of DVB subtitles data is used across all the components of FFmpeg: only subtitles payload WITHOUT 0x20 0x00 bytes at the beginning and 0xFF trailing byte. Improved MPEGTS muxer to support format of DVB subtitles in AVPacket.data described above: while muxing we add two bytes 0x20 0x00 to the beginning of and 0xFF to the end of DVB subtitles payload. The patch fixes DVB subtitle copy problems: tickets #2989 fully and #2024 partly. Signed-off-by: Clément Bœsch <u@pkh.me>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-11
|\| | | | | | | | | | | | | | | | | | | * qatar/master: flv: Workaround for buggy Omnia A/XE encoder Conflicts: libavformat/flvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flv: Workaround for buggy Omnia A/XE encoderBenjamin Larsson2014-01-11
| | | | | | | | | | | | | | | | | | The Omnia A/XE encoder writes the explicit extra data incorrectly and wrongly disables parametric stereo. Truncating the extra data by setting the size to 2 works around this. The AAC extra data parser will then only parse the correct parts. Bug-id: 599
* | avformat/pjsdec: dont increase pointer when its already at the end in read_ts()Clément Bœsch2014-01-11
| | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f91f2de7764_2649_PJS_capability_tester.pjs Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskadec: check generic audio deinterleaver sub_packet_size ↵Michael Niedermayer2014-01-10
| | | | | | | | | | | | | | | | | | against frame_size Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f67d052a530_7517_nosound.mkv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvdec: initialize context before reading from itMichael Niedermayer2014-01-10
| | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f9b8387069e_5377_flv_with_pcm_s16be_audio_track.flv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-25 04:28:08 +0000