RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
66,329 Commits 36 Branches 398 Tags 236 MiB
Commit Graph

562 Commits

Author SHA1 Message Date
Clément Bœsch c7d8dbad14 avformat: remove FF_API_ASS_SSA dead code 2014-09-09 21:34:23 +02:00
Michael Niedermayer 37520a91ac avformat: drop redundant MATROSKA_VIDEO_STEREO_MODE_COUNT identifier 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-29 01:26:52 +02:00
Michael Niedermayer fcc3909908 Merge commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f' 
* commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f':
  matroskadec: parse stereo mode on decoding

Conflicts:
	Changelog
	libavformat/matroska.c
	libavformat/matroskadec.c

See: 4c509fe305 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-28 23:48:23 +02:00
Michael Niedermayer 56cc754c76 Merge commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef' 
* commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef':
  matroska: list supported extensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-28 22:12:36 +02:00
Vittorio Giovara d4ae8ac92f matroskadec: parse stereo mode on decoding 
Convert the Matroska stereo format to the Stereo3D format, and add a
Stereo3D side data to the stream.

Bump the doctype version supported.

Bug-Id: 728 / https://bugs.debian.org/757185
 2014-08-28 12:33:26 -04:00
Vittorio Giovara f2583bc86e matroska: list supported extensions 2014-08-28 12:33:25 -04:00
Vignesh Venkatasubramanian 080acf7771 lavf/matroskadec: Ensure cues_end is initialized 
Ensure that cues_start and cues_end are always initialized and
the webm_dash_manifest_cues function returns appropriate error if
they are not computed correctly.

This fixes coverity defect CID1231991.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-25 18:25:39 +02:00
Reimar Döffinger a0941c8a2b Use new av_dict_set_int helper function. 
Get rid of the many, slightly differing, implementations
of basically the same thing.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-16 14:31:41 +02:00
Michael Niedermayer 81a663f49e Drop remaining unneeded != NULL 
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-15 22:47:45 +02:00
Michael Niedermayer 60dbed6067 Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867' 
* commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867':
  cosmetics: Write NULL pointer inequality checks more compactly

Conflicts:
	libavcodec/dvdsubdec.c
	libavcodec/h263dec.c
	libavcodec/libxvid.c
	libavcodec/rv10.c
	libavcodec/utils.c
	libavformat/format.c
	libavformat/matroskadec.c
	libavformat/segment.c
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-15 21:26:12 +02:00
Michael Niedermayer fb33bff990 Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39' 
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39':
  cosmetics: Write NULL pointer equality checks more compactly

Conflicts:
	cmdutils.c
	ffmpeg_opt.c
	ffplay.c
	libavcodec/dvbsub.c
	libavcodec/dvdsubdec.c
	libavcodec/dvdsubenc.c
	libavcodec/dxa.c
	libavcodec/libxvid_rc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/rv10.c
	libavcodec/tiffenc.c
	libavcodec/utils.c
	libavcodec/vc1dec.c
	libavcodec/zmbv.c
	libavdevice/v4l2.c
	libavformat/matroskadec.c
	libavformat/movenc.c
	libavformat/sdp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-15 21:00:50 +02:00
Gabriel Dume 4b1f5e5090 cosmetics: Write NULL pointer inequality checks more compactly 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-08-15 05:34:13 -07:00
Gabriel Dume f929ab0569 cosmetics: Write NULL pointer equality checks more compactly 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-08-15 03:18:18 -07:00
Justin Jacobs 87dc8b3af9 avformat/matroskadec: Check avpriv_new_chapter() for failure 
Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-08 21:16:30 +02:00
James Almer d34ec64a22 replace calls to url_feof() with avio_feof() 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-08 00:48:38 +02:00
Michael Niedermayer 92de445034 Merge commit 'fa38573cd9ce4ab727f86f57c03b113cfd4c9d0a' 
* commit 'fa38573cd9ce4ab727f86f57c03b113cfd4c9d0a':
  matroska: Register mime types

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 21:18:11 +02:00
Luca Barbato fa38573cd9 matroska: Register mime types 2014-07-29 17:47:32 +02:00
Michael Niedermayer e240d01c12 avformat/matroskadec: fix declaration after statement 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-16 00:06:15 +02:00
Vignesh Venkatasubramanian 5a20656946 lavf/matroska: Add functions for WebM DASH Manifest 
Add functions and logic to matroskadec for use by the WebM DASH Manifest
XML Muxer. The actual muxer is added in a future patch.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-15 23:56:17 +02:00
Michael Niedermayer 98569d8963 matroskadec: Fix a double negation typo 
This typo has existed since this code was added in c16582579.
Newer versions of clang pointed out that this comparison always
was true (since the result of the negation is either 0 or 1, while
AVDISCARD_ALL has the value 48).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-07-02 20:15:42 +03:00
Diego Biurrun 73953df71a Replace av_malloc() and memset(0) by av_mallocz() 2014-06-22 18:43:11 +02:00
Michael Niedermayer b3dfebd641 avformat/matroskadec: fix off by 1 error in matroska_read_seek() 
Fixes out of array read

Fixes: vp9-opus-crash.webm

Found-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-30 13:55:03 +02:00
Michael Niedermayer 579e2b2874 Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f' 
* commit '23f741f79327e31be7b2a75ebb2e02111e06e52f':
  matroskadec: parse the channel layout mask for FLAC

Conflicts:
	libavformat/oggparsevorbis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 13:02:19 +02:00
Michael Niedermayer 1c0ce2d4e0 Merge commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0' 
* commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0':
  matroskadec: export just the STREAMINFO block as FLAC extradata

Conflicts:
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 12:49:28 +02:00
Michael Niedermayer 69de229bb8 Merge commit '6df478bf891b9fc5626e4a0b993899f310ba0a1c' 
* commit '6df478bf891b9fc5626e4a0b993899f310ba0a1c':
  matroskadec: split parsing tracks into a separate function

Conflicts:
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 12:41:35 +02:00
Anton Khirnov 23f741f793 matroskadec: parse the channel layout mask for FLAC 
It is commonly stored in a vorbiscomment block in codec private data.
 2014-05-28 07:50:32 +02:00
Anton Khirnov 4efdadc8ec matroskadec: export just the STREAMINFO block as FLAC extradata 
It contains all information that is used by the decoder and the other
FLAC-capable demuxers (flacdec, ogg) export only STREAMINFO as well.
 2014-05-28 07:49:15 +02:00
Anton Khirnov 6df478bf89 matroskadec: split parsing tracks into a separate function 2014-05-28 07:48:59 +02:00
Michael Niedermayer 8bf90562f6 Merge commit 'eb3b5501e8b85bfea09d533314cb6920efc42639' 
* commit 'eb3b5501e8b85bfea09d533314cb6920efc42639':
  matroskadec: read the CodecDelay element

Conflicts:
	libavformat/matroska.h
	libavformat/matroskadec.c

See: d6f86d74ed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-01 04:29:40 +02:00
Anton Khirnov eb3b5501e8 matroskadec: read the CodecDelay element 2014-04-30 21:00:01 +02:00
Carl Eugen Hoyos ade5851be0 Try mov tags if the fourcc in V_MS/VFW mkv files cannot be found in bmp tags. 
Fixes decoding of broken mkv files containing ProRes video from ticket #3434.
 2014-04-27 12:52:34 +02:00
Carl Eugen Hoyos 6c18200c2f Only insert the icpf atom in ProRes mkv packets if it isn't already present. 
The patch allows to read broken mkv files containing ProRes as written by
the Haali muxer.
Fixes a part of ticket #3434.
 2014-04-17 14:46:11 +02:00
Carl Eugen Hoyos 3d5c859fa6 Set Matroska private data when muxing Prores. 
The specification requires the mov code point to be written as "fourcc".
 2014-04-06 23:35:17 +02:00
Michael Niedermayer 28ee7757f5 Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430' 
* commit 'd92024f18fa3d69937cb2575f3a8bf973df02430':
  lavf: more correct printf format specifiers

Conflicts:
	libavformat/asfdec.c
	libavformat/cafdec.c
	libavformat/dxa.c
	libavformat/framecrcenc.c
	libavformat/hnm.c
	libavformat/iff.c
	libavformat/mov.c
	libavformat/mxfdec.c
	libavformat/rmdec.c
	libavformat/rpl.c
	libavformat/smacker.c
	libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-11 21:05:34 +01:00
Diego Biurrun d92024f18f lavf: more correct printf format specifiers 2014-03-11 13:13:41 +01:00
Michael Niedermayer fabf69f37a Merge commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a' 
* commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a':
  matroskadec: cosmetics: Fix "attachement" vs. "attachment" typo

Conflicts:
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-08 00:13:20 +01:00
Michael Niedermayer b3d9ab1829 Merge commit '84cfce9f99805a144df684417e166c1ae6f95421' 
* commit '84cfce9f99805a144df684417e166c1ae6f95421':
  matroskadec: K&R formatting cosmetics

Conflicts:
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-07 23:52:44 +01:00
Diego Biurrun f69befe5ee matroskadec: cosmetics: Fix "attachement" vs. "attachment" typo 2014-03-07 13:54:18 +01:00
Keiji Costantini 84cfce9f99 matroskadec: K&R formatting cosmetics 
Also sort #includes into canonical order.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-03-07 13:39:07 +01:00
Carl Eugen Hoyos 96fc2908f0 Read bits_per_coded_sample from V_MS/VFW/FOURCC mkv files. 
Fixes ticket #3425.
 2014-02-26 00:02:51 +01:00
Michael Niedermayer 9d13432a90 avformat/matroskadec: identify SMI as SVQ3 
Fixes part of Ticket3256

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-19 20:13:38 +01:00
Michael Niedermayer 48218580e1 avformat/matroskadec: support QDM2 as generated by mkvtoolnix-6.7.0 
Fixes part of Ticket3256

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-19 18:48:49 +01:00
Michael Niedermayer 5800b08572 avformat/matroskadec: support SVQ3 as generated by mkvtoolnix-6.6.0 
Fixes part of Ticket3256

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-19 18:48:11 +01:00
Carl Eugen Hoyos 1132937077 Do not read mkv audio bit_depth if bits_per_coded_sample is already set. 
This allows decoding broken mkv files containing G.726 audio.
 2014-01-15 23:37:47 +01:00
Michael Niedermayer a1ed1c2193 avformat/matroskadec: check generic audio deinterleaver sub_packet_size 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>
 2014-01-10 23:45:43 +01:00
James Almer 2c759d7018 matroskadec: Export the MuxingApp element value as metadata 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-03 04:09:00 +01:00
James Almer 0d944ee343 matroskadec: Fix bug when parsing realaudio codec parameters 
flavor can be 0.

This fixes tract ticket #3214

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-25 13:36:25 +01:00
Alex Sukhanov 251c96a70b avformat/matroskadec: Fix start_time 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-24 18:59:46 +01:00
Aurelien Jacobs 8b516f154a matroskadec: use correct compression parameters for current track CodecPrivate 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-21 20:54:55 +01:00
Anton Khirnov 30be1ea33e matroskadec: pad EBML_BIN data. 
It might be passed to code requiring padding, such as lzo decompression.

Fixes invalid reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
 2013-11-21 20:54:30 +01:00