generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
78,945 Commits 24 Branches 241 Tags
Commit Graph

18798 Commits

Author SHA1 Message Date
Michael Niedermayer
07c7e71d20 avformat/avienc: Split avi_write_packet_internal() out 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-18 14:40:06 +01:00
Michael Niedermayer
090b673aba avformat: add ff_reshuffle_raw_rgb() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-18 14:40:06 +01:00
Johan Ström
6c31c99289 hlsenc: add use_localtime_mkdir option to automatically create time-based directory 
Use with -use_localtime, and set -hls_segment_filename to a path which
contains a subdirectory i.e. /some/path/%Y%m%d/%Y%m%dT%H%M%S-%s.ts
This will mkdir the %Y%m%d-part of the path if it does not already
exist.
In addition, each filename in the playlist output will be prefixed with
this subdirectory (if playlist and segment shares the same base path).

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-17 16:17:58 +01:00
Michael Niedermayer
58f21b6c93 avformat/hls: fix potential integer overflow 
This is not a regression

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-16 21:46:00 +01:00
Derek Buitenhuis
00bd237499 mov: Fix leftover merge conflict cruft 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-16 20:09:56 +00:00
Derek Buitenhuis
4e3185d208 Merge commit '5eb562831b3a9bea8026c413ef1338e06450d005' 
This commit is a no-op.

* commit '5eb562831b3a9bea8026c413ef1338e06450d005':
  mov: Use the correct type for size

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-16 20:07:08 +00:00
Derek Buitenhuis
0479cf8530 Merge commit 'e579d8b29cdb9b42c50a0fde277dfb047c1466ad' 
* commit 'e579d8b29cdb9b42c50a0fde277dfb047c1466ad':
  lavf: Dump the cpb side data information

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-16 19:51:02 +00:00
Vittorio Giovara
b92962436b mov: Fix the format specifier type for size 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2016-02-16 18:25:47 +01:00
Derek Buitenhuis
56475e885b Merge commit 'e80307140f736f593ee643affa015333d7c5e27f' 
* commit 'e80307140f736f593ee643affa015333d7c5e27f':
  yuv4mpegenc: Use AV_CEIL_RSHIFT where needed

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-16 16:57:32 +00:00
Derek Buitenhuis
d0fc5de3a6 Merge commit '81306fd4bdeb5c17d4db771e4fec684773b5790f' 
* commit '81306fd4bdeb5c17d4db771e4fec684773b5790f':
  hls: eliminate ffurl_* usage

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-16 16:27:14 +00:00
Michael Niedermayer
b4018544fb avformat/img2enc: remove unused variable 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-14 21:30:53 +01:00
Michael Niedermayer
dcb6d5b831 avformat/genh: Mark coef_splitted as av_unused 
This avoid "libavformat/genh.c:43:14: warning: variable coef_splitted set but not used"
Fewer warnings makes it easier to see new and important warnings

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-14 21:05:50 +01:00
Mark Reid
8395b6eeaa libavcodec/dnxhd_parser: add parser and probe support raw 444 and dnxhr formats 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-14 19:17:36 +01:00
David Monro
4b750104ea lavf/spdifenc: Support MLP encapsulation. 
Fixes bug 821.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2016-02-14 18:02:22 +01:00
Alex Agranovsky
ddda2cc43c lavf/mpjpeg: do not include CRLF preceding boundary as part of the returned frame 
Signed-off-by: Alex Agranovsky <alex@sighthound.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-14 13:48:33 +01:00
Alex Agranovsky
09b8e97ab6 lavf/mpjpeg: Trim quotes on MIME boundary, if present. 
Fixes 5023

Signed-off-by: Alex Agranovsky <alex@sighthound.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-14 12:31:08 +01:00
Luca Barbato
5eb562831b mov: Use the correct type for size 
An AVIO offset is int64_t.

Bug-Id: 921
 2016-02-14 11:44:38 +01:00
Marton Balint
a573e6c103 avformat/utils: remove ff_iso8601_to_unix_time 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-14 01:51:14 +01:00
Marton Balint
66e85a180a avformat/matroskaenc: use ff_parse_creation_time_metadata 
Also increase precision to microsecs, and avoid writing creation_time as a
simple tag metadata item.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-14 01:51:14 +01:00
Marton Balint
ad17cc9744 avformat/mxfenc: use ff_parse_creation_time_metadata 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-14 01:51:14 +01:00
Marton Balint
5f64f3d8cf avformat/movenc: use ff_parse_creation_time_metadata 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-14 01:51:14 +01:00
Marton Balint
5c20bc8f47 avformat/gxfenc: use ff_parse_creation_time_metadata 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-14 01:51:14 +01:00
Marton Balint
83b01ed212 avformat/ffmenc: use ff_parse_creation_time_metadata 
FYI this muxer bails out on parse error and not just warn the user.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-14 01:51:14 +01:00
Marton Balint
bf0607b6db avformat/dvenc: use ff_parse_creation_time_metadata 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-14 01:51:14 +01:00
Marton Balint
ea1bf08a4c avformat/asfenc: use ff_parse_creation_time_metadata 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-14 01:51:14 +01:00
Marton Balint
e942454daf avformat/utils: add ff_parse_creation_time_metadata 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-14 01:51:14 +01:00
Marton Balint
35890aaa65 avformat/img2enc: disable atomic file creation by default 
Currently it is broken when explicitly using the file protocol, it uses an
insecure temporary file name, and in commit b4431c80 disabling the option by
default was already considered. Also it is not very consistent to have such an
option for one particular muxer.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-14 01:34:16 +01:00
Marton Balint
0250fc2146 avformat/img2enc: return error if image rename fails 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-14 01:34:16 +01:00
Luca Barbato
e579d8b29c lavf: Dump the cpb side data information 2016-02-13 14:03:52 +01:00
Michael Niedermayer
a73b23e3df avformat/hlsenc: Fix filename and options 
Regression since bc9a5965c815cf7fd998d8ce14a18b8e861dd9ce

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-10 19:14:53 +01:00
Rostislav Pehlivanov
135460383e avformat: add vc2 as an allowed rawenc Dirac extension 
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2016-02-10 17:15:59 +00:00
Michael Niedermayer
21b459e4bb avformat/segment: Fix header_filename handling 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-10 17:59:58 +01:00
Derek Buitenhuis
bc9a5965c8 Merge commit '9f61abc8111c7c43f49ca012e957a108b9cc7610' 
This also deprecates our old duplicated callbacks.

* commit '9f61abc8111c7c43f49ca012e957a108b9cc7610':
  lavf: allow custom IO for all files

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-10 14:42:41 +00:00
Michael Niedermayer
331a33d74a nut: Add PAL8 support 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-09 19:19:43 +01:00
Thierry Foucu
020b75806f lavf/mov: Extend extracting XMP in mov files using UUID Box 
The UUID is based on http://www.adobe.com/devnet/xmp.html

The patch is made according to XMP SPECIFICATION PART 3 - STORAGE IN
FILES See Table 8

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-09 01:31:15 +01:00
Andreas Cadhalpun
2e6ba1993e asfdec: make sure packet_size is non-zero before seeking 
This fixes infinite loops due to seeking back.

Signed-off-by: Alexandra Hájková <alexandra@khirnov.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2016-02-07 03:12:33 +01:00
Andreas Cadhalpun
bf50607ab7 asfdec: check for too small size in asf_read_unknown 
This fixes infinite loops due to seeking back.

Signed-off-by: Alexandra Hájková <alexandra@khirnov.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2016-02-07 03:12:33 +01:00
Andreas Cadhalpun
e4d1621c6e asfdec: check avio_skip in asf_read_simple_index 
The loop can be very long, even though the file is very short.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Alexandra Hájková <alexandra@khirnov.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2016-02-07 03:12:33 +01:00
Andreas Cadhalpun
a32dbf2aed asfdec: break if EOF is reached after asf_read_packet_header 
asf_read_payload can unset eof_reached, so check it also before calling
that function.

This fixes infinite loops.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Alexandra Hájková <alexandra@khirnov.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2016-02-07 03:12:33 +01:00
Michael Niedermayer
2272ab0e84 avformat/mp3enc: Assert that the header we assembled is valid 
Silences: CID1351343

The header is calculated by the code above the changed hunk, it is
thus asserted that the header is always correct.

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-07 01:12:48 +01:00
Marton Balint
6d14e32555 lavf/asfenc: add support for setting packet size 
This can provide a manual workaround for ticket #4230.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-05 21:32:14 +01:00
Marton Balint
22bbd6e8b7 lavf/asfenc: add support for storing creation time 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-05 21:32:14 +01:00
Marton Balint
79e4293613 lavf/asfenc: add support for storing languages 
Checked compatiblity with VLC, Windows Media Player 12 and Windows Media ASF
Viewer 9 series.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-05 21:32:14 +01:00
Marton Balint
0464767301 lavf/asfenc: check the number of streams in header 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-05 21:32:14 +01:00
Marton Balint
7e6b788f7c lavf/asfenc: add AVClass to context 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-05 21:32:14 +01:00
Eran Kornblau
1bbfaba196 avformat/mov: dont print frma warning when format is the same 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-05 01:11:04 +01:00
Carl Eugen Hoyos
a36c737490 lavf/isom: Add more code points for H264. 
Defined by the MP4 registration authority.
Fixes ticket #5217.
 2016-02-04 17:40:06 +01:00
Schenk, Michael
93f4b41208 avformat/http: add crypto to default whitlist to get encrypted HLS working again 
I think we missed the crypto in the default_whitelist in case of http. Otherwise encrypted HLS will fail with

[hls,applehttp @ 0x2af39c00] playlist[0] open_input [http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans_aes-audio=65000-video=236000-14.ts], start_seq_no [1], cur_seq_no [14]

[hls,applehttp @ 0x2af39c00]    open_input curseqno [14] startseqno [1]

[hls,applehttp @ 0x2af39c00] HLS request for url 'http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans_aes-audio=65000-video=236000-14.ts', offset 0, playlist 0

[NULL @ 0x2af3a200] KEY_AES_128 seg->key [http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans.key] pls->key_url [http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans.key]

[hls,applehttp @ 0x2af39c00]     open_input [KEY_AES_128]

[hls,applehttp @ 0x2af39c00]      : c->persistence [0]

[hls,applehttp @ 0x2af39c00]      : c->probing     [1]

[hls,applehttp @ 0x2af39c00]      : pls->input     [NULL]

[hls,applehttp @ 0x2af39c00]        using normal http path for URL [crypto+http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans_aes-audio=65000-video=236000-14.ts]

[crypto @ 0x2aff7cc0] Protocol not on whitelist 'http,https,tls,rtp,tcp,udp!

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-03 15:57:43 +01:00
Kevin Mitchell
5120b03d69 avformat: add windows.h to SChannel SSP TLS code 
This fixes building on cygwin
Fixes ticket #5036
 2016-02-02 16:19:25 +01:00
Michael Niedermayer
d117b09021 avformat/tls_securetransport: Add missing include 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-02 16:14:37 +01:00