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

12381 Commits

Author SHA1 Message Date
Daniel Verkamp 5dd78ef34e WAV muxer: reindent 2013-02-13 17:36:55 +00:00
Nicolas George b68dd8a161 lavf/concatdec: allow probing. 2013-02-13 14:58:50 +01:00
Nicolas George db9dc5154d lavf/concatdec: add signature directive. 2013-02-13 14:58:50 +01:00
Nicolas George 6d680d20ad lavf/concatdec: add safe option. 2013-02-13 14:58:50 +01:00
Daniel Verkamp 1ecce266fa WAV muxer: add RF64 support 2013-02-12 14:50:27 +00:00
Carl Eugen Hoyos 182e342fdb Print mxf Universal Label if the user requested verbose logging. 
Fixes ticket #2198
 2013-02-11 13:11:16 +01:00
Stefano Sabatini 6b171f046c lavf/matroskaenc: provide more feedback in case of unsupported codec 
Also return meaningful error code.
 2013-02-10 21:00:56 +01:00
Michael Niedermayer ea1d8465e6 Fix division by 0 due to audio frame size 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-10 18:15:33 +01:00
Michael Niedermayer e88f392733 Merge commit '81726a4f0b8a43e19898e2a36fdde80583bafff0' 
* commit '81726a4f0b8a43e19898e2a36fdde80583bafff0':
  FATE: add tests for additional flavors of asf cover art
  asfdec: do not assume every AVStream has a corresponding ASFStream

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-10 13:18:04 +01:00
Michael Niedermayer 9a714d871a Merge commit 'f5fac6f77752931347ab302563802dcaa49c2419' 
* commit 'f5fac6f77752931347ab302563802dcaa49c2419':
  asfdec: support reading ID3v2 tags in ASF files

Conflicts:
	Changelog
	libavformat/asfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-10 13:06:16 +01:00
Michael Niedermayer 30085bd43e Merge commit '84b721db366c0734fdfd23c8daaa7da7da21f761' 
* commit '84b721db366c0734fdfd23c8daaa7da7da21f761':
  asfdec: also read Metadata Library Object

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-10 12:39:17 +01:00
Michael Niedermayer 3600049dae Merge commit '61f9ad2dfcb3f98b7ac5777d19d0e7b61d0be01e' 
* commit '61f9ad2dfcb3f98b7ac5777d19d0e7b61d0be01e':
  asfdec: read the full Metadata Object, not just aspect ratio information

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-10 12:25:40 +01:00
Michael Niedermayer 0af4506e15 Merge commit '36fab50e90d15352e403e4cc210890810f2fb4e2' 
* commit '36fab50e90d15352e403e4cc210890810f2fb4e2':
  asfdec: silence a warning
  mss4, ra288: Remove unused DSPContext local codec context members

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-10 12:14:14 +01:00
Carl Eugen Hoyos f02f231e05 Do not write invalid matroska files. 
Some real codecs are supported by the matroska specification
(and FFmpeg's matroska demuxer) but not the FFmpeg muxer.
 2013-02-10 10:51:12 +01:00
Nicolas George f43d09cd60 lavf: add tee pseudo-muxer. 2013-02-09 20:50:11 +01:00
Vladimir Pantelic f5fac6f777 asfdec: support reading ID3v2 tags in ASF files 
Yes, these files do exist

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-02-09 18:57:21 +01:00
Vladimir Pantelic 84b721db36 asfdec: also read Metadata Library Object 
In some ASF files this objects holds cover art and other tags. Compared to
Metadata Object it can also hold GUIDs, but we ignore these for now.

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-02-09 18:57:21 +01:00
Vladimir Pantelic 61f9ad2dfc asfdec: read the full Metadata Object, not just aspect ratio information 
Use the same get_tag()/get_value() as for the Extended Content Description
but handle the 16 bit vs 32 bit difference for type 2 (BOOL)

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-02-09 18:57:21 +01:00
Vladimir Pantelic 36fab50e90 asfdec: silence a warning 
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-02-09 18:57:21 +01:00
Anton Khirnov 1ef0e8a6bf asfdec: do not assume every AVStream has a corresponding ASFStream 
This won't be true for ID3 attached picture.

Also stop allocating now useless dummy ASFStreams for ASF native
attached pictures.
 2013-02-09 18:57:21 +01:00
Stefano Sabatini 765dbea9fe lavf/rawvideodec: fix/extend option descriptions 2013-02-09 14:57:10 +01:00
rogerdpack aa715cdcf5 dshow: attempt to build shared as well as static 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2013-02-06 23:37:46 -07:00
Michael Niedermayer 47335126c0 ff_end_tag: assert that the start is aligned. 
If its start is not aligned then aligning its end will
likely break many demuxers as they check the size and not
the position.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-08 12:51:52 +01:00
Paul B Mahol 810cd0dd9c riff: chunks must be at 2 byte boundary 
Fixes #2244.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-08 10:40:41 +00:00
Michael Niedermayer a8e748eee5 lavf: add seek2any to allow forcing seeking to non keyframes via AVOptions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-07 21:54:41 +01:00
Michael Niedermayer 7c00d853a6 matroskadec: support seek to non keyframes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-07 21:48:48 +01:00
Michael Niedermayer 199683c898 mov: remove unused function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-07 11:54:46 +01:00
Stefano Sabatini b3d2c6f8b9 lavf/segment: fix DTS inconsistencies with -reset_timestamps 
The DTS needs to be resynched against the segment start PTS, or the
resulting DTS may result < PTS.

Reported-by: Owen Jones <riots6@gmail.com>

See thread:
Subject: [FFmpeg-user] pts/dts error using reset_timestamps while splitting a DVD
Date: Sat, 19 Jan 2013 08:58:27 +0000
 2013-02-06 22:55:18 +01:00
Matthieu Bouron 59d40fc7e6 lavf/mov: skip version and flags attributes in mov_read_chan function 
Fixes ticket #1764.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-06 22:39:40 +01:00
Michael Niedermayer 864fdfa062 framecrcenc: print all side data elements, not just the first 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-06 18:17:27 +01:00
Michael Niedermayer b2c4431944 framecrcenc: Also print the size of side data elements 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-06 18:17:03 +01:00
Vignesh Venkatasubramanian 579c4add63 Fate test to print side_data crc if present 
Modified the fate test crc generator to print the side_data's
crc if side_data is present.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-06 17:53:47 +01:00
Michael Niedermayer fadf845973 Merge commit '48a4ffa722c0874b251de9d201babed52cef0bcb' 
* commit '48a4ffa722c0874b251de9d201babed52cef0bcb':
  asf: K&R formatting cosmetics
  vc1dec: use codec_id instead of codec_tag for VC1IMAGE
  sh4: drop unused functions

Conflicts:
	libavformat/asf.c
	libavformat/asfdec.c
	libavformat/asfenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-06 14:25:28 +01:00
Diego Biurrun 48a4ffa722 asf: K&R formatting cosmetics 2013-02-06 09:48:51 +01:00
Stefano Sabatini a12787960e lavf/segment: extend PTS debugging log with -reset_timestamps 2013-02-06 00:40:09 +01:00
Michael Niedermayer f0eacbc760 dvenc: dont fail hard if the timecode is invalid 
Instead just dont store the timecode
Fixes Ticket2187

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 22:57:35 +01:00
Michael Niedermayer a8343bfb6a riff: fix infinite loop 
Fixes Ticket2241

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 18:31:27 +01:00
Carl Eugen Hoyos 90020d7f4b lavf/segment: use correct spelling and value for EXT-X-ALLOW-CACHE tag 
Replace wrong "EXT-X-ALLOWCACHE" with "EXT-X-ALLOW-CACHE", and value 1/0
with YES/NO, as per spec.

Fix trac ticket #2228.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-02-03 11:17:35 +01:00
Carl Eugen Hoyos a60530e3ee Require at least three frames to autodetect loas. 2013-02-02 22:36:25 +01:00
Carl Eugen Hoyos b45a3e167f Map the interlaced flag of yuv4mpeg streams to AVCodecContext->field_order. 
Fixes a part of ticket #2190.
 2013-02-02 12:32:04 +01:00
Carl Eugen Hoyos 985e93a865 Do not fail for mixed interlaced / non-interlaced YUV4MPEG streams. 2013-02-02 00:01:48 +01:00
Carl Eugen Hoyos 6a50e8a190 Do not change codec in flv streams if the user has forced a codec. 
Fixes ticket #2218.
 2013-02-01 23:27:15 +01:00
Michael Niedermayer 911e270688 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Use proper "" quotes for local header #includes
  ppc: fmtconvert: Drop two unused variables.
  bink demuxer: set framerate.

Conflicts:
	libavcodec/kbdwin.c
	libavcodec/ppc/fmtconvert_altivec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-01 14:34:18 +01:00
Diego Biurrun 6c1a7d07eb Use proper "" quotes for local header #includes 2013-02-01 12:51:15 +01:00
Anton Khirnov 9ec8971060 bink demuxer: set framerate. 2013-02-01 12:42:17 +01:00
Anton Khirnov 1730ca2eca bink demuxer: check malloc return value 2013-02-01 12:41:38 +01:00
Allan Kristensen 4789c25d83 matroska: fixed missing S_DVBSUB subtitles 2013-02-01 01:49:04 +01:00
Michael Niedermayer 01d012ba3d Merge commit '29f1fa74225e9fdbab6d590857edbecb51cf74da' 
* commit '29f1fa74225e9fdbab6d590857edbecb51cf74da':
  configure: Move newlib libc check before mingw libc check
  avisynth: Change demuxer name to avoid conflicts with AVS

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-31 19:52:58 +01:00
Diego Biurrun 0f5b0b4178 avisynth: Change demuxer name to avoid conflicts with AVS 2013-01-31 11:19:22 +01:00
Michael Niedermayer fe6767f849 asfdec: fix integer overflow in packet_replic_size check 
Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-31 03:37:43 +01:00