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

17814 Commits

Author SHA1 Message Date
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
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
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
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
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
Andreas Cadhalpun
189420cb56 riffdec: prevent negative bit rate 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 16:12:36 +02:00
Michael Niedermayer
7da1f00e79 Merge commit 'c1d647b15afa69fa70f999a9ddcb98346409fb4d' 
* commit 'c1d647b15afa69fa70f999a9ddcb98346409fb4d':
  mp3: Make the seek more robust

Conflicts:
	libavformat/mp3dec.c

Mostly not merged

See: b6267901c4 and various later commits

The bug is also not reproducable in FFmpeg

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 16:01:31 +02:00
Michael Niedermayer
ba77fb61f7 Merge commit 'd80811c94e068085aab797f9ba35790529126f85' 
* commit 'd80811c94e068085aab797f9ba35790529126f85':
  riff: Use the correct logging context

Conflicts:
	libavformat/asfdec_o.c
	libavformat/avidec.c
	libavformat/dxa.c
	libavformat/matroskadec.c
	libavformat/mov.c
	libavformat/riff.h
	libavformat/riffdec.c
	libavformat/wavdec.c
	libavformat/wtvdec.c
	libavformat/xwma.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 15:22:37 +02:00
Ronald S. Bultje
3a18d3fa04 ivfenc: write duration at end-of-stream. 
At the beginning, the value is not initialized.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 13:56:50 +02:00
Hendrik Leppkes
796268654c asfdec: always reset packet state after seeking 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-07-12 13:24:23 +02:00
Michael Niedermayer
cdb0d7e439 avformat/brstm: Remove unused variable 
Fixes "libavformat/brstm.c:128:35: warning: variable info_size set but not used"

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 12:17:40 +02:00
Michael Niedermayer
944a1aa3c5 avformat/yuv4mpegdec: Use 64bit for file offset 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 00:00:21 +02:00
Paul B Mahol
3666974230 avformat/yuv4mpegdec: remove unused variable 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-11 19:31:04 +00:00
Andreas Cadhalpun
f1bdc23437 riff: Validate bitrate 2015-07-11 18:45:45 +02:00
Luca Barbato
c1d647b15a mp3: Make the seek more robust 
Try to parse up to 4 packets to find the closest packet.

Reported-By: jan.schlueter@ofai.at
 2015-07-11 18:45:45 +02:00
Luca Barbato
d80811c94e riff: Use the correct logging context 2015-07-11 18:45:44 +02:00
Michael Niedermayer
9b8b804cfb avformat/yuv4mpegdec: Remove unused variables 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-11 14:49:55 +02:00
Ronald S. Bultje
733c5d889b yuv4mpeg: add rough duration estimate and seeking. 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-11 14:46:19 +02:00
Michael Niedermayer
72527d9c54 Merge commit '872fab4a3df48e7e6484333ee2228c684e319634' 
* commit '872fab4a3df48e7e6484333ee2228c684e319634':
  asfdec: Fix reading from the pipe

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-10 20:47:46 +02:00
Alexandra Hájková
872fab4a3d asfdec: Fix reading from the pipe 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-07-10 13:25:02 +02:00
Carl Eugen Hoyos
e786e96be7 lavf/rtpenc_jpeg: Error out for non-standard Huffman tables. 
Related to ticket #3823.
 2015-07-09 20:03:38 +02:00
Carl Eugen Hoyos
ad7c5cba4e lavf/rtpenc_jpeg: Do not check the table number when checking precision. 2015-07-09 20:00:31 +02:00
Carl Eugen Hoyos
6253f511e0 Cosmetics: Reindent after last commit. 2015-07-09 19:52:06 +02:00
Carl Eugen Hoyos
da46370e94 lavf/matroskaenc: Do not needlessly allocate memory for cuepoints. 
Fixes ticket #4690.
 2015-07-09 19:49:37 +02:00
Michael Niedermayer
b457da4ce2 Merge commit '0e7c0ec344f542e68e3cc9680e8d41dffeffdb4e' 
* commit '0e7c0ec344f542e68e3cc9680e8d41dffeffdb4e':
  lavf/hevc: pad the RBSP buffer as required by the bistream reader

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-09 03:54:31 +02:00