Carl Eugen Hoyos
da8eb70dc3
lavf/aiffenc: Clarify an error message.
...
Only one audio stream is allowed in aiff.
2015-09-05 10:53:55 +02:00
Arnaud Bienner
0cdba4ac68
lavf/mxfdec: Support more codecs in mxf_picture_essence_container_uls[].
...
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2015-09-05 00:11:14 +02:00
Arnaud Bienner
35ab967f52
lavf/mxf: Support video essence container uls for vc1.
...
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2015-09-05 00:09:13 +02:00
Arnaud Bienner
fd6b38bed7
lavf/riff: Support fourcc AVd1 for dvvideo.
...
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2015-09-05 00:09:06 +02:00
Carl Eugen Hoyos
f7361dbcf4
lavc/mxfdec: Support more mxf files with codec_ul.
...
Fixes decoding for the sample from ticket #4820 .
2015-09-04 23:50:34 +02:00
Michael Niedermayer
9ed53d5a8a
avformat/mov: Change the type of the r/g/b variables
...
Fixes integer overflow
Fixes: unknown_unknown_31b_795_cov_1818643045_raybauduc.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-03 22:17:00 +02:00
Stephan Holljes
280d140cb0
lavf/http: Remove superfluous parenthesis.
...
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-03 20:11:29 +02:00
Stephan Holljes
dd7b486e8e
lavf/http: Fix incorrectly placed parenthesis.
...
The assignment had incorrectly placed parentheses which resulted in ret
always being > 0.
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-03 18:55:49 +02:00
Michael Niedermayer
9f6ca28e32
avformat/concatdec: Check file variable before dereferencing
...
Fixes CID1322328
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-03 18:53:44 +02:00
Michael Niedermayer
fddcd9e570
avformat/file: Fix copy and paste error
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-03 12:42:40 +02:00
Michael Niedermayer
4cad4bd4ca
avformat/hlsenc: Fix memleak of path
...
Fixes: CID1322343
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-03 11:28:29 +02:00
Michael Niedermayer
e3d8504fd0
avformat/hlsenc: Initialize vtt_oc to help static analyzers
...
This is also more robust in case it ever is used
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-03 11:28:29 +02:00
Michael Niedermayer
879603fa3f
avformat/latmenc: Add assert to avoid coverity warning
...
Fixes CID1322323
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-03 11:28:29 +02:00
Michael Niedermayer
bd70303ead
avformat/swfdec: Check return value of init_get_bits8()
...
Fixes: CID1322320
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-03 10:20:29 +02:00
Michael Niedermayer
053e80f6ea
avformat/mov: Fix integer overflow in FFABS
...
Fixes: unknown_unknown_19e_414_cov_764838672_bellhamlam.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-03 09:20:57 +02:00
Michael Niedermayer
d1bdaf3fb2
avformat/dump: Fix integer overflow in aspect ratio calculation
...
Fixes: unknown_unknown_19e_414_cov_764838672_bellhamlam.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-03 02:50:41 +02:00
Marton Balint
26a0cd1b4b
lavf: add V as a video stream specifier which is not an attached picture
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
2015-09-02 21:35:21 +02:00
LiuQi
a4055d3e5d
avformat/hlsenc: add a use_localtime option to expand the segment filename with localtime
...
test examples:
./ffmpeg -re -i ~/Movies/objectC/facebook.mp4 -v verbose -c copy -f hls -hls_segment_filename test-%s.ts -use_localtime 1 -bsf:v h264_mp4toannexb aaa.m3u8
[StevenLiu@localhost ffmpeg]$ cat aaa.m3u8;ll test-*.ts
test-1441052221.ts
test-1441052231.ts
test-1441052235.ts
test-1441052243.ts
test-1441052249.ts
-rw-r--r-- 1 StevenLiu staff 1310736 9 1 04:15 test-1441052131.ts
-rw-r--r-- 1 StevenLiu staff 495192 9 1 04:15 test-1441052141.ts
-rw-r--r-- 1 StevenLiu staff 1310736 9 1 04:17 test-1441052212.ts
-rw-r--r-- 1 StevenLiu staff 1067840 9 1 04:17 test-1441052221.ts
-rw-r--r-- 1 StevenLiu staff 235564 9 1 04:17 test-1441052231.ts
-rw-r--r-- 1 StevenLiu staff 1187220 9 1 04:17 test-1441052235.ts
-rw-r--r-- 1 StevenLiu staff 694848 9 1 04:17 test-1441052243.ts
-rw-r--r-- 1 StevenLiu staff 526588 9 1 04:17 test-1441052249.ts
[StevenLiu@localhost ffmpeg]$
./ffmpeg -re -i ~/Movies/objectC/facebook.mp4 -v verbose -c copy -f hls -hls_segment_filename test-%s.ts -use_localtime 1 -bsf:v h264_mp4toannexb aaa.m3u8
[StevenLiu@localhost ffmpeg]$ cat aaa.m3u8;ll aaa-*.ts
aaa-1441052417.ts
aaa-1441052427.ts
aaa-1441052437.ts
aaa-1441052440.ts
aaa-1441052449.ts
-rw-r--r-- 1 StevenLiu staff 1310736 9 1 04:19 aaa-1441052382.ts
-rw-r--r-- 1 StevenLiu staff 277300 9 1 04:19 aaa-1441052392.ts
-rw-r--r-- 1 StevenLiu staff 1310736 9 1 04:20 aaa-1441052417.ts
-rw-r--r-- 1 StevenLiu staff 1067840 9 1 04:20 aaa-1441052427.ts
-rw-r--r-- 1 StevenLiu staff 235564 9 1 04:20 aaa-1441052437.ts
-rw-r--r-- 1 StevenLiu staff 1187220 9 1 04:20 aaa-1441052440.ts
-rw-r--r-- 1 StevenLiu staff 338776 9 1 04:20 aaa-1441052449.ts
[StevenLiu@localhost ffmpeg]$
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-02 04:31:32 +02:00
Carl Eugen Hoyos
3eae98c1ac
lavf/dv: Do not return EIO for every error (like EOF).
...
Fixes ticket #4818 .
Reviewed-by: Ronald S. Bultje
Reviewed-by: Paul B Mahol
2015-09-02 00:59:10 +02:00
Michael Niedermayer
c7c207aecd
avformat/mxg: Use memmove()
...
Fixes undefined behavior
Fixes: 1700002963a49da13542e0726b7bb758/unknown_unknown_292_658_cov_2141972066_m1.mxg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-01 22:46:23 +02:00
Petri Hintukainen
5d12d7de2c
mpegts: demux BluRay text subtitles
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-01 14:35:32 +02:00
Petri Hintukainen
757cb0f286
mpegts: fix demuxing PES private stream 2
...
PES header size is 6 bytes (00 00 01 bf XX XX), not 0.
BluRay text subtitles use private stream 2.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-01 14:35:32 +02:00
Andrew Stone
dc926ab518
rtmp: support the AMF_DATE tag
...
Instead of returning EINVAL, which can cause a stream to fail to load, this
allows the tag to be passed through to the flv demuxer, where it's summarily
ignored.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-01 13:35:37 +02:00
Carl Eugen Hoyos
670d8ecfae
lavf: Remove probesize32 and max_analyze_duration32 on version bump.
...
Add FF_API_PROBESIZE_32 to allow removing 32bit probesize and 32bit
max_analyze_duration after the next libavformat version bump.
2015-09-01 09:19:49 +02:00
Andreas Cadhalpun
c34363acd2
mux: warn if the encoders bitexact flag is set, but not the muxers
...
Based-on-patch-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-08-30 23:30:09 +02:00
Michael Niedermayer
e2b19a533d
avformat/segment: atomically update list if possible
...
Fixes Ticket4802
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-28 00:09:56 +02:00
Stefano Sabatini
57cd2f7777
lavf/mpegenc: provide better feedback in case of invalid media type
2015-08-27 18:07:43 +02:00
Hendrik Leppkes
f5258a7d16
Merge commit 'e176639bcbf4b580edb462a6b0650e53cd5e3c04'
...
* commit 'e176639bcbf4b580edb462a6b0650e53cd5e3c04':
webm: Explicitly select libvpx, libopus and libvorbis encoders
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-27 09:53:07 +02:00
Michael Niedermayer
81a8701eb5
avformat/oggenc: Check segments_count for headers too
...
Fixes infinite loop and segfault in ogg_buffer_data()
Fixes Ticket4806
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-27 04:28:21 +02:00
Carl Eugen Hoyos
33908f0837
lavf/mov: Support unusual alac files without frma and alac atoms.
...
Fixes ticket #4747 .
2015-08-27 03:29:29 +02:00
Michael Niedermayer
dda6925357
avformat/segment: Do not free the filename twice
...
Bug introduced in 83a508cda5
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-26 03:50:52 +02:00
Timothy Gu
0c6a92a447
matroskaenc: Fix indentation
...
Found-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-25 16:03:49 -07:00
Stephan Holljes
4f860848ab
lavf/http: Fix parsing http request data to not read over '\0'.
...
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
2015-08-25 19:51:13 +02:00
Luca Barbato
e176639bcb
webm: Explicitly select libvpx, libopus and libvorbis encoders
...
And update the preference for the newer codecs now that the libraries
seem stable and widespread enough.
Bug-Id: 695
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-08-25 19:47:43 +02:00
Luca Barbato
2157df425b
hlsenc: Support outputting specific versions
...
Right now only version 2 and version 3 are supported.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-08-25 19:43:58 +02:00
Vesselin Bontchev
4cd1d2314b
avformat/aa: use correct format specifier in sscanf
...
This demuxer was broken on a large number of platforms due to usage of wrong
format specifier in sscanf. This patch fixes the problem, and also adds some
debug logging to reduce future debugging pain.
2015-08-25 12:44:20 +00:00
Carl Eugen Hoyos
83a508cda5
lavf/segment: Fix memleak.
...
Reviewed-by: Stefano Sabatini
Reviewed-by: Ganesh Ajjanagadde
2015-08-25 13:36:24 +02:00
Michael Niedermayer
d65b9114f3
avformat/file: Check for lstat() instead of dirent.h
...
Fixes build on mingw
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-25 13:08:44 +02:00
Carl Eugen Hoyos
91619d195b
lavf/dnxhd: Autodetect more valid files.
2015-08-25 12:07:38 +02:00
Mariusz Szczepańczyk
1f4c62e84e
lavf/file: check for dirent.h support
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-25 02:06:06 +02:00
Lukasz Marek
d39a9b01e2
lavf/file: implement directory listing callbacks
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-25 02:04:34 +02:00
Michael Niedermayer
ee155c18a2
avformat/hevc: Check num_long_term_ref_pics_sps to avoid potentially long loops
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-24 13:04:38 +02:00
Arthur Grant
781efd0741
avformat/hevc: Fix parsing errors
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-24 12:44:34 +02:00
Andreas Cadhalpun
1bf76cd2db
rtpenc_chain: also copy AVFMT_FLAG_BITEXACT to new AVFormatContext
...
Otherwise it is impossible to make '-movflags +rtphint' bitexact after
FF_API_LAVF_BITEXACT has been disabled.
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-08-23 23:35:38 +02:00
Michael Niedermayer
b4d68e7cdb
avformat: Remove use of AVFrac and AVStream->pts
...
Move field to internal part of AVStream and struct to internal.h
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-23 04:16:02 +02:00
Andreas Cadhalpun
c363843a53
add missing FF_API_DESTRUCT_PACKET guards
...
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-08-22 19:16:13 +02:00
Timothy Gu
0aa9bbbc37
version: Fix two more typos
...
Same as cafba99b51
but applied to
lavf and lavu.
2015-08-22 08:09:03 -07:00
Ganesh Ajjanagadde
5edf8b118d
avformat/hls: correct comment for ensure_playlist()
...
Comment was previously slightly incorrect.
Also, it was placed in the wrong location.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-21 14:21:10 +02:00
Vesselin Bontchev
e32a99264b
Add support for Audible AA files
...
https://en.wikipedia.org/wiki/Audible.com#Quality
2015-08-21 04:24:58 +00:00
Ganesh Ajjanagadde
b772847eb0
avformat/webmdashenc: fix uninitialized variable
...
Fixes -Wsometimes-uninitialized from
http://fate.ffmpeg.org/report.cgi?time=20150820031140&slot=arm64-darwin-clang-apple-5.1
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-20 21:03:08 +02:00