wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
75445 commits 40 branches 405 tags 230 MiB
Commit graph

18103 commits

Author SHA1 Message Date
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 '22cc57da64' 
* commit '22cc57da64':
  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 '1ec611a102' 
* commit '1ec611a102':
  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 'ff7f6ea9db' 
* commit 'ff7f6ea9db':
  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 '3c525b8b47' 
* commit '3c525b8b47':
  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 '10de408738' 
* commit '10de408738':
  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 'c0a49077ea' 
* commit 'c0a49077ea':
  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 '41ed749fe9' 
* commit '41ed749fe9':
  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