virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
70,774 Commits 37 Branches 400 Tags 460 MiB
13f8bbfb70
Commit Graph

17136 Commits

Author SHA1 Message Date
Michael Niedermayer
13f8bbfb70 avformat/mov: fix mis-detection of jpeg2000 
Fixes demuxer choice for Ticket 2792

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-17 19:05:44 +01:00
Andreas Cadhalpun
39ddda12f1 mxfenc: fix memleaks in mxf_write_footer 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Reviewed-by: tomas.hardin@codemill.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-17 15:05:41 +01:00
Michael Niedermayer
ae65cc7ed3 Merge commit '2cb9c2fc59c9267ad2631c07c81c188058502259' 
* commit '2cb9c2fc59c9267ad2631c07c81c188058502259':
  movenc: Allow interleaving samples when writing fragmented files

Conflicts:
	libavformat/movenc.c
	libavformat/movenc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 23:30:13 +01:00
Michael Niedermayer
b425b81fd2 avformat/rtsp: Fix potential pointer overflow in sdp_probe() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 22:40:36 +01:00
Michael Niedermayer
1b3b018aa4 avformat/mpegts: Fix potential pointer overflows 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 22:37:46 +01:00
Michael Niedermayer
312eb0d66f Merge commit '50ff0c05b691524d1fd044a2f2eefb706932fc98' 
* commit '50ff0c05b691524d1fd044a2f2eefb706932fc98':
  movenc: Support writing multiple trun atoms

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 21:53:02 +01:00
zhaoxiu.zeng
332776f6c5 avformat/cavsvideodec: use avpriv_find_start_code in cavsvideo_probe() 
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 15:40:10 +01:00
Micah Galizia
fca0851879 avformat/hls: refactor repeated HLS option updates 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 13:01:39 +01:00
Martin Storsjö
2cb9c2fc59 movenc: Allow interleaving samples when writing fragmented files 
This is incompatible with the omit_tfhd_offset flag (writing
position independent fragments with interleaving requires the
default_base_moof flag).

This makes the moof atoms slightly bigger, but can be better for
playback (improving locality of sample data in the mdat).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-03-16 13:23:19 +02:00
Martin Storsjö
50ff0c05b6 movenc: Support writing multiple trun atoms 
This is needed if all the data for one track isn't continuous
within the mdat. Normally we make sure all the data for one
track is continuous, but in new cases we will need to have
the samples interleaved.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-03-16 13:23:19 +02:00
Michael Niedermayer
1e4d0498df avformat/mov: Disallow ".." in dref unless use_absolute_path is set 
as this kind of allows to circumvent it to some extend.
We also could add a separate parameter or value to choose this

Found-by: ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 03:47:56 +01:00
Mark Reid
e575589378 libavformat/mxfdec: fix MXFPackage->comment_refs memory leak 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 03:37:44 +01:00
Micah Galizia
7859618aff avformat/hls: store cookies returned in HLS key response 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 01:57:01 +01:00
Michael Niedermayer
4f3f5ee1ac Merge commit '66028b7ba6b411ba12ef553e9c8f1f4a4fe27710' 
* commit '66028b7ba6b411ba12ef553e9c8f1f4a4fe27710':
  udp: Use AVOptions

Conflicts:
	libavformat/udp.c

See: aefed6ca87
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 00:10:09 +01:00
Luca Barbato
66a0ac0a80 mkv: Add support for DVB subtitles 
Bug-Id: 833
 2015-03-15 23:49:17 +01:00
Michael Niedermayer
54db7df34b Merge commit 'a4c5801070198c1f2af32fa5cf850c330615ac24' 
* commit 'a4c5801070198c1f2af32fa5cf850c330615ac24':
  sctp: Update to match tcp

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-15 22:43:10 +01:00
Luca Barbato
66028b7ba6 udp: Use AVOptions 
Add AVOptions for options currently available as url parameters.
 2015-03-15 18:29:11 +01:00
Luca Barbato
a4c5801070 sctp: Update to match tcp 
Use AVOption and fallback over multiple addresses
 2015-03-15 18:29:11 +01:00
Mark Reid
8d54850f33 libavformat/mxfenc: write user comment metadata 
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-15 17:17:38 +01:00
Michael Niedermayer
2cda1a16d0 avformat/dvbsub: Fix hypothetical pointer overflow in dvbsub_probe() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-15 13:45:31 +01:00
Michael Niedermayer
32c4b504b4 avformat/mpegvideodec: fix hypothetical pointer overflow in mpegvideo_probe() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-15 13:39:56 +01:00
zhaoxiu.zeng
84d8b4fb81 avformat/mpegvideodec: use avpriv_find_start_code in mpegvideo_probe() 
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-15 13:28:44 +01:00
zhaoxiu.zeng
213ddcb029 avformat/avidec: cleanup include 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-15 13:03:26 +01:00
zhaoxiu.zeng
bf696e265a avformat/avidec: use avpriv_find_start_code in avi_read_packet() 
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-15 13:02:57 +01:00
Mark Reid
43cafb956e libavformat/mxfdec: export user comments metadata 
Previous-revision-reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-14 22:46:18 +01:00
Michael Niedermayer
8003816e16 avformat/mov: Check for string truncation in mov_open_dref() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-14 21:57:04 +01:00
Michael Niedermayer
21a53dd08d avformat/mov: Use sizeof(filename) instead of a literal number 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-14 21:56:46 +01:00
Michael Niedermayer
e1f37c48e5 Merge commit '247e370e2a913db52ca079b347a174c8d393b171' 
* commit '247e370e2a913db52ca079b347a174c8d393b171':
  TDSC decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/version.h
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-13 23:23:01 +01:00
Vittorio Giovara
247e370e2a TDSC decoder 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-03-13 19:48:14 +00:00
Zhang Rui
3f375950f3 avformat/http: support auto reconnect 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-13 19:07:28 +01:00
Michael Niedermayer
3727cd5416 avformat/flvdec: add support for OnCaption 2015-03-13 16:25:27 +01:00
Michael Niedermayer
1df64d6c46 avformat/flvdec: re enable flv_data_packet() 
Found-by: kurosu
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-13 16:24:12 +01:00
Michael Niedermayer
7869b2959d avformat/flvdec: Change subtitle stream type to subtitle type 
Previous-version-reviewed-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-13 16:03:28 +01:00
Carl Eugen Hoyos
2e0b5f5c90 lavf: Do not list mov-only codecs in riff.c. 
Instead check for all mov code-points when demuxing avi
and print a warning if a video codec is found like this.
Fixes a regression similar to the one described in ticket #4307.
 2015-03-13 08:49:03 +01:00
Michael Niedermayer
b0112019f9 Merge commit '6bdae41d3ef74a0865e8f87896e649f93b2f39bd' 
* commit '6bdae41d3ef74a0865e8f87896e649f93b2f39bd':
  matroskadec: Check memory allocations

Conflicts:
	libavformat/matroskadec.c

See: 3e2a5b33f0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-12 23:51:44 +01:00
Vittorio Giovara
6bdae41d3e matroskadec: Check memory allocations 
CC: libav-stable@libav.org
 2015-03-12 17:48:14 +00:00
Vittorio Giovara
5a2645cafe nutdec: Prevent leaks on memory error 
Bug-Id: CID 205122 / CID 205123
 2015-03-12 15:29:59 +00:00
Michael Niedermayer
22af79a9c8 Merge commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda' 
* commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda':
  lavf: Explicitly convert types at function pointer assignment

Conflicts:
	libavformat/avio.c
	libavformat/aviobuf.c
	libavformat/swfenc.c

See: a76a2ffe9d and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-12 12:38:20 +01:00
Diego Biurrun
b97f427fb5 lavf: Explicitly convert types at function pointer assignment 
This fixes a number of "assignment from incompatible pointer type" warnings.
 2015-03-11 23:53:13 +01:00
Michael Niedermayer
693b8f11d7 Merge commit 'bacc92b59bfa5d6a1f631e63e46fc1d2fb934e51' 
* commit 'bacc92b59bfa5d6a1f631e63e46fc1d2fb934e51':
  rtpdec_vp9: Drop extra sanity check for size of input packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-11 20:28:45 +01:00
Andreas Cadhalpun
72211a2af0 asfenc: fix leaking asf->index_ptr on error 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-03-11 20:24:59 +01:00
Michael Niedermayer
2d37c57f3e Merge commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8' 
* commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8':
  mp3: Properly use AVCodecContext API

Conflicts:
	libavformat/mp3dec.c

See: 6ad42b3e15
See: b851bc20c6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-11 20:21:16 +01:00
Michael Niedermayer
e48ff13ba7 Merge commit '9272c965d9559a90ee64d46aebd99c117e07f7a3' 
* commit '9272c965d9559a90ee64d46aebd99c117e07f7a3':
  matroskaenc: Fix type used for chapter timestamps

Conflicts:
	libavformat/matroskaenc.c

See: a4cd057bc7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-11 20:09:18 +01:00
Vittorio Giovara
bacc92b59b rtpdec_vp9: Drop extra sanity check for size of input packet 
In this case len is always at least 1, since it is checked against
RTP_VP9_DESC_REQUIRED_SIZE + 1 and then it is reduced by
RTP_VP9_DESC_REQUIRED_SIZE before entering the has_pic_id check.

Bug-Id: CID 1270811
 2015-03-11 18:01:25 +00:00
Vittorio Giovara
fe99c52fa9 mp3: Properly use AVCodecContext API 
Rather than having an unitialized context on the stack, allocate it with
defaults and free it when unneeded.

CC: libav-stable@libav.org
 2015-03-11 17:57:56 +00:00
Vittorio Giovara
9272c965d9 matroskaenc: Fix type used for chapter timestamps 2015-03-11 17:56:51 +00:00
Florian Jacob
c5c4ca6bc8 lavf/libssh: support reading config from ~/.ssh/config 
libssh provides a function for parsing ~/.ssh/config for ssh connection parameters like user, hostname, identity file
and port. This patch makes ffmpeg use this function to take parameters from the config file for everything that's not
explicitely set in the url. It also supports host aliases, i.e. using a shorthand in the url and replacing it with the
hostname / IP address specified for the shorthand in the config file.

Signed-off-by: Florian Jacob <projects+ffmpeg@florianjacob.de>
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2015-03-11 01:34:37 +01:00
Michael Niedermayer
f8f324cc16 Merge commit '448c8cfe4c53e9e806effd8505b46d57fa707061' 
* commit '448c8cfe4c53e9e806effd8505b46d57fa707061':
  movenc: Support setting fragment_index before the moov atom is written

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-10 11:42:44 +01:00
Michael Niedermayer
8d026861f5 Merge commit '0c5e380c2c266d2e8a13c000cc527529db837f10' 
* commit '0c5e380c2c266d2e8a13c000cc527529db837f10':
  movenc: Don't rely on the fragment index for vc1 info gathering

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-10 11:28:24 +01:00
Michael Niedermayer
ebdae73125 Merge commit 'cf402d6fa88acd647cdff993429583bec8a34fdc' 
* commit 'cf402d6fa88acd647cdff993429583bec8a34fdc':
  rtpenc_mpegts: Set chain->rtp_ctx only after avformat_write_header succeeded

Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-10 11:17:37 +01:00