generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
76,938 Commits 24 Branches 241 Tags 173 MiB
f62fe535d5
Commit Graph

18395 Commits

Author SHA1 Message Date
Rodger Combs
854972b53d libavformat/tls_securetransport: fix argument evalulation order UB 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-04 23:14:19 +02:00
Ganesh Ajjanagadde
26e8895b73 all: add _DEFAULT_SOURCE locally wherever needed 
Glibc 2.20 onwards generates a deprecation warning for usage of _BSD_SOURCE and _SVID_SOURCE.
The solution from man feature_test_macros is to define both _DEFAULT_SOURCE and the old macros.
This solution is on the lines of the one in commit af1818276e.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2015-10-04 12:15:16 -04:00
Ching Yi, Chan
5d926d5473 avformat/flacdec: support fast-seek 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-04 13:23:42 +02:00
Rodger Combs
a2b8b16300 lavf: add chromaprint muxer 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-04 01:37:31 +02:00
DHE
76e3f8242d libavformat/hlsenc: Use of uninitialized memory unlinking old files 
Fixes ticket#4900

Signed-off-by: DHE <git@dehacked.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-03 23:52:19 +02:00
Carl Eugen Hoyos
32a6d37a6b lavf/mlpdec: Simplify mlp/thd probe function. 
Move the demuxers into their own file.
 2015-10-03 22:40:27 +02:00
Carl Eugen Hoyos
d89820002a lavf/shortendec: Autodetect raw Shorten streams. 
Move the demuxer into its own file.
 2015-10-03 21:48:16 +02:00
John Stebbins
f56a085593 matroskaenc: Don't write a track language tag 
"language" is not an offical matroska tag.
Track languages are specified with the MATROSKA_ID_TRACKLANGUAGE ebml.
Writing the tag overrides the ebml specified language during playback with
libav and some other players.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-10-03 13:44:35 +02:00
Rodger Combs
14221b2dd9 lavf/hls: allow subtitles to be read despite incomplete handling 
This will give incorrect results in some cases due to not parsing segments
separately, so it currently requires -strict experimental.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-03 12:54:44 +02:00
Hendrik Leppkes
4d2160c99a Merge commit '9a3202a98b2e095b54dd784c3e01a09a676fc3fa' 
* commit '9a3202a98b2e095b54dd784c3e01a09a676fc3fa':
  Screenpresso SPV1 decoder

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-10-03 12:22:41 +02:00
Rodger Combs
9825a24e5b lavf/utils: avoid giving up probing early with long subtitle events 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-03 12:10:03 +02:00
Michael Niedermayer
14f6c4356b avformat/flvdec: accept sizes if they are off by 11 
This error was produced by rtmproto.c, it is possibly such streams
where dumped, this commit is needed to support them

Fixes: z0e.flv

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-02 20:18:53 +02:00
Carl Eugen Hoyos
da767f06f5 lavf/rawdec: Autodetect raw TrueHD streams. 2015-10-02 03:15:04 +02:00
Michael Niedermayer
94d50b5d00 avformat/rtmpproto: Fix 2 more cases of the 2nd packet size being wrong 
This should fix RTMP input which was broken by cbbd906be6
the 40 + 11 case is untested as it did not occur in the testcase

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-02 02:16:14 +02:00
Carl Eugen Hoyos
aea5db97f7 lavf/rawdec: Autodetect raw mlp streams. 2015-10-01 19:58:10 +02:00
Luca Barbato
74942685cb hls: Check av_opt_set_dict return value as well 
Bug-Id: CID 1320426
 2015-10-01 13:51:13 +02:00
Clément Bœsch
7218352e02 avformat/srtdec: more lenient first line probing 
Fixes Ticket #4898
 2015-10-01 11:48:45 +02:00
Clément Bœsch
d161a2a72b avformat/srtdec: fix number check for the first character 2015-10-01 11:46:05 +02:00
Vittorio Giovara
9a3202a98b Screenpresso SPV1 decoder 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-09-30 16:45:11 +02:00
Matt Oliver
3b03bde46e avformat/async: Allow compilation with native threads. 2015-09-30 13:41:53 +10:00
Shawn Singh
733475160a libavformat/mov.c: Add parsing for DDTS atom for DTS audio 
The DDTS atom is defined in ETSI TS 102 114, v1.4.1, Annex E.
This is useful for DTS-HD formats, some of which cannot be
decoded by dcadec.c or libdcadec.

Signed-off-by: Shawn Singh <shawnsingh@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-30 05:05:17 +02:00
Carl Eugen Hoyos
98ed0716fb lavf/rawenc: Force one stream for hevc and m4v. 2015-09-29 21:36:18 +02:00
Przemysław Sobala
01dd7e025c lavf/img2dec: Fix memory leak 
Fixes #4886

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-29 19:21:13 +02:00
Hendrik Leppkes
b01891a9f0 Merge commit '948f3c19a8bd069768ca411212aaf8c1ed96b10d' 
* commit '948f3c19a8bd069768ca411212aaf8c1ed96b10d':
  lavc: Make AVPacket.duration int64, and deprecate convergence_duration

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 15:22:52 +02:00
Thierry Foucu
c5e5e63062 riff: Add support for RV40 codec in AVI 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-29 14:33:01 +02:00
wm4
948f3c19a8 lavc: Make AVPacket.duration int64, and deprecate convergence_duration 
Note that convergence_duration had another meaning, one which was in
practice never used. The only real use for it was a 64 bit replacement
for the duration field. It's better just to make duration 64 bits, and
to get rid of it.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-09-29 14:33:00 +02:00
Hendrik Leppkes
4b7685b6c6 Merge commit 'cc8db760616a7ec3bd39b22ca45888c01326db13' 
* commit 'cc8db760616a7ec3bd39b22ca45888c01326db13':
  mpegts: use avcodec_get_type() to set codec_type

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 13:45:23 +02:00
Thierry Foucu
7f72f2d75e libavformat/flvdec.c: free always the packet after a resync. 
In case of resync, always free the packet, but retry only if the resync
did not get to the end of the file. Otherwise, there is a memory leak when the
last packet in the file is corrupted.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-29 04:01:50 +02:00
wm4
cc8db76061 mpegts: use avcodec_get_type() to set codec_type 
Note that this slightly changes behavior: it sets AVMEDIA_TYPE_UNKNOWN
if the codec type is unknown. This should be ok.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-09-28 10:50:50 +02:00
Ganesh Ajjanagadde
db9de9b954 avformat/hls: remove unused function 
Fixes -Wunused-function from
http://fate.ffmpeg.org/report.cgi?time=20150820031140&slot=arm64-darwin-clang-apple-5.1

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
 2015-09-26 18:44:36 +02:00
Paul B Mahol
aff3acc54c avformat/iff: check for possible overflow in 2nd argument of av_new_packet 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-09-25 21:25:08 +02:00
Lucas de Andrade
770dd10504 avformat/hls: Update Cookies response with Setcookie 
Context cookies must be updated when a playlist response return Setcookie header.

Signed-off-by: wm4 <nfxjfg@googlemail.com>
 2015-09-25 17:22:44 +02:00
Michael Bradshaw
244184217c Return EOF for ICO when the end is reached 2015-09-24 23:35:10 +02:00
Paul B Mahol
3441fef0f8 avformat/brstm: fix overflow 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-09-23 19:10:13 +02:00
Andreas Cadhalpun
f9f0b4c08e hls: only seek if there is an offset 
If there is no #EXT-X-BYTERANGE specified, there is no need to seek.
Seeking fails anyway for rtmp, because this protocol does not support
url_seek.

This fixes CNN.m3u from trac ticket 4797 (i.e. Debian bug #798189).

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-09-22 21:00:01 +02:00
wm4
26eb294007 avformat/hls: fix some cases of HLS streams which require cookies 
Broken by commit ba12ba859a. This only
happens with HLS streams which use encryption and require preserving
cookies sent by the server.

Fixes trac issue #4846.
 2015-09-22 17:41:01 +02:00
wm4
265d2a73d6 avformat/assdec: do not drop duplicate subtitles 
Duplicates are perfectly legitimate with this format. A correct
renderer will typically show them stacked.
 2015-09-21 13:44:37 +02:00
wm4
5c93e57f5c avformat/vobsub: do not attempt to check duplicate subtitles 
Some .idx files actually contain duplicate subtitle events:

timestamp: 00:07:52:600, filepos: 00004e800
timestamp: 00:07:52:600, filepos: 00004f800

The second will be dropped, because it has same pts, duration, and text
(the text is just a dummy empty string; the real data is retrieved when
actually reading vobsub subtitle packets).

Dropping this is probably not intended/safe, so avoid it.

See trac issue #4872 for a sample. This patch doesn't fix decoding of
the sample, though.
 2015-09-21 13:43:32 +02:00
wm4
c216324a7f avformat/subtitles: make dropping duplicate events optional 2015-09-21 13:42:48 +02:00
wm4
a47ad06baf avformat/vobsub: compare correct packet stream IDs 
The stream ID is essentially an arbitrary number defined by the .idx
file headers. They have to match the IDs in the .sub stream. The vobsub
demuxer assumed the IDs would just start from 0, increassing by 1 for
each stream. This is not correct. In the sample I had, the IDs were
starting from 1, leading to no subtitles being displayed at all.

Fix this by using the correct stream ID.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-21 12:55:13 +02:00
Alex Agranovsky
53e8bef25a mpjpeg: CRLF terminating a sequence of MIME headers should not cause an error 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-21 02:30:29 +02:00
Rodger Combs
cf2719abee lavf/matroska: ignore ChapCountry ID for now 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-20 20:08:01 +02:00
Ganesh Ajjanagadde
6ea457f76d avformat/format: silence -Wdiscarded-qualifiers 
lpd.buf is non-const and discards the const qualifier of zerobuffer.
This fixes -Wdiscarded-qualifiers observed with a variety of compilers, including GCC 5.2.
Note that this does not change the type of zerobuffer, and merely makes the intent explicit.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-20 02:14:18 +02:00
Michael Niedermayer
e3cf978cdd avformat/flvdec: Detect broken sizes (OBS 0.655b), disable resync for affected files 
Fixes Ticket4867
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-19 18:34:55 +02:00
Hendrik Leppkes
3a8e447712 lavf/utils: remove some left-over cruft from the 32-bit size fields 2015-09-17 16:54:00 +02:00
James Almer
655b6dcb34 lavc/lavf: remove incompatible abi checks for the new 64bit fields 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-09-17 11:36:16 -03:00
Hendrik Leppkes
157969321a Merge commit '22cc57da64bfd73f2206969486b0aa183ee76479' 
* commit '22cc57da64bfd73f2206969486b0aa183ee76479':
  rtpdec: Forward the memory failure

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-17 11:01:16 +02:00
Timothy Gu
d36eac698f Revert "avformat/format: silence -Wdiscarded-qualifiers" 
This reverts commit 27cbe4588a.

See
https://lists.ffmpeg.org/pipermail/ffmpeg-devel/2015-September/179002.html

Requested-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2015-09-16 19:53:13 -07:00
Michael Niedermayer
d64f7d4213 avformat/avidec: disable parsing for RV40 
Fixes: broken_rv40.avi

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-17 02:08:15 +02:00
Ganesh Ajjanagadde
9aaa54135c avformat/mpjpegdec: silence unused variable/function warnings 
Silences a -Wunused-variable and -Wunused-function observed under GCC 5.2.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
 2015-09-16 16:29:51 -07:00
Ganesh Ajjanagadde
27cbe4588a avformat/format: silence -Wdiscarded-qualifiers 
lpd.buf is non-const and discards the const qualifier of zerobuffer.
This fixes -Wdiscarded-qualifiers observed with GCC 5.2.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
 2015-09-16 16:24:56 -07:00
Luca Barbato
22cc57da64 rtpdec: Forward the memory failure 
And avoid a memory leak.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-09-16 20:20:16 +02:00
Hendrik Leppkes
78af3ffaa9 Merge commit '1ec611a10228945d2ec8a9cf6c5531dee6b7ee56' 
* commit '1ec611a10228945d2ec8a9cf6c5531dee6b7ee56':
  rtsp: warning when max_delay reached

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 14:11:24 +02:00
Hendrik Leppkes
3d481f39a2 Merge commit 'ff7f6ea9db2a77d74f7e68a716f53ba1f3f85017' 
* commit 'ff7f6ea9db2a77d74f7e68a716f53ba1f3f85017':
  rtpdec: add a trace when jitter buffer is full

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 14:10:27 +02:00
Hendrik Leppkes
7cecab2f88 Merge commit '3c525b8b4770c1ac5f466a12c5523802bd5d40eb' 
* commit '3c525b8b4770c1ac5f466a12c5523802bd5d40eb':
  rtpdec: Increase the max size of the jitter buffer to 500 packets

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 14:07:05 +02:00
Carl Eugen Hoyos
f17ca46009 lavf/riff: Support decoding Ambisonic wav files. 
Reported and tested by Andy Furniss, adf d lists at gmail
 2015-09-16 14:03:13 +02:00
Hendrik Leppkes
182550e42c Merge commit '10de408738d28ab17aa5c1fdccd809b0637c12d5' 
* commit '10de408738d28ab17aa5c1fdccd809b0637c12d5':
  lavf: Update to the new crypto API

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 11:06:55 +02:00
Eloi BAIL
1ec611a102 rtsp: warning when max_delay reached 
packets are queued due to packet reordering until the queue reach its
maximal size or max delay is reached.
This commit adds a warning trace when max delay is reached.

Signed-off-by: Eloi BAIL <eloi.bail@savoirfairelinux.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-09-16 09:58:12 +03:00
Eloi BAIL
d555bd69e7 rtpdec: inform jitter buffer size 
This commit print as AV_LOG_VERBOSE the jitter buffer
size. It might be the default value or the value set by application.

Signed-off-by: Eloi BAIL <eloi.bail@savoirfairelinux.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-09-16 09:55:51 +03:00
Eloi BAIL
ff7f6ea9db rtpdec: add a trace when jitter buffer is full 
This commit adds a warning trace when jitter buffer
is full. It helps to understand leading decoding issues.

Signed-off-by: Eloi BAIL <eloi.bail@savoirfairelinux.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-09-16 09:54:14 +03:00
Michael Niedermayer
cbbd906be6 avformat/flvdec: Check that sizes match and resync if not 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-16 03:43:21 +02:00
Michael Niedermayer
e01ad950bb avformat/rtmpproto: Fix 2nd packet size 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-16 03:43:21 +02:00
Michael Niedermayer
3496a20bb9 avformat/flvdec: Change packet loop to return EAGAIN instead of looping until a valid packet is foud 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-16 03:32:27 +02:00
Thierry Foucu
164cd9b42a libavformat/riff.c: Add support for RV40 codec in AVI 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-15 23:21:47 +02:00
Carl Eugen Hoyos
b290972b8f lavf: Switch probesize and max_analyze_duration to 64bit. 
Both are only accessible through AVOptions.
 2015-09-15 18:02:51 +02:00
Carl Eugen Hoyos
c311713ca9 lavf: Switch bitrate to 64bit unless compatibility with avconv was requested. 
Based on a patch by Steve Swanson, swanysteve at gmail.

Fixes ticket #2089.
 2015-09-15 18:02:47 +02:00
Michael Niedermayer
7404f3bdb9 lavc: Switch bitrate to 64bit unless compatibility with avconv was requested. 2015-09-15 18:02:43 +02:00
Eloi BAIL
0edf6c8b2a rtpdec: add a trace when jitter buffer is full 
This commit adds an error trace when jitter buffer
is full. It helps to understand leading decoding issues.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-15 13:34:51 +02:00
Eloi BAIL
bc3ea39415 rtpdec: inform jitter buffer size 
This commit print as AV_LOG_INFO the jitter buffer
size. It might be the default value or the value set by application.

Signed-off-by: Eloi BAIL <eloi.bail@savoirfairelinux.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-15 13:34:51 +02:00
Martin Storsjö
3c525b8b47 rtpdec: Increase the max size of the jitter buffer to 500 packets 
Since the actual max length of the jitter buffer is restricted by
max_delay, this shouldn't harm the overall latency (assuming that
max_delay is set properly), while allowing packet reordering with
a larger number of packets (which may be required with high bitrate
video).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-09-15 09:35:44 +03:00
Michael Niedermayer
59c1fec9fb avformat/avidec: Change (last)pos to 64bit 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-15 04:26:19 +02:00
Michael Niedermayer
3e2ef00394 avformat/avidec: Workaround broken initial frame 
Fixes Ticket4851

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-15 04:26:19 +02:00
Michael Niedermayer
8b47e10651 avformat/hlsenc: Fix the method command line parameter 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-14 21:07:37 +02:00
Clément Bœsch
c8370a17f5 avformat: fix style after recent commits 2015-09-14 17:42:56 +02:00
Alex Agranovsky
1de21215d4 mpjpegde: trim header name/value of MIME headers 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-14 17:13:14 +02:00
Alex Agranovsky
0572bd1a62 mpjpeg: probe should require same constraints as packet reader - both proper content-type and content-size must be present 
return AVPROBE_SCORE_MAX, rather than random positive number on success

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-14 17:03:47 +02:00
Vittorio Giovara
10de408738 lavf: Update to the new crypto API 2015-09-13 17:34:45 +02:00
Michael Niedermayer
5629143433 avformat/flvdec: Use the first index entry to find the first packet if there was a parsing error in the header 
Fixes: unknow_codec.flv

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-13 14:22:31 +02:00
Michael Niedermayer
fd6296e412 avformat/flvdec: Print last packet size at trace level 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-13 14:22:31 +02:00
Michael Niedermayer
6bed88ac78 avformat/flvdec: Print terminator value found if it differs from AMF_END_OF_OBJECT in AMF_DATA_TYPE_MIXEDARRAY 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-13 14:22:21 +02:00
Alex Agranovsky
276ab7c148 avformat/mpjpegdec: Allow mpjpeg headers parsing to succeed upon EOF, if required headers are present 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-13 03:08:50 +02:00
Alexandra Hájková
c0a49077ea asfdec: add more checks for size left in asf packet buffer 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-09-12 14:23:32 +02:00
Carl Eugen Hoyos
e3e55758dc lavf/img2dec: Improve jpeg auto-detection. 
Fixes ticket #4841.
 2015-09-12 19:00:02 +02:00
Clément Bœsch
a84613b4c2 avformat/mov: use AV_OPT_TYPE_BOOL for export_{all,xmp} options 2015-09-12 18:24:49 +02:00
Hendrik Leppkes
de969904b1 Merge commit 'c0a49077ea4ff3a0ad30b9e33f1bb06ba9112aaa' 
* commit 'c0a49077ea4ff3a0ad30b9e33f1bb06ba9112aaa':
  asfdec: add more checks for size left in asf packet buffer

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 15:18:05 +02:00
Tobias Rapp
1416370027 avformat/avienc: add muxer option "write_channel_mask" 
Allow writing an empty channel mask into the wave format header. Useful
if the input file contains an unknown channel layout.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-12 14:39:28 +02:00
Hendrik Leppkes
09c15eac3e Merge commit '41ed749fe987e60b0485fa721ad869590651324d' 
* commit '41ed749fe987e60b0485fa721ad869590651324d':
  ogg: Do not try to use the parser if it is not present

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 13:05:01 +02:00
Simon Thelen
b84232694e lavf/webvttenc: Require webvtt file to contain exactly one WebVTT stream. 
Not requiring this can end up producing hilariously broken files
together with -c:s copy (e.g. a webvtt file containing binary subtitle data).

Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-12 02:17:41 +02:00
Alex Agranovsky
9b10ae5727 avformat/format: Remove parameters from mime type before comparission for probing 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-12 00:42:18 +02:00
Alexander S. Drozdov
6a8d58d693 avformat/tcp: TCP Protocol: fix descriptor leak on listen and interrupt 
If we try to listen on TCP port and ff_listen() fails on
interrupt callback socket (bind) descriptor overwrites and
does not closed at all.

As a result, we can't rebind to the same port.

Reviewed-by: Stephan Holljes <klaxa1337@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-11 21:44:30 +02:00
Thierry Foucu
f600381b79 libavformat/utils.c: use correct variable for message. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-11 21:25:33 +02:00
Paul B Mahol
abef6383fb avformat/wavdec: use AV_OPT_TYPE_BOOL for ignore_length 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-09-11 15:41:18 +00:00
Paul B Mahol
2506244155 avformat/wavenc: use AV_OPT_TYPE_BOOL for write_bext option 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-09-11 15:34:17 +00:00
Michael Niedermayer
f58e011a1f avformat/utils: Increase default max_stream_analyze_duration for flv 
Fixes: unknown_video.flv

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-11 01:12:28 +02:00
Clément Bœsch
342ead4491 avformat/subtitles: improve ff_subtitles_queue_finalize() doxy 2015-09-10 21:40:49 +02:00
Clément Bœsch
af924fd9e4 avformat/subtitles: forward log context in ff_subtitles_queue_finalize() for logging 2015-09-10 21:40:07 +02:00
Clément Bœsch
a634649a36 avformat/subtitles: make sure we don't drop "duplicated" events from different streams 2015-09-10 21:39:13 +02:00
Clément Bœsch
4f26c99912 avformat/subtitles: drop duplicated events 
Fix Ticket #4843
 2015-09-10 21:18:34 +02:00
Luca Barbato
41ed749fe9 ogg: Do not try to use the parser if it is not present 
Bug-Id: 886
CC: libav-stable@libav.org
 2015-09-10 14:47:33 +02:00
Vesselin Bontchev
8e28e0721c avformat/aa: initialize "header_seed" and "header_key" 
Fixes CID 1322364, CID 1322363

Signed-off-by: Vesselin Bontchev <vesselin.bontchev@yandex.com>
 2015-09-10 09:06:13 +02:00
James Almer
67d81b76b6 avformat/avformat: remove dead code 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-09-09 20:12:16 -03:00
Michael Niedermayer
a7c0373ea3 avformat/mxfenc: Move sponsorship notice to its own comment block 
Suggested-by: BBB
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-09 02:49:49 +02:00
Michael Niedermayer
7277a4ace9 avformat/http: add reconnect_delay_max option 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-09 02:23:38 +02:00
Hendrik Leppkes
5d8e836d0e Replace all remaining occurances of step/depth_minus1 and offset_plus1 2015-09-08 17:10:48 +02:00
Hendrik Leppkes
8998caf0a4 Merge commit '77cf23668991bfd1fb69339f13e1511b4186b7b3' 
* commit '77cf23668991bfd1fb69339f13e1511b4186b7b3':
  asfdec: alloc enough space for storing name in asf_read_metadata_obj

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-08 14:46:21 +02:00
Hendrik Leppkes
f4ce8cea73 Merge commit '7cad1bf0759ada2a1fc3e80bb232a5377dd4fda4' 
* commit '7cad1bf0759ada2a1fc3e80bb232a5377dd4fda4':
  mov: Allow more than one keyframe per trun

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-08 14:46:02 +02:00
Hendrik Leppkes
80b93f2463 Merge commit '599fe93a840397f551d94db406d0bad42b46b94b' 
* commit '599fe93a840397f551d94db406d0bad42b46b94b':
  riff: Add AVj2 fourcc for Avid jpeg2000

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-08 14:28:39 +02:00
Michael Niedermayer
124b7cd485 Add NOA credits 2015-09-08 01:04:19 +02:00
Michael Niedermayer
bdbab4a351 avformat/http: exponentially delay reconnection to avoid flooding the server 
Reviewed-by: Zhang Rui <bbcallen@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-07 19:28:46 +02:00
Michael Niedermayer
9bd68dea2b avformat/http: Add reconnect_at_eof and reconnect_streamed options 
They allow reconnecting endless live streams which fail with eof

Reviewed-by: Zhang Rui <bbcallen@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-07 19:26:43 +02:00
Hendrik Leppkes
1f1c100833 Merge commit '9ad1e0c12caa440de860bd8f2122beb11d73815c' 
* commit '9ad1e0c12caa440de860bd8f2122beb11d73815c':
  mux: Make sure that the data is actually written

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-07 16:19:40 +02:00
Hendrik Leppkes
88e7ea3e56 Merge commit 'e05f7ed5436207f4a55f1978b223c7f8bc82af42' 
* commit 'e05f7ed5436207f4a55f1978b223c7f8bc82af42':
  file: properly forward errors from file_read() and file_write()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-07 16:11:57 +02:00
Hendrik Leppkes
d02d208211 Merge commit 'c45fcf30cfab687004ed1cdc06ebaa21f4262a0b' 
* commit 'c45fcf30cfab687004ed1cdc06ebaa21f4262a0b':
  DXV decoder

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-07 16:07:07 +02:00
Alexandra Hájková
77cf236689 asfdec: alloc enough space for storing name in asf_read_metadata_obj 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-09-06 20:48:36 +02:00
Martin Storsjö
7cad1bf075 mov: Allow more than one keyframe per trun 
The previous restriction was partially designed to fix certain
(broken) samples from bug 215. There should be no restriction on the
number of keyframes per fragment or trun.

The spec suggests that all frames lacking MOV_FRAG_SAMPLE_FLAG_IS_NON_SYNC
are key frames, but we require the flag MOV_FRAG_SAMPLE_FLAG_DEPENDS_YES
to be unset as well. This works for (possibly broken) media that never
sets the NON_SYNC flag and should also be correct for any spec-compliant
file.

For files that never set either of the flags, all samples are marked
as keyframes.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-09-06 21:24:37 +03:00
Zhang Rui
b821aed706 avformat/async: fix integer conversion warning 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-07 13:15:44 +02:00
tab
fb135139fd avformat: implement query_codec for the image2 muxer. 
Allows avformat_query_codec to be used to check for valid image2 encoders.
Reuses the existing ff_guess_image2_codec ID table.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-07 02:48:58 +02:00
Michael Niedermayer
b480f0e37a avformat/cafenc: Move special casing of PCM codecs into ff_codec_caf_tags 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-07 01:21:12 +02:00
Ronald S. Bultje
a02e27c03d md5: change flags to match framemd5. 
This prevents the following warning: "Application provided invalid, non
monotonically increasing dts to muxer in stream 0: 9 >= 9".
 2015-09-06 15:07:19 -04:00
Michael Niedermayer
63974bd494 avformat/http: print error that causes reconnection 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-06 20:43:38 +02:00
Michael Niedermayer
7990beedee avformat/http: require seekability only when seeking to position != 0 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-06 20:43:38 +02:00
Yayoi
1bb8a53f08 avformat/samidec: do not include trailing sami footer in the last packet 
Signed-off-by: Clément Bœsch <u@pkh.me>
 2015-09-06 13:09:02 +02:00
Zhang Rui
929451c5cb avformat/async: replace strerror with av_err2str 
Fixes CID1322337

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-06 10:51:46 +02:00
Hendrik Leppkes
160e92c8bf Merge commit 'e88103a7f92cf27a2868b50acc8a9912f6088249' 
* commit 'e88103a7f92cf27a2868b50acc8a9912f6088249':
  Bump major versions of all libraries

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 21:35:46 +02:00
Hendrik Leppkes
590ea32e54 Postpone removal of API changes from within the last two years 2015-09-05 21:21:20 +02:00
Andy Wu
c43bd08f8b avformat/mp3dec: Make MP3 seek fast 
When AVFMT_FLAG_FAST_SEEK is specified, make MP3 seek operation as
fast as possible.

When no "-usetoc" is specified, the default operation is using TOC
if available; otherwise, uses linear interpolation. This is useful
when seeking a large MP3 file with no TOC available. One example is
Podcast, many MP3 files are large, but no CBR/VBR tags. Most of
them are actually CBR. Even in VBR cases, this option sacrifices the
accuracy of playback time in exchange for responsiveness.
 2015-09-05 18:32:58 +02:00
Hendrik Leppkes
2df52088ef Merge commit '4e649debcf7f71d35c6b38cdb7ee715eba95d64a' 
* commit '4e649debcf7f71d35c6b38cdb7ee715eba95d64a':
  Postpone API-incompatible changes until the next bump

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 17:52:10 +02:00
Hendrik Leppkes
83a5df54ea Remove left-over FF_API_DESTRUCT_PACKET cruft 2015-09-05 16:51:53 +02:00
Hendrik Leppkes
87c8812270 Merge commit '01bcc2d5c23fa757d163530abb396fd02f1be7c8' 
* commit '01bcc2d5c23fa757d163530abb396fd02f1be7c8':
  lavc: Drop deprecated destruct_packet related functions

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 16:50:09 +02:00
Michael Niedermayer
4eca1939ef avformat/hls: Check for av_opt_set_dict() failure 
Fixes: CID1320426

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-05 14:28:08 +02:00
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
Vittorio Giovara
599fe93a84 riff: Add AVj2 fourcc for Avid jpeg2000 2015-09-04 17:51:29 +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
Sean McGovern
9ad1e0c12c mux: Make sure that the data is actually written 
And forward the error if it is not.

Bug-Id: 881

CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-09-03 13:39:34 +02:00
Sean McGovern
e05f7ed543 file: properly forward errors from file_read() and file_write() 
Bug-Id: 881

CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-09-03 13:39:34 +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
Vittorio Giovara
c45fcf30cf DXV decoder 
Support all DXDI and DXD3 normal quality videos.
 2015-09-02 22:22:02 +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
Vittorio Giovara
e88103a7f9 Bump major versions of all libraries 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-08-28 16:04:28 +02:00
Vittorio Giovara
4e649debcf Postpone API-incompatible changes until the next bump 2015-08-28 16:04:28 +02:00
Vittorio Giovara
01bcc2d5c2 lavc: Drop deprecated destruct_packet related functions 
Deprecated in 10/2012.
 2015-08-28 16:01:16 +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
Ganesh Ajjanagadde
ecf6b26aa5 avformat/ftp: use correct enum type 
Fixes -Wenum-conversion from
http://fate.ffmpeg.org/report.cgi?time=20150820031140&slot=arm64-darwin-clang-apple-5.1

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-20 12:22:50 +02:00
Carl Eugen Hoyos
9bd305be91 lavf/mpeg: Allow users to force audio codec MLP. 
Fixes part of ticket #4786.
 2015-08-20 12:19:00 +02:00
Michael Niedermayer
db91e0edb6 avformat/mux: Update sidedata in ff_write_chained() 
Fixes Ticket4777

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-20 03:42:04 +02:00
Mariusz Szczepańczyk
bf5b2f9df8 lavf/ftp: implement move and delete callbacks 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-20 00:08:16 +02:00
Michael Niedermayer
0b7829901b */version.h: Add note/recommandition about bumping major 
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-19 21:37:32 +02:00
Neil Birkbeck
3dabebc272 libavformat/matroskaenc.c: fix small memory leaks on error 
Fixing small leaks that can occur when mkv_write_tracks fails in mkv_write_header
(e.g., if video track has unknown codec). Also changing mkv_write_seekhead to take
the MatroskaMuxContext to avoid having dangling pointers.

Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-19 13:17:21 +02:00
Ronald S. Bultje
6471040f56 FF_OPT_TYPE_* -> AV_OPT_TYPE_*. 2015-08-18 11:48:49 -04:00
Ronald S. Bultje
229843aa35 Replace av_dlog with ff_dlog. 
ff_dlog checks compilability, and is non-public. av_dlog is deprecated
and no longer exists if FF_API_DLOG=0.
 2015-08-18 10:24:01 -04:00
Hendrik Leppkes
649b2e4c83 Merge commit '317cfaa5e09755ed0b34af512ec687963a67bdbf' 
* commit '317cfaa5e09755ed0b34af512ec687963a67bdbf':
  asfdec: prevent the memory leak in the asf_read_metada_obj

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-18 09:35:56 +02:00
Hendrik Leppkes
1907e19d0c Merge commit '26ac22e5e7394346e9d59f800e7d4e91f4518d33' 
* commit '26ac22e5e7394346e9d59f800e7d4e91f4518d33':
  movenc: Add a new flag for writing global sidx indexes for dash

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-18 08:50:22 +02:00
Alexandra Hájková
317cfaa5e0 asfdec: prevent the memory leak in the asf_read_metada_obj 
also do not return the error code but just break reading
metadata object in the case of the aspect ratio reading failure

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-08-16 20:00:37 +02:00
Luca Barbato
72839fce64 hlsenc: Use AV_TIME_BASE units for all the computations 
Do not risk mixing different timebases.

CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-08-16 19:02:16 +02:00
Rodger Combs
b4b2717ffe lavf/matroskadec: Fully parse and repack MP3 packets 
Fixes https://trac.ffmpeg.org/ticket/4776

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-16 11:46:33 +02:00
Marton Balint
95584ddac4 mxfdec: set AVFMT_SEEK_TO_PTS demuxer flag 
Since 53f2ef2c4a seeking is done using PTS.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-08-14 14:20:25 +02:00
Stefano Sabatini
fedc422684 lavf/mpegts: apply misc option description fixes 
Use impersonal form, drop capitalization and ending dot.
 2015-08-14 12:08:57 +02:00
Michael Niedermayer
856452cf63 avformat/rmdec: MLTI with multiple MDPR support 
Fixes Ticket4496

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-14 04:40:00 +02:00
Michael Niedermayer
02fff49936 avformat/rmdec: Move MLTI handling out of ff_rm_read_mdpr_codecdata() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-14 03:32:00 +02:00
Mariusz Szczepańczyk
affbecb0de lavf/ftp: implement NLST method 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-14 01:00:11 +02:00
Michael Niedermayer
acbd78a001 avformat/wavdec: Detect wrongly interpreted specification about the sample value in the fact chunk 
Fixes Ticket703

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-13 12:38:31 +02:00
Michael Niedermayer
4ec4454ccf avformat/wavdec: Do not discard sample_count due to rounding 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-13 12:38:20 +02:00
Ganesh Ajjanagadde
1bbb5ea10d avformat/tls_gnutls: correct version detection for certificate support 
Fixes Ticket3748

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-13 02:24:37 +02:00
Marton Balint
8009a1f1fd avisynth: fix setting stream timebase 
Stream timebase should be set using avpriv_set_pts_info, otherwise
avctx->pkt_timebase is not correct.

This should fix ticket #4766.

Patch is only compile tested.

Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Stephen Hutchinson <qyot27@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-13 01:20:16 +02:00
Michael Niedermayer
0d2a62d257 avformat/avidec: Simplify dshow_block_align based special case detection 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-12 22:51:40 +02:00
Michael Niedermayer
45c558563a avformat: Move MAX_PROBE_PACKETS to internal.h 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-12 17:33:47 +02:00
Martin Storsjö
26ac22e5e7 movenc: Add a new flag for writing global sidx indexes for dash 
The double meaning of the faststart flag (moving a moov atom
to the start of files, making them streamable, for non-fragmented
files, vs inserting a global sidx index at the start of files
for fragmented files) is confusing - see 40ed1cbf1 for
explanation of its origins.

Since the second meaning of the flag hasn't been part of any
libav release yet, just rename it to get rid of the confusion
without any extra deprecation (which wouldn't get rid of the
potential confusion, of users adding -movflags faststart
even for fragmented files, where it isn't needed for making
them "streamable").

This gets back the old behaviour, where -movflags faststart
doesn't have any effect for fragmented files.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-08-12 13:41:46 +03:00
Michael Niedermayer
5f501f066e avformat/avidec: Disable AVSTREAM_PARSE_TIMESTAMPS for flac 
The flac parser does not support it, its also not needed.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-12 04:03:37 +02:00
Michael Niedermayer
254ff6e6bf avformat/avidec: Add flac to the dshow_block_align exception list 
Fixes Ticket4758

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-12 03:11:15 +02:00
Marton Balint
0860016529 concatdec: fix broken file_inpoint calculation 
Should fix ticket #4765.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-08-11 11:19:17 +02:00
Michael Niedermayer
55a07cf49c avformat/ftp: Use av_freep() for dir_buffer 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-10 18:46:38 +02:00
Mariusz Szczepańczyk
ee44cb3c81 lavf/ftp: properly read an empty path 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-10 18:23:40 +02:00
Lukasz Marek
bc93053161 lavf/ftp: 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-10 18:23:35 +02:00
Hendrik Leppkes
10ea06b3bb Merge commit '5f200bbf98efe50f63d0515b115d2ba8dae297bc' 
* commit '5f200bbf98efe50f63d0515b115d2ba8dae297bc':
  movenc: Place the sidx index after the initial moov/mdat pair

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-10 11:24:30 +02:00
Hendrik Leppkes
7653ebfff6 Merge commit '83f254e65f938657a4dbec711e4c94252a72daf9' 
* commit '83f254e65f938657a4dbec711e4c94252a72daf9':
  movenc: Rename reserved_moov_pos to reserved_header_pos

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-10 11:23:21 +02:00
Hendrik Leppkes
6c52432b48 Merge commit '8e34089e265a6b01e1e3301e8864439d26793753' 
* commit '8e34089e265a6b01e1e3301e8864439d26793753':
  movenc: Check that frag_info entries exist in mov_write_sidx_tag

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-10 11:20:09 +02:00
Martin Storsjö
5f200bbf98 movenc: Place the sidx index after the initial moov/mdat pair 
For fragmented files with non-empty moov, with a fragment index
(sidx), place the index after the initial moov/mdat pair.

Previously, for this pathological case, the index was written
at the start of the file.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-08-10 09:46:14 +03:00
Martin Storsjö
83f254e65f movenc: Rename reserved_moov_pos to reserved_header_pos 
The same field is also used for writing the sidx index header,
for fragmented files, when the faststart flag is used.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-08-10 09:46:07 +03:00
Martin Storsjö
8e34089e26 movenc: Check that frag_info entries exist in mov_write_sidx_tag 
This fixes crashes with pathological cases when trying to write
a sidx index (via the -movflags faststart option, in combination
with fragmenting options), when no fragments actually have been
written. (This is possible if the empty_moov flag isn't used,
so that all actual packet data is written in the moov/mdat pair,
and no moof/mdat pairs have been written.)

In these pathological cases, no sidx should be written at all.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-08-10 09:46:03 +03:00
Michael Niedermayer
46f15de8a4 avformat/gifdec: correct r_frame_rate for single frame gifs 
Fixes Ticket4650

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-10 04:45:27 +02:00
Hendrik Leppkes
3d2d672828 Merge commit 'e5997152f54f790229c99f237f8eb6b5b1ee683a' 
* commit 'e5997152f54f790229c99f237f8eb6b5b1ee683a':
  asf: Use time_t where needed

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-07 09:27:55 +02:00
Hendrik Leppkes
b54cf4b886 Merge commit '944f60866f507e3c0850ae9c2f30dac1da54587c' 
* commit '944f60866f507e3c0850ae9c2f30dac1da54587c':
  asfdec: read values properly

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-07 09:27:49 +02:00
Michael Niedermayer
ace8376653 avformat/matroskaenc: Avoid "for (int i" syntax for better compatibility 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-06 01:15:08 +02:00
Sasi Inguva
31852540d4 libavformat/matroska: Write stream durations in metadata, in the format of mkvmerge. 
Compute individual stream durations in matroska muxer.
Write them as string tags in the same format as mkvmerge tool does.

Signed-off-by: Sasi Inguva <isasi@google.com>
 2015-08-05 22:29:23 +02:00
Luca Barbato
e5997152f5 asf: Use time_t where needed 
gmtime takes a time_t not an uint64_t.
 2015-08-04 21:40:04 +02:00
Carl Eugen Hoyos
128e722bc1 lavf/swf: Fix auto-detection of compressed files. 
Fixes auto-detection of compressed swf files as in
http://samples.ffmpeg.org/SWF/compressed-swf/
Reported by forum user Zard1096.
 2015-08-04 21:34:00 +02:00
Alexandra Hájková
944f60866f asfdec: read values properly 
The length of BOOL values is 16 bits in the Metadata Object but
32 bits in the Extended Content Description Object.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-08-04 21:33:55 +02:00
Matthieu Bouron
f6518e51b8 lavf/mxfdec: support segmented frame layout as separate fields layout 
According to S377M, segmented frame layout is identical to separate
field layout except that the two fields are taken from a single scan
of the incoming image, ie: they are coincident in time. Thus the
resulting frame is progressive.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-04 13:03:29 +02:00
Hendrik Leppkes
190e521123 Merge commit 'fdbc544d29176ba69d67dd879df4696f0a19052e' 
* commit 'fdbc544d29176ba69d67dd879df4696f0a19052e':
  asfdec: prevent the memory leak while reading metadata

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-02 12:32:10 +02:00
Hendrik Leppkes
2ab827389b Merge commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672' 
* commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672':
  asfdec: remove improper assignement that caused wrong timestamps

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-02 10:41:56 +02:00
Hendrik Leppkes
07094e5e40 Merge commit '78491fe8cfed83d2aead95dafe26f0d3f999e961' 
* commit '78491fe8cfed83d2aead95dafe26f0d3f999e961':
  asfdec: do not export empty metadata

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-02 10:41:45 +02:00
Hendrik Leppkes
988ddfea5e Merge commit 'cd4d9df22738e6f147521ccb72c7930db6050914' 
* commit 'cd4d9df22738e6f147521ccb72c7930db6050914':
  asfdec: free AVDictionaries properly when closing the demuxer

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-02 10:34:18 +02:00
Alexandra Hájková
fdbc544d29 asfdec: prevent the memory leak while reading metadata 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-08-02 08:43:51 +02:00
Vesselin Bontchev
336822edf4 avformat/mov: fix regression in processing .aax files 
Commit 0a551cbe introduced "activation_bytes" option, and not specifying
this option (while calling ffmpeg / ffprobe) causes the program to quit
early. Before this commit, ffprobe was capable of processing metadata in
.aax files.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-02 03:40:38 +02:00
Stephan Holljes
3240e69de6 lavf/http: Implement server side network code. 
add http_accept,
add http_handshake and move handshake logic there,
handle connection closing.

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-08-01 00:58:31 +02:00
Stephan Holljes
75235a2550 lavf/tcp: increase range for listen and call the underlying socket operations accordingly 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-08-01 00:58:31 +02:00
Stephan Holljes
21198155a7 lavf/tcp: add tcp_accept 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-08-01 00:58:31 +02:00
Stephan Holljes
63c07a956b lavf/avio: add avio_accept and avio_handshake 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-08-01 00:58:31 +02:00
Stephan Holljes
5125e4b53f lavf/avio: add ffurl_accept and ffurl_handshake 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-08-01 00:58:31 +02:00
Stephan Holljes
cf6c871bee lavf/network: split ff_listen_bind into ff_listen and ff_accept 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-08-01 00:58:31 +02:00
Alexandra Hájková
33dc1913ab asfdec: remove improper assignement that caused wrong timestamps 
and remove unneeded variable

Sample-Id: https://samples.libav.org/asf-wmv/asf-code-53/movn018.asf

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-31 09:10:05 +02:00
Alexandra Hájková
78491fe8cf asfdec: do not export empty metadata 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-31 09:09:27 +02:00
Alexandra Hájková
cd4d9df227 asfdec: free AVDictionaries properly when closing the demuxer 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-31 07:23:20 +02:00
Ganesh Ajjanagadde
c1bfb99ff2 avformat/wavdec: add extra sample count check for G.729 files 
Can be used to fix Ticket4577

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-31 03:17:55 +02:00
Michael Niedermayer
bc4bdc6d61 Merge commit '764ec70149728be82304c163ccc4e280f1629201' 
* commit '764ec70149728be82304c163ccc4e280f1629201':
  rtsp: Only interpret $ as interleaved packet indicator at the start of replies

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 18:37:37 +02:00
Michael Niedermayer
ba12ba859a Merge commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744' 
* commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744':
  hls: Save and forward avio options

Conflicts:
	libavformat/hls.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 17:52:23 +02:00
Michael Niedermayer
8e67599505 Merge commit '5ae178539b91d25710b7bb322d156c31aea9f8bf' 
* commit '5ae178539b91d25710b7bb322d156c31aea9f8bf':
  http: Add the trailing endlines if they are missing

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 16:24:03 +02:00
Martin Storsjö
764ec70149 rtsp: Only interpret $ as interleaved packet indicator at the start of replies 
Allow $ as character anywhere within normal RTSP replies - both
within the lines, and as the first character of RTSP header lines.
(The existing old comment indicated that an inline packet could
start at any line within a RTSP reply header, but that doesn't
sound valid to me, and I'm not sure if the existing code
handled that correctly either.)

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-07-30 16:59:36 +03:00
Luca Barbato
0c73a5a53c hls: Save and forward avio options 
Make possible to send the custom headers and override the user agent.

Reported-by: BenWonder
 2015-07-30 11:21:26 +02:00
Luca Barbato
5ae178539b http: Add the trailing endlines if they are missing 
Makes slightly easier the life of those want to use the option
from the command line
 2015-07-30 11:21:26 +02:00
James Almer
9487ffd4c0 rtmpproto: free hmac context properly 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-07-30 09:26:49 +03:00
James Almer
6ce3d9fc4a avformat/rtmpproto: free hmac context properly 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-07-29 23:56:22 -03:00
wm4
4c6beaed92 rawdec: fix mjpeg probing buffer size check 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 00:06:15 +02:00
wm4
bf51fcd304 rawdec: fix mjpeg probing 
There can be other headers than "Content-Type:" (in this case, a
"Content-Length:" header was following), so checking for a trailing
newline is wrong.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-29 23:50:46 +02:00
Michael Niedermayer
f8b81a02c9 avformat/oggdec: ogg_read_seek: reset ogg after seeking 
Fixes Ticket4743

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-29 23:22:12 +02:00
James Almer
65dd6a1f84 rtmpproto: use AVHMAC instead of a custom implementation 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-07-29 22:09:16 +03:00
James Almer
6c87b86628 avformat/rtmpproto: use AVHMAC instead of a custom implementation 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-07-29 15:32:08 -03:00
Michael Niedermayer
f40ec70478 avformat/wavdec: Check for data_size overflow 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-29 13:47:44 +02:00
Ganesh Ajjanagadde
13d605e090 wavdec: make sample count check more precise 
May be used to fix Ticket4577

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-29 13:13:09 +02:00
Michael Niedermayer
e1296b5fa4 Merge commit 'b5c1c16247ab7d166c84eaf4564e49a1535fdaaf' 
* commit 'b5c1c16247ab7d166c84eaf4564e49a1535fdaaf':
  asfdec: do not align Data Object when Broadcast Flag is set

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-28 00:13:54 +02:00
Michael Niedermayer
29d147c94d Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba' 
* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba':
  lavc: Consistently prefix input buffer defines

Conflicts:
	doc/examples/decoding_encoding.c
	libavcodec/4xm.c
	libavcodec/aac_adtstoasc_bsf.c
	libavcodec/aacdec.c
	libavcodec/aacenc.c
	libavcodec/ac3dec.h
	libavcodec/asvenc.c
	libavcodec/avcodec.h
	libavcodec/avpacket.c
	libavcodec/dvdec.c
	libavcodec/ffv1enc.c
	libavcodec/g2meet.c
	libavcodec/gif.c
	libavcodec/h264.c
	libavcodec/h264_mp4toannexb_bsf.c
	libavcodec/huffyuvdec.c
	libavcodec/huffyuvenc.c
	libavcodec/jpeglsenc.c
	libavcodec/libxvid.c
	libavcodec/mdec.c
	libavcodec/motionpixels.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/noise_bsf.c
	libavcodec/nuv.c
	libavcodec/nvenc.c
	libavcodec/options.c
	libavcodec/parser.c
	libavcodec/pngenc.c
	libavcodec/proresenc_kostya.c
	libavcodec/qsvdec.c
	libavcodec/svq1enc.c
	libavcodec/tiffenc.c
	libavcodec/truemotion2.c
	libavcodec/utils.c
	libavcodec/utvideoenc.c
	libavcodec/vc1dec.c
	libavcodec/wmalosslessdec.c
	libavformat/adxdec.c
	libavformat/aiffdec.c
	libavformat/apc.c
	libavformat/apetag.c
	libavformat/avidec.c
	libavformat/bink.c
	libavformat/cafdec.c
	libavformat/flvdec.c
	libavformat/id3v2.c
	libavformat/isom.c
	libavformat/matroskadec.c
	libavformat/mov.c
	libavformat/mpc.c
	libavformat/mpc8.c
	libavformat/mpegts.c
	libavformat/mvi.c
	libavformat/mxfdec.c
	libavformat/mxg.c
	libavformat/nutdec.c
	libavformat/oggdec.c
	libavformat/oggparsecelt.c
	libavformat/oggparseflac.c
	libavformat/oggparseopus.c
	libavformat/oggparsespeex.c
	libavformat/omadec.c
	libavformat/rawdec.c
	libavformat/riffdec.c
	libavformat/rl2.c
	libavformat/rmdec.c
	libavformat/rtpdec_latm.c
	libavformat/rtpdec_mpeg4.c
	libavformat/rtpdec_qdm2.c
	libavformat/rtpdec_svq3.c
	libavformat/sierravmd.c
	libavformat/smacker.c
	libavformat/smush.c
	libavformat/spdifenc.c
	libavformat/takdec.c
	libavformat/tta.c
	libavformat/utils.c
	libavformat/vqf.c
	libavformat/westwood_vqa.c
	libavformat/xmv.c
	libavformat/xwma.c
	libavformat/yop.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-27 23:15:19 +02:00
Michael Niedermayer
444e9874a7 Merge commit 'def97856de6021965db86c25a732d78689bd6bb0' 
* commit 'def97856de6021965db86c25a732d78689bd6bb0':
  lavc: AV-prefix all codec capabilities

Conflicts:
	cmdutils.c
	ffmpeg.c
	ffplay.c
	libavcodec/8svx.c
	libavcodec/aacenc.c
	libavcodec/ac3dec.c
	libavcodec/adpcm.c
	libavcodec/alac.c
	libavcodec/atrac3plusdec.c
	libavcodec/bink.c
	libavcodec/dnxhddec.c
	libavcodec/dvdec.c
	libavcodec/dvenc.c
	libavcodec/ffv1dec.c
	libavcodec/ffv1enc.c
	libavcodec/fic.c
	libavcodec/flacdec.c
	libavcodec/flacenc.c
	libavcodec/flvdec.c
	libavcodec/fraps.c
	libavcodec/frwu.c
	libavcodec/gifdec.c
	libavcodec/h261dec.c
	libavcodec/hevc.c
	libavcodec/iff.c
	libavcodec/imc.c
	libavcodec/libopenjpegdec.c
	libavcodec/libvo-aacenc.c
	libavcodec/libvorbisenc.c
	libavcodec/libvpxdec.c
	libavcodec/libvpxenc.c
	libavcodec/libx264.c
	libavcodec/mjpegbdec.c
	libavcodec/mjpegdec.c
	libavcodec/mpegaudiodec_float.c
	libavcodec/msmpeg4dec.c
	libavcodec/mxpegdec.c
	libavcodec/nvenc_h264.c
	libavcodec/nvenc_hevc.c
	libavcodec/pngdec.c
	libavcodec/qpeg.c
	libavcodec/ra288.c
	libavcodec/rv10.c
	libavcodec/s302m.c
	libavcodec/sp5xdec.c
	libavcodec/takdec.c
	libavcodec/tiff.c
	libavcodec/tta.c
	libavcodec/utils.c
	libavcodec/v210dec.c
	libavcodec/vp6.c
	libavcodec/vp9.c
	libavcodec/wavpack.c
	libavcodec/yop.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-27 22:50:18 +02:00
Michael Niedermayer
94d68a41fa Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615' 
* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615':
  lavc: AV-prefix all codec flags

Conflicts:
	doc/examples/muxing.c
	ffmpeg.c
	ffmpeg_opt.c
	ffplay.c
	libavcodec/aacdec.c
	libavcodec/aacenc.c
	libavcodec/ac3dec.c
	libavcodec/ac3enc_float.c
	libavcodec/atrac1.c
	libavcodec/atrac3.c
	libavcodec/atrac3plusdec.c
	libavcodec/dcadec.c
	libavcodec/ffv1enc.c
	libavcodec/h264.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_mb.c
	libavcodec/imc.c
	libavcodec/libmp3lame.c
	libavcodec/libtheoraenc.c
	libavcodec/libtwolame.c
	libavcodec/libvpxenc.c
	libavcodec/libxavs.c
	libavcodec/libxvid.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg12enc.c
	libavcodec/mpegaudiodec_template.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_motion.c
	libavcodec/nellymoserdec.c
	libavcodec/nellymoserenc.c
	libavcodec/nvenc.c
	libavcodec/on2avc.c
	libavcodec/options_table.h
	libavcodec/opus_celt.c
	libavcodec/pngenc.c
	libavcodec/ra288.c
	libavcodec/ratecontrol.c
	libavcodec/twinvq.c
	libavcodec/vc1_block.c
	libavcodec/vc1_loopfilter.c
	libavcodec/vc1_mc.c
	libavcodec/vc1dec.c
	libavcodec/vorbisdec.c
	libavcodec/vp3.c
	libavcodec/wma.c
	libavcodec/wmaprodec.c
	libavcodec/x86/hpeldsp_init.c
	libavcodec/x86/me_cmp_init.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-27 22:10:35 +02:00
Alexandra Hájková
b5c1c16247 asfdec: do not align Data Object when Broadcast Flag is set 
its size is invalid in this case

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-27 18:09:30 +02:00
Vittorio Giovara
059a934806 lavc: Consistently prefix input buffer defines 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-07-27 15:24:59 +01:00
Vittorio Giovara
def97856de lavc: AV-prefix all codec capabilities 
Express bitfields more simply.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-07-27 15:24:58 +01:00
Vittorio Giovara
7c6eb0a1b7 lavc: AV-prefix all codec flags 
Convert doxygen to multiline and express bitfields more simply.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-07-27 15:24:58 +01:00
Alexandra Hájková
9e8627a1ff asfdec: interpret the first flag in an asf packet as length flag 
if the error correction flag is not set, a packet starts with payload

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-27 07:50:32 +02:00
Michael Niedermayer
c8c86b8f9b avformat/mpegts: Replace silent cliping of language_count by asserts 
Failure should not be possible, if it does occur then the code is
buggy and should be fixed not silently clip

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-27 18:15:17 +02:00
Michael Niedermayer
42aa02418e avformat/mpegts: Use DVB_TELETEXT timestamp heuristic also for DVB subtitles 
Fixes Ticket4200

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-27 15:38:40 +02:00
Michael Niedermayer
90696ef368 Merge commit '9e8627a1ff9207b9e272d248da2e1bd0cc6fe2fe' 
* commit '9e8627a1ff9207b9e272d248da2e1bd0cc6fe2fe':
  asfdec: interpret the first flag in an asf packet as length flag

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-27 12:27:35 +02:00
Michael Niedermayer
dc07e576ce avformat/isom: Use AVRN codec to handle AVDJ 
Fixes cropping

Fixes Ticket4741

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 22:27:29 +02:00
Michael Niedermayer
29a43bd588 avformat/hlsenc: Fix wording in comment 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 22:06:19 +02:00
Anshul Maheshwari
379ddc6af4 avformat/hlsenc: Add WebVtt support in hls 
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 05:59:43 +02:00
Michael Niedermayer
c3361b3a87 avformat/ipmovie: Fix late audio detection 
Fixes audio in Ticket117

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 04:00:02 +02:00
Michael Niedermayer
8e0fdb03a2 avformat/ipmovie: Parse&handle late audio init 
Fixes Ticket117

Based on problem description by Kostya
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 03:41:57 +02:00
Michael Niedermayer
e011538394 avformat/ipmovie: Factor init_audio() out 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 03:40:19 +02:00
Michael Niedermayer
7ec5115409 avformat/nutenc: Omit AV_PKT_DATA_QUALITY_STATS when storing side data. 
This side data does not serve or improve decoding the data, it thus
would semantically be metadata and not side data.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 18:39:17 +02:00
Zhang Rui
8a17335189 avformat/async: wake up main thread before exit background thread 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 02:26:01 +02:00
Zhang Rui
c0a4af408e avformat/async: move more code into locked area in background thread 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 01:43:44 +02:00
Alexandra Hájková
7f388c0fab asfdec: remove the wrong condition 
this condition breaks reading from the pipe as data_reached variable
have to be set to break while in the asf_read_header just after the Data
Object is found

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-23 10:50:27 +02:00
Alexandra Hájková
aed7715b8f asfdec: increment nb_streams right after the stream allocation 
to prevent possible memory leaks

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-23 09:48:26 +02:00
Alexandra Hájková
ee80f834cb asfdec: set nb_streams to 0 in the asf_read_close 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-23 09:47:59 +02:00
Michael Niedermayer
0a03271ef6 Merge commit '7f388c0fabc51eca3106e7cc443393269435ab52' 
* commit '7f388c0fabc51eca3106e7cc443393269435ab52':
  asfdec: remove the wrong condition

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-23 12:45:00 +02:00
Michael Niedermayer
40e8ade9eb Merge commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6' 
* commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6':
  asfdec: increment nb_streams right after the stream allocation

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-23 11:43:56 +02:00
Michael Niedermayer
cd4c878934 Merge commit 'ee80f834cbb6dbacdc1efb4c658a7d775e82ebff' 
* commit 'ee80f834cbb6dbacdc1efb4c658a7d775e82ebff':
  asfdec: set nb_streams to 0 in the asf_read_close

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-23 11:34:40 +02:00
Michael Niedermayer
3d083f6ffd avformat/dump: Also print pict_type in dump_sidedata() for AV_PKT_DATA_QUALITY_STATS 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 21:04:17 +02:00
Michael Niedermayer
c40ecffd31 Replace AV_PKT_DATA_QUALITY_FACTOR by AV_PKT_DATA_QUALITY_STATS 
The stats are a superset of the quality factor, also allowing the picture type and encoder "PSNR" stats to be exported
This also replaces the native by fixed little endian order for the affected side data

AV_PKT_DATA_QUALITY_FACTOR is left as a synonym of AV_PKT_DATA_QUALITY_STATS

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 19:31:52 +02:00
Michael Niedermayer
6b9be608ce Merge commit '2a187a074a7f5ad9f01f72ac9715ddfcb2dbb8ec' 
* commit '2a187a074a7f5ad9f01f72ac9715ddfcb2dbb8ec':
  asfdec: avoid crash in the case when chunk_len is 0 or pkt_len is 0

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 17:13:18 +02:00
Michael Niedermayer
fa7defc89a Merge commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd' 
* commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd':
  asfdec: close the demuxer properly when read_header is failing

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 17:06:22 +02:00
Michael Niedermayer
fce350be0e Merge commit '5655236a67203d923755f285584c6e68abe7e33f' 
* commit '5655236a67203d923755f285584c6e68abe7e33f':
  asfdec: factor out seeking to the Data Object outside while

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 16:53:26 +02:00
Michael Niedermayer
9837d3b068 avformat/asfdec_f: Parse ECC byte according to spec 
This should not change anything as the spec requires specific values
for the fields, which where handled previously.

Ask for samples when these values do not match

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 14:11:48 +02:00
Alexandra Hájková
2a187a074a asfdec: avoid crash in the case when chunk_len is 0 or pkt_len is 0 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-22 12:11:46 +02:00
Alexandra Hájková
93f16f338f asfdec: close the demuxer properly when read_header is failing 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-22 12:11:46 +02:00
Alexandra Hájková
5655236a67 asfdec: factor out seeking to the Data Object outside while 
return INVALIDDARA if Data Object was not found

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-22 12:11:46 +02:00