RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
72,068 Commits 36 Branches 392 Tags 310 MiB
Commit Graph

17441 Commits

Author SHA1 Message Date
Marton Balint 93cc5ca7ed lavf/img2dec: add option to disable pattern matching 
Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-12 13:32:23 +02:00
Michael Niedermayer 2ce2462ba8 Merge commit 'da5c6a97bbfe34d4b30a89e72150dd400299ddce' 
* commit 'da5c6a97bbfe34d4b30a89e72150dd400299ddce':
  riff: Add MultiScope II fourcc MSC2 as MJPEG

See: e31cdb5cc8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-12 12:17:59 +02:00
Michael Niedermayer 59db9e6949 avformat/internal: Fix warning about struct declaration 
Moving ffio_open2_wrapper() to internal as it uses AVFormatContext

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-12 03:24:19 +02:00
Carl Eugen Hoyos da5c6a97bb riff: Add MultiScope II fourcc MSC2 as MJPEG 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-05-12 03:22:18 +02:00
Michael Niedermayer 62a1e0035a avformat/mlvdec: Use AVFormatContext->open_cb() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-11 22:53:12 +02:00
Michael Niedermayer a228f7d5e5 avformat/avformat: slightly more verbose documentation for open_cb() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-11 22:33:48 +02:00
Michael Niedermayer 77ccc9145a avformat/mov: Use open_cb() if set 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-11 21:56:53 +02:00
Michael Niedermayer 541d75f9a0 avformat: add callback for opening further files 
Previous version reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-11 21:55:18 +02:00
Andreas Cadhalpun 0382c94f13 id3v2: catch avio_read errors in check_tag 
Since len is an unsigned int, the comparison is currently treated as
unsigned and thus ignores all errors from avio_read.

Thus cast len to int, which is unproblematic, because at that point len
is between 0 and 4.

This fixes 'Conditional jump or move depends on uninitialised value'
valgrind warnings in is_tag.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-11 20:21:48 +02:00
Michael Niedermayer 2b97cc2e5b avformat/mov: Pass MovContext into mov_open_dref() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-11 18:12:24 +02:00
Michael Niedermayer ab6dc86343 avformat/vorbiscomment: Use 64bit int for ff_vorbiscomment_length() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-11 15:56:16 +02:00
Michael Niedermayer 66f26b3e8e avformat/matroskaenc: Check ff_vorbiscomment_length in put_flac_codecpriv() 
Its currently guaranteed to be smaller but its safer to check anyway

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-11 15:56:16 +02:00
Michael Niedermayer 0db5b2b9f8 avformat/oggenc: Check ff_vorbiscomment_length in ogg_write_vorbiscomment() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-11 15:56:16 +02:00
Michael Niedermayer 40a7700b82 avformat/flacenc: Check length in flac_write_block_comment() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-11 15:31:55 +02:00
Michael Niedermayer eca38864a6 avformat/vorbiscomment: Check entry length in ff_vorbiscomment_write() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-11 15:23:51 +02:00
Michael Niedermayer a633928d47 avformat/subtitles: Use size_t for len 
string length could theoretically be larger than int

Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-11 12:42:38 +02:00
Michael Niedermayer 17b26308a2 avformat/matroskadec: Use size_t for the variable holding a strlen() value. 
Should make no difference but is more correct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-11 04:05:20 +02:00
Michael Niedermayer 95efc65129 avformat/url: Use size_t for len from strlen() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-11 03:50:01 +02:00
Michael Niedermayer 28b7d7a36d Merge commit 'b8d2630c5327d2818d05c8a48be0417905d8e0fd' 
* commit 'b8d2630c5327d2818d05c8a48be0417905d8e0fd':
  dashenc: Reduce the segment duration if cutting out parts with edit lists

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-11 01:56:11 +02:00
James Almer 32a4177a62 dashenc: replace attribute id with contentType for the AdaptationSet element 
id should be an integer, not a string. It is also optional, so use
contentType instead which is the proper attribute for these values.

This addresses ticket #4545, fixing an MPD validation error.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-11 01:37:39 +02:00
Michael Niedermayer 1cf81a2c50 Merge commit '379e5603f4131e677ecf5ba79973dcd5603f28ea' 
* commit '379e5603f4131e677ecf5ba79973dcd5603f28ea':
  id3v2: Do not export empty APIC description

Conflicts:
	libavformat/id3v2.c

See: b697b297b7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-10 22:51:38 +02:00
Michael Niedermayer 55231323b0 Merge commit '254f3daba4271c1918d9a7ad155b1442ef93ed29' 
* commit '254f3daba4271c1918d9a7ad155b1442ef93ed29':
  nut: Make sure to clean up on read_header failure

Conflicts:
	libavformat/nutdec.c

See: 361702660d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-10 22:31:39 +02:00
Michael Niedermayer 73b8155b31 Merge commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81' 
* commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81':
  avi: Validate sample_size

Conflicts:
	libavformat/avidec.c

See: ca234639ac
See: c7369f3a4b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-10 22:20:37 +02:00
Michael Niedermayer 8b0ceb96da Merge commit 'b34257eefd98cb768ea2f53a390b8684d51e689a' 
* commit 'b34257eefd98cb768ea2f53a390b8684d51e689a':
  nut: Check chapter creation in decode_info_header

Conflicts:
	libavformat/nutdec.c

See: 3ff1af2b0d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-10 22:09:48 +02:00
Martin Storsjö b8d2630c53 dashenc: Reduce the segment duration if cutting out parts with edit lists 
This makes sure that the time + duration of the first segment
matches the start time of the next segment for e.g. AAC audio
with encoder delay.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-05-10 22:57:21 +03:00
James Almer ac1a1cb948 dashenc: replace attribute id with contentType for the AdaptationSet element 
id should be an integer, not a string. It is also optional, so use
contentType instead which is the proper attribute for these values.

This fixes an MPD validation error.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-05-10 22:57:20 +03:00
Michael Niedermayer 004564c930 avformat/wavenc: Check umid length 
Fixes potential out of array read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-10 20:03:36 +02:00
Michael Niedermayer ecb4ae7879 avformat/wavenc: fix string length variable types 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-10 19:52:30 +02:00
Michael Niedermayer d66b623ad0 avformat/nutenc: Fix writing strings larger than 2gb 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-10 16:26:58 +02:00
Michael Niedermayer a649f36f75 avformat/http: Mark lower_proto as const in http_listen() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-10 15:01:36 +02:00
Michael Niedermayer 3d65570f25 avformat/mxf: Always evaluate PRINT_KEY() arguments at compile time 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-10 14:39:27 +02:00
Michael Niedermayer 8b42b22222 avformat/mxf: Simplify PRINT_KEY() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-10 14:39:26 +02:00
Reimar Döffinger 5af621278d avformat_alloc_context: initialize raw_packet_buffer_remaining_size. 
This currently works for most users because
avformat_open_input sets it, but this patch fixes any
applications not using that function.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2015-05-10 08:47:53 +02:00
wm4 379e5603f4 id3v2: Do not export empty APIC description 
APIC tags always have a description. Tag writers obviously leave it
empty if there is no description. In this case, libavformat would export
"" as title. Do not set the title instead.
 2015-05-09 15:55:50 +02:00
Luca Barbato 254f3daba4 nut: Make sure to clean up on read_header failure 
Based on Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> work.

CC: libav-stable@libav.org
 2015-05-09 15:55:50 +02:00
Andreas Cadhalpun 4d0ee4962b avi: Validate sample_size 
And either error out or set it to 0 if it is negative.

CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-05-09 15:51:31 +02:00
Andreas Cadhalpun b34257eefd nut: Check chapter creation in decode_info_header 
This fixes a segmentation fault when accessing the metadata.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

CC: libav-stable@libav.org
 2015-05-08 11:10:51 +02:00
wm4 b697b297b7 id3v2: do not export APIC description if empty 
APIC tags always have a description. Tag writers obviously leave it
empty if there is no description. In this case, libavformat would export
"" as title. Do not set the title instead.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-08 01:07:13 +02:00
Carl Eugen Hoyos 2279de6eca lavf/img2dec: Autodetect qdraw images. 2015-05-07 01:21:08 +02:00
Michael Niedermayer 3e14ed05f1 avformat/internal: always check arguments of hex_dump_debug() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-07 01:05:45 +02:00
Michael Niedermayer 374cf93548 avformat/asfdec: do not define print_guid() to nothing 
This avoid potential warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-07 00:54:06 +02:00
Michael Niedermayer 0318013afc Merge commit '6c8c7c246280cdcd23e4d99006b95245ae837278' 
* commit '6c8c7c246280cdcd23e4d99006b95245ae837278':
  dump: Print AVAudioServiceType side data

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-06 22:29:19 +02:00
Michael Niedermayer ffed987a4d Merge commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d' 
* commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d':
  lavf: Open PICT images with Quickdraw

Conflicts:
	tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-06 21:05:16 +02:00
Michael Niedermayer e0010bb91f mux: Do not leave stale side data pointers in ff_interleave_add_packet() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-05-06 15:01:35 +01:00
Vittorio Giovara 6c8c7c2462 dump: Print AVAudioServiceType side data 2015-05-06 14:57:46 +01:00
Vittorio Giovara 7b734ee55d lavf: Open PICT images with Quickdraw 
Update the pictor test to use the pictor codec, as both formats share
the .pic file extension.
 2015-05-06 14:27:34 +01:00
Carl Eugen Hoyos e31cdb5cc8 lavf/riff: Add MultiScope II fourcc MSC2 as MJPEG. 2015-05-05 23:52:38 +02:00
Michael Niedermayer 9d4fdfe24c avformat/matroskaenc: Use avoid_negative_ts_use_pts if no stream writes dts 
This reduces the number of cases where timestamps need to be shifted

Fixes Ticket4487

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-05 13:17:25 +02:00
Michael Niedermayer 7ac5c38ec5 avformat/mux: Add avoid_negative_ts_use_pts 
This allows using pts instead of dts for negative TS avoidance

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-05 12:44:20 +02:00
Michael Niedermayer c7369f3a4b avformat/avidec: print a warning for negative sample_size 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-05 00:04:38 +02:00