generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
73,844 Commits 24 Branches 241 Tags 173 MiB
033144c0d1
Commit Graph

17834 Commits

Author SHA1 Message Date
Michael Niedermayer
cb53db144c avformat/mp3dec: Rename sync() function to avoid build failure on android 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-20 02:41:44 +02:00
Michael Niedermayer
bf1fd59c6a avformat/avidec: Fix demuxing avi with broken index 
Fixes: genio-avi

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-20 02:11:49 +02:00
Carl Eugen Hoyos
32d8726a31 lavf/rtpenc_jpeg: Warn if number of present quantization tables is not two. 2015-07-20 00:27:52 +02:00
James Almer
2db8c42ddc avformat/mp3dec: remove unused variable 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-07-19 17:47:28 -03:00
Vesselin Bontchev
0a551cbe97 Add support for Audible AAX (and AAX+) files 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 20:28:39 +02:00
Michael Niedermayer
4df66c7cd6 avformat/mp3dec: split position sync code out 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 19:31:08 +02:00
Michael Niedermayer
3d4297f851 Merge commit 'e61f39849c2e2b7f492c17b42058242ed2fa4d57' 
* commit 'e61f39849c2e2b7f492c17b42058242ed2fa4d57':
  asfdec: make nb_sub to be unsigned int

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 11:52:35 +02:00
Michael Niedermayer
74aba00700 Merge commit '2883ef34b59c9b427c4cfad4620c3235e5778406' 
* commit '2883ef34b59c9b427c4cfad4620c3235e5778406':
  asfdec: read the replicated data in a separate function

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 11:45:08 +02:00
Michael Niedermayer
80a37fc3e1 Merge commit '0989d3ad1fbd7509815208b0a5792918492d2a68' 
* commit '0989d3ad1fbd7509815208b0a5792918492d2a68':
  asfdec: convert condition for the replicated data reading to be safer

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 11:29:55 +02:00
Michael Niedermayer
f509c9503a Merge commit '406627287e015ce381795e85e2557b12bf60ca35' 
* commit '406627287e015ce381795e85e2557b12bf60ca35':
  asfdec: do not read replicated data when their length is 0

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 11:23:01 +02:00
Alexandra Hájková
e61f39849c asfdec: make nb_sub to be unsigned int 
number of subpayloads should be always positive

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-19 09:20:01 +02:00
Alexandra Hájková
2883ef34b5 asfdec: read the replicated data in a separate function 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-19 09:18:27 +02:00
Alexandra Hájková
0989d3ad1f asfdec: convert condition for the replicated data reading to be safer 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-19 09:16:28 +02:00
Alexandra Hájková
406627287e asfdec: do not read replicated data when their length is 0 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-19 08:59:48 +02:00
Michael Niedermayer
b5e716ae13 avformat/mpegtsenc: Add sdt_period, similar to pat_period 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 23:26:05 +02:00
Michael Niedermayer
34da54fd1a avformat/mpegtsenc: Support a user specified PAT/PMT period 
Can be used to fix Ticket3714

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 22:24:25 +02:00
Michael Niedermayer
a9c1545a33 avformat/mpegtsenc: support storing PAT/PMT per frame 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 22:19:19 +02:00
Michael Niedermayer
a194298954 avformat/movenc: Drop redundant bit exact field from context 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 13:27:33 +02:00
Ganesh Ajjanagadde
f6870495e1 avformat: increase first_frames threshold for mp3,ac3 
Fixes Ticket4723

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 04:52:49 +02:00
Zhang Rui
f477a3f5ab avformat/async: support filling with a background thread. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 01:46:50 +02:00
Vittorio Giovara
f1840b070d Revert "mov: Double-check that alias path is not an absolute path" 
This reverts commit 9286de0459.
The change broke support for legit absolute file paths.

Reported-by: Maksym Veremeyenko <verem@m1stereo.tv>.
 2015-07-17 01:44:22 +01:00
Marton Balint
c8ec2109f9 avformat: bump micro version after adding concatdec features 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-07-17 00:12:04 +02:00
Marton Balint
5117b5e9aa concatdec: add support for injecting packet metadata 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-07-17 00:12:04 +02:00
Marton Balint
25a6711c25 concatdec: add support for specifying outpoint of files 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-07-17 00:12:04 +02:00
Marton Balint
12d82004c5 concatdec: store eof condition in context 
This is needed later for outpoint support which may leave the last file in a
not-eof state.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-07-17 00:12:04 +02:00
Marton Balint
7ff0137a1f concatdec: add support for specifying inpoint of files 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-07-17 00:12:04 +02:00
Marton Balint
53f2ef2c4a mxfdec: calculate the index in display order 
This should fix seeking for open GOP files as well.

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-07-16 22:07:49 +02:00
Luca Barbato
4512ee78e1 mpegts: Mark the muxer as supporting variable fps 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-07-15 19:43:48 +02:00
Michael Niedermayer
4afc3429be avformat/utils: Fix regression with H264 stream probing 
Fixes Ticket4725

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-16 03:37:43 +02:00
Michael Niedermayer
cdca400c5e avformat/utils: Print stream number in max_analyze_duration exit path 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-16 03:30:24 +02:00
Carl Eugen Hoyos
9901e53187 lavf/rtpenc_jpeg: Fix sending multiple quantization tables. 2015-07-16 00:36:13 +02:00
Donny Yang
99b0cadd13 apng: Fix wrong default final frame delay in muxer 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-15 22:52:06 +02:00
Michael Niedermayer
1680f9c588 Merge commit '4512ee78e19fdb011bdec1b3a8dc0b315c82a81e' 
* commit '4512ee78e19fdb011bdec1b3a8dc0b315c82a81e':
  mpegts: Mark the muxer as supporting variable fps

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-15 21:29:12 +02:00
Michael Niedermayer
8f2c045a0e avformat/mov: Implement a same origin policy for references instead of only allowing a subset of relative pathes in references 
Fixes Ticket4671

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-15 12:47:09 +02:00
Michael Niedermayer
90dd6ad22c avformat/utils: inform the user if the protocol cannot be determined 
Assuming the wrong protocol can lead to suboptimal seeking performance

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-15 04:09:09 +02:00
Michael Niedermayer
901922e047 avformat/utils: adjust short skip threshold in ff_configure_buffers_for_index() to avoid seeking if a packet is skiped 
Fixes Ticket4126

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-15 03:35:08 +02:00
Michael Niedermayer
c9c7263e58 avformat/mov: Fix opening relative references 
Possibly fixes Ticket4671

the removed check is wrong and insufficient

Based on patch by Maksym Veremeyenko <verem@m1.tv>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-15 01:12:45 +02:00
wm4
130a8e0eef avformat: don't crash API users when demuxing mp4 
This code is one big chunk of WTF.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-14 22:41:35 +02:00
Michael Niedermayer
15629129dd avformat/mov: Fix deallocation when MOVStreamContext failed to allocate 
Fixes: 260813283176b57b3c9974fe284eebc3_signal_sigsegv_7ffff713351a_991_xtrem_e2_m64q15_a32sxx.3gp with memlimit of 262144

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-14 14:15:42 +02:00
Michael Niedermayer
db1ab7e5af Merge commit 'c571424c7f6276a6374e1784ce2a33d4b6a4292d' 
* commit 'c571424c7f6276a6374e1784ce2a33d4b6a4292d':
  asfdec: prevent memory leaks found with Coverity Scan

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-14 00:54:55 +02:00
Michael Niedermayer
32d023eb6d avformat/oggdec: Check buf before copying data in to it 
Fixes null pointer dereference
Fixes: aace024653cc62947336b86f8de812ab_signal_sigsegv_a0500f_343_WobblyWindowsIntro.ogg with memlimit 262144

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 22:10:24 +02:00
Luca Barbato
a5a6a786bf mp3: Forward seeking errors 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-07-13 21:59:53 +02:00
Alexandra Hájková
c571424c7f asfdec: prevent memory leaks found with Coverity Scan 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-13 20:27:34 +02:00
Michael Niedermayer
b513661251 avformat/utils: Skip ff_configure_buffers_for_index() for local files 
Theres no known case where its use on local files improves performance
if you know of such a case, please contact us

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-13 14:27:02 +02:00
Michael Niedermayer
488cc05192 avformat/mov: Use ff_configure_buffers_for_index() 
Fixes Ticket2513
Fixes Ticket4432

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-13 12:38:21 +02:00
Michael Niedermayer
b183fb4767 avformat: Add ff_configure_buffers_for_index() 
This allows configuring the io buffer in such way that few seeks are needed for playback

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-13 12:38:21 +02:00
Ganesh Ajjanagadde
4547cf68a0 avformat/isom: utilize bitrate hints 
Fixes Ticket4546

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 20:23:58 +02:00
Michael Niedermayer
d2e5297e93 Merge commit '796268654c7807c9a1cfb322c838383e2b900d60' 
* commit '796268654c7807c9a1cfb322c838383e2b900d60':
  asfdec: always reset packet state after seeking

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 16:34:18 +02:00
Michael Niedermayer
839d6bc192 avformat/riffde: Fix integer overflow in bitrate 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 16:24:20 +02:00
Michael Niedermayer
cd32637741 Merge commit 'f1bdc234370401c032cd85184e93c7c155eb6d62' 
* commit 'f1bdc234370401c032cd85184e93c7c155eb6d62':
  riff: Validate bitrate

Conflicts:
	libavformat/riffdec.c

See: 189420cb56
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 16:23:42 +02:00