Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-04-22 02:10:25 +00:00
Code Issues Projects Releases Packages Wiki Activity
69603 commits 39 branches 417 tags 339 MiB
Commit graph

16728 commits

Author SHA1 Message Date
Timothy Gu
510b39c213 nutdec: Remove unused variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-06 20:44:36 +01:00
Timothy Gu
e66a187638 img2dec: Remove dead code 
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-06 20:44:36 +01:00
Paul B Mahol
f968166439 avformat/rpl: check av_get_packet() for failure 
Also make ret signed as it should be from start.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-02-06 16:07:16 +00:00
Paul B Mahol
dc3c3758ce avformat/thp: check av_get_packet() for failure 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-02-06 09:42:53 +00:00
James Almer
15a88468ae avformat/tta: only check for header and seek table crc if requested 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-02-05 23:20:40 -03:00
Carl Eugen Hoyos
afada9ac67 Fix compilation with --disable-protocol=udp 2015-02-05 10:07:03 +01:00
Michael Niedermayer
f2579dbb4b avformat/thp: Check av_get_packet() for failure not only for partial output 
Fixes null pointer dereference
Fixes: signal_sigsegv_db2c1f_3108_cov_163322880_pikmin2_opening1_partial.thp

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-05 04:14:42 +01:00
Lukasz Marek
21051af218 lavf/avc: add buffer padding to extradata allocation 
ff_avc_write_annexb_extradata() allocates extradata, but don't add
FF_INPUT_BUFFER_PADDING_SIZE value

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2015-02-05 03:27:55 +01:00
Michael Niedermayer
05e1619529 avformat/mpc8: Use uint64_t in *_get_v() to avoid undefined behavior 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-04 14:55:42 +01:00
Paul B Mahol
469a170135 avformat/siff: fix if_( style 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-02-04 13:10:53 +00:00
Stefano Sabatini
fd242b468d lavf/utils: fix if_( style 2015-02-04 13:17:30 +01:00
wm4
b737a2c528 avformat/mpc8: fix broken pointer math 
This could overflow and crash at least on 32 bit systems.

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-04 00:55:47 +01:00
wm4
56cc024220 avformat/mpc8: fix hang with fuzzed file 
This can lead to an endless loop by seeking back a few bytes after each
attempted chunk read. Assuming negative sizes are always invalid, this
is easy to fix. Other code in this demuxer treats negative sizes as
invalid as well.

Fixes ticket #4262.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-04 00:39:56 +01:00
Michael Niedermayer
d304cb49eb Merge commit '898276c16b' 
* commit '898276c16b':
  r3d: Fix pos type

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-04 00:04:49 +01:00
Michael Niedermayer
bd12634d6b Merge commit 'ec524ed12a' 
* commit 'ec524ed12a':
  tta: Fix framepos and start_offset types

Conflicts:
	libavformat/tta.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-03 23:49:14 +01:00
Michael Niedermayer
e005dc621a avformat: fix mode of img2dec.c and utils.c 
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-03 22:27:23 +01:00
Michael Niedermayer
a83e0639c0 Merge commit 'e3528d2a7b' 
* commit 'e3528d2a7b':
  mov: Implement parsing of the "HandlerName" from the MP4 HDLR atom

Conflicts:
	libavformat/mov.c

See: b76bc01034
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-03 22:19:46 +01:00
Michael Niedermayer
deeba777ad Merge commit '27b99d929f' 
* commit '27b99d929f':
  siff: Return more meaningful error values

Conflicts:
	libavformat/siff.c

See: 29c3ebf56e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-03 22:05:00 +01:00
Michael Niedermayer
46a16ca15a Merge commit '75439bb31b' 
* commit '75439bb31b':
  siff: K&R formatting cosmetics

Conflicts:
	libavformat/siff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-03 21:53:29 +01:00
Liviu Oniciuc
b37858eae1 avformat/img2dec: remove the non-negative number requirement for start_number option 
industrial cameras usually mark the trigger frame as frame number 0
all frames saved before trigger frame receive a negative sequence number

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-03 18:57:23 +01:00
Luca Barbato
898276c16b r3d: Fix pos type 
avio_tell can return a negative number.

Bug-Id: CID 1265715
CC: libav-stable@libav.org
 2015-02-03 15:23:22 +00:00
Vittorio Giovara
ec524ed12a tta: Fix framepos and start_offset types 
Also propagate errors.

CC: libav-stable@libav.org
Bug-Id: CID 1238812
 2015-02-03 15:23:21 +00:00
Carl Eugen Hoyos
67e9f3907d isom: Decode Prores 4444 XQ with the existing Prores decoder 
The frames seem to contain a higher bitrate which our decoder is
able to handle.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-02-03 15:23:21 +00:00
Hendrik Leppkes
e3528d2a7b mov: Implement parsing of the "HandlerName" from the MP4 HDLR atom 
This atom typically is used for a track title. The handler name is stored
as a Pascal string in the QT specs (first byte is the length of the string),
so do not export it.

A second length check based on the first character is added to avoid
overwriting an already specified handler_name (it happens with YouTube
videos for instance, the handler_name get masked), or specifying an
empty string metadata.

The Pascal string fix and the second length check are written
by Clément Bœsch <clement.boesch@smartjog.com>.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-02-03 15:15:12 +00:00
wm4
6a0cd529a3 avformat/tta: fix crash with corrupted files 
av_add_index_entry() can fail, for example because the parameters are
invalid, or because memory allocation fails. Check this; it can actually
happen with corrupted files.

The second hunk is just for robustness. Just in case functions like
ff_reduce_index() remove entries. (Not sure if this can actually
happen.)

Fixes ticket #4294.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-03 16:02:32 +01:00
Diego Biurrun
27b99d929f siff: Return more meaningful error values 2015-02-03 14:55:40 +00:00
Diego Biurrun
75439bb31b siff: K&R formatting cosmetics 2015-02-03 14:53:44 +00:00
Matt Oliver
22504396fe avformat/mpegtsenc: Fix build with msvc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-03 15:15:50 +01:00
Michael Niedermayer
ed91c8651a avformat/mov: simplify pasp value before setting SAR 
This avoids a 65536:65536 SAR

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-03 14:11:20 +01:00
Michael Niedermayer
7620d48f2e avformat/network: Check for av_malloc* failures in ff_tls_init() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-03 02:21:55 +01:00
Michael Niedermayer
c348a42dcc Revert "avformat/mpegtsenc: Change the service_type field to enum" 
This isnt safe due to AVOption accessing this field as int
i just realized a moment after pushing

This reverts commit 0935453e84.
 2015-02-02 22:30:56 +01:00
Michael Niedermayer
0935453e84 avformat/mpegtsenc: Change the service_type field to enum 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-02 22:15:39 +01:00
dhead666
48e36f8a12 libavformat/mpegtsenc: allow to set service_type in sdt 
This adds an option to set the service type in mpegts as defined in ETSI 300 468.

I added what I believe are the most useful service types as pre defined values,
the others can be sent by using their hexdecimal form directly (e.g. -mpegts_service_type digital_radio, -mpegts_service_type 0x07).

I've been using this patch in order to pipe internet radio stream (originally as HLS/m3u8) from ffmpeg to tvheadend,
when the service type set right tvheadend recognize the mpegts stream as a radio channel.

The patch in its original form was written by linuxstb from freenode's hts channel which allowed me pushing it upstream.

This close issue 4118.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-02 22:02:26 +01:00
Michael Niedermayer
f1f7f5903a avformat/omadec: fix number suffix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-01 20:00:10 +01:00
Michael Niedermayer
465f3705b1 avformat/smacker: Fix number suffix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-01 20:00:10 +01:00
Michael Niedermayer
fc3cdb00d0 avformat/matroskadec: Fix number suffixes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-01 20:00:10 +01:00
Michael Niedermayer
4b15bba2ae avformat/utils: Fix number suffixes in tb_unreliable() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-01 19:19:25 +01:00
Michael Niedermayer
e912f45b81 avformat/oggenc: Simplify by using OFFSET and PARAM 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-01 14:35:15 +01:00
Michael Niedermayer
9bacb576bc Merge commit 'f726fc21ef' 
* commit 'f726fc21ef':
  ogg: Provide an option to offset the serial number

Conflicts:
	libavformat/oggenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-01 13:22:21 +01:00
Luca Barbato
f726fc21ef ogg: Provide an option to offset the serial number 
The ogg serial number doubles as codec id and sequence
value for concatenated samples.
 2015-02-01 02:28:40 +01:00
Zhang Rui
ca2e3e47fc avformat/cache: pass options to the underlying protocol via the url_open2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-31 18:55:46 +01:00
Paul B Mahol
f705b1287b avformat/movenc: remove unneeded #include, there are no assert() only av_assert* 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-31 08:57:07 +00:00
Paul B Mahol
cc1357a173 avformat/mov: remove unneeded #include, there are no assert() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-31 08:57:07 +00:00
Paul B Mahol
41456c7d15 avformat/mux: remove unneeded #include, there are no assert() only av_assert* 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-31 08:57:07 +00:00
Paul B Mahol
12c5addebc avformat/asfenc: remove unneeded #include, there are no assert() only av_assert* 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-31 08:57:07 +00:00
Paul B Mahol
ca8617a04d avformat/mpeg: remove unneeded #include, there are no assert() only av_assert* 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-31 08:57:06 +00:00
Paul B Mahol
43630c82f1 avformat/utils: remove unneeded #include, there are no assert() only av_assert* 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-31 08:57:06 +00:00
Paul B Mahol
80cbf13725 avformat/rtpdec_qdm2: change assert to av_assert0() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-30 15:32:10 +00:00
Paul B Mahol
64815d1f0c avformat/nut: support WavPack 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-30 09:33:49 +00:00
Paul B Mahol
b5004f3213 avformat/nut: add GIF[0] 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-30 08:58:33 +00:00