Commit Graph

18085 Commits

Author SHA1 Message Date
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
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
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