ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-03 19:50:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,592 Commits 37 Branches 400 Tags 495 MiB
4eb49fdde8
Commit Graph

13913 Commits

Author SHA1 Message Date
Anton Khirnov
4eb49fdde8 lavf: remove unreliable timestamp guessing heuristic 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 20:10:41 +01:00
Clément Bœsch
8d55362fd0 avformat/avisynth: re-add trailing \n. 
Regression since ac9529ce.

Spotted by Timothy Gu.
 2013-10-29 19:42:08 +01:00
Michael Niedermayer
6103faaa51 matroskaenc: fixed display width / height calculation for stereo mode 
Based-on: patch by Asan Usipov <asan.usipov@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 16:08:00 +01:00
Michael Niedermayer
d3e13250a0 Merge commit 'feeafb4adabd5c17de1738ed9962e40892b20edb' 
* commit 'feeafb4adabd5c17de1738ed9962e40892b20edb':
  lavf: do not export av_register_{rtp,rdt}_dynamic_payload_handlers from shared objects

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 11:06:32 +01:00
Michael Niedermayer
f1f0b01c47 avformat/gxf: fix old codec id 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 23:54:42 +01:00
Stephen Hutchinson
f87a2e1272 avisynth: Factor out a couple of returns 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 22:30:43 +01:00
Stephen Hutchinson
ac9529ceec avisynth: Simplify a stray av_log message 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 22:30:36 +01:00
Stephen Hutchinson
7ac67583c3 avisynth: Switch a couple of AVERROR_UNKNOWNs to AVERROR(ENOMEM) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 22:30:20 +01:00
Stephen Hutchinson
c7f9aab801 avisynth: Use AV_* prefixes for video and audio IDs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 22:26:56 +01:00
Stephen Hutchinson
cf31c1d4f8 avisynth: Remove outdated undef block 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 22:26:47 +01:00
Stephen Hutchinson
df6279e737 avisynth: Remove a couple of useless AviSynthContext casts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 22:26:37 +01:00
Stephen Hutchinson
da9852670c avisynth: Don't declare structs anonymously 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 22:26:28 +01:00
Stephen Hutchinson
d10d60be68 avisynth: Compact AvxSynth's avoidance of 2.6's colorspaces. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 22:26:14 +01:00
Stephen Hutchinson
2c18bfe6af avisynth: Cosmetics 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 22:25:26 +01:00
Stephen Hutchinson
1549122d26 avisynth: Change most of the comments to /* */ from // 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 22:25:12 +01:00
Stephen Hutchinson
bd97ba72dc avisynth: Introduce USING_AVISYNTH macro 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 22:24:58 +01:00
Peter Ross
69a042ee95 mpegts: demux synchronous SMPTE 336M Key-Length-Value (KLV) metadata 
Fixes ticket #2579.
 2013-10-28 19:31:58 +01:00
Anton Khirnov
feeafb4ada lavf: do not export av_register_{rtp,rdt}_dynamic_payload_handlers from shared objects 2013-10-28 15:29:49 +01:00
Michael Niedermayer
0436ffc294 Merge commit '53151723e377b9c43f876e20d7f27a17993256c8' 
* commit '53151723e377b9c43f876e20d7f27a17993256c8':
  avio: K&R formatting cosmetics

Conflicts:
	libavformat/avio.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 12:17:57 +01:00
Anton Khirnov
2ba68dd044 lavf: remove unreliable timestamp guessing heuristic 2013-10-28 09:28:19 +01:00
Luca Barbato
53151723e3 avio: K&R formatting cosmetics 2013-10-28 00:04:50 +01:00
Derek Buitenhuis
d206fd996b avio: Check for memory allocation failure of private data 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-27 19:15:03 +00:00
Michael Niedermayer
2ef1e62c8d correct the AVOption documentation for AV_EF_CAREFUL 
The flag was and is intended to be a sane default and thus does not enable
time consuming checks. This also matches how the flag is used in decoders and
demuxers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 20:03:08 +01:00
Michael Niedermayer
4307026243 avformat/utils: make "first_dts not matching first dts in the queue" message more informative 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 17:41:06 +01:00
Michael Niedermayer
1e5271a9fd avformat/utils: do not override pts in h264 when they are provided from the demuxer 
Fixes Ticket2143

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 02:27:45 +02:00
Michael Niedermayer
d2db1bb7de avformat/http: dont fail with unknown Content-Encodings 
Fixes: http://m1.file.xiami.com/282/23282/343749/1769075752_709488_l.mp3

Based-on-patch-by: Crossle Song <sxm@yixia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-26 19:20:01 +02:00
Michael Niedermayer
fcd08b7770 avformat/md5enc: add format, version and column headers 
See Ticket2280

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-26 12:16:04 +02:00
lemonlinger@gmail.com
2cf94485de avformat/rtpproto: when local rtp port and local rtcp port are not specified, try to make two successive ports and retry 3 times when failed 
some video players on Android will not send udp hole punching messages if the rtcp port and rtp port are not two successive integers.
So, if the video player is behind NAT, it could not receive and rtp messages via udp

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-25 22:40:21 +02:00
Michael Niedermayer
ba8716df7f avformat/mp3dec: perform seek resync in the correct direction 
Fixes seeking to the last frame in CBR files
Fixes Ticket2773

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-25 19:37:03 +02:00
Michael Niedermayer
d04ec6ffc5 avformat/rmdec: english typos 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-25 19:14:36 +02:00
Michael Niedermayer
6abb9eb525 avformat/wavdec: Fix smv packet interleaving 
This strips the relative timestamp "flag" off.

Fixes Ticket2849

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-25 12:50:26 +02:00
Michael Niedermayer
aaf02f6ede avformat/rmdec: add some error messages 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-24 17:05:57 +02:00
Michael Niedermayer
f7106e00f7 avformat/rmdec: fix return code of ff_rm_parse_packet() 
Broken by aecb9d3
Fixes assertion failure
Fixes Ticket3042

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-24 16:53:50 +02:00
Michael Niedermayer
210afae0ba avformat/utils: Check size argument in ff_add_index_entry() 
Fixes infinite loop
Fixes Ticket3061

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-24 12:58:09 +02:00
Michael Niedermayer
3ce7c62e1b avformat/framehash: add software version to framecrc/md5 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-23 16:32:32 +02:00
James Almer
c994b42830 lavf/adtsenc: Add support for APE tags 
Should fix ticket #2269

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-23 16:13:23 +02:00
Michael Niedermayer
76424b2da8 Merge commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388' 
* commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388':
  movenc: Add an F4V muxer

Conflicts:
	Changelog
	libavformat/allformats.c
	libavformat/movenc.c
	libavformat/version.h

See: 7bc70930dd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-23 12:05:48 +02:00
Clément Bœsch
e01fba5562 movenc: Add an F4V muxer 
F4V is Adobe's mp4/iso media variant, with the most significant
addition/change being supporting other flash codecs than just
aac/h264.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-10-23 11:17:03 +03:00
Derek Buitenhuis
b1fcdc08ce nut: Fix unchecked allocations 
CC: libav-stable@libav.org
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-22 17:09:56 +01:00
Derek Buitenhuis
55ae13e3de nut: Fix unchecked allocations 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-22 17:08:10 +01:00
Michael Niedermayer
23c0698499 Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  lavf/tee: fix leak of bsfs array.
  lavf/tee: fix leak of select option.
  lavf/tee: fix leak of strdup/strtoked buffer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-21 23:50:07 +02:00
Michael Niedermayer
7e3e653618 avformat/bintext: protect against potential overflow of chars_per_frame 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-21 23:37:49 +02:00
Nicolas George
c4e6024adc lavf/tee: fix leak of bsfs array. 2013-10-21 17:32:01 +02:00
Nicolas George
5a12142aca lavf/tee: fix leak of select option. 2013-10-21 17:32:01 +02:00
Nicolas George
59f809e992 lavf/tee: fix leak of strdup/strtoked buffer. 
Fix CID 1108606.
 2013-10-21 17:32:01 +02:00
Luca Barbato
ea71aafd68 avio: Use AVERROR_PROTOCOL_NOT_FOUND 
When the protocol is missing ffurl_alloc() should return
AVERROR_PROTOCOL_NOT_FOUND instead of AVERROR(ENOENT).

Bug-Id: 577
CC: libav-stable@libav.org
 2013-10-21 15:55:20 +02:00
Paul B Mahol
f5ed83c383 avformat/mxfdec; parse random index pack to get last partition offset and use it when footer partition offset is missing 
Footer partition may not be present and even if present footer partition
offset may not be set in any partition except last one.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-21 13:29:30 +00:00
Clément Bœsch
4189fe11ff avformat/vobsub: fix invalid sub queue access while seeking. 
If there is only 1 stream and seek isn't called with a specific stream
index, we pick the first (and only) one.

Regression since dbfe6110.

Fixes CID1108591.
 2013-10-20 21:23:46 +02:00
Michael Niedermayer
88d4ff4b5f avformat/utils: Check av_packet_new_side_data() return before using it 
Fixes null pointer dereference
Fixes CID1108592
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-20 18:33:53 +02:00
Michael Niedermayer
eb5cc8febc avformat/oggparsespeex: Check for extradata allocation failure 
Fixes CID1108574
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-20 16:57:45 +02:00