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

71239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl Eugen Hoyos
f8413f74a1 lavf/mpeg: Support more audio codecs in Hikvision CCTV recordings. 
Fixes a sample from ticket #4182.
 2015-04-03 21:13:50 +02:00
Michael Niedermayer
5b97681eaa Merge commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0' 
* commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0':
  mpegtsenc: Take max_delay into account when buffering multiple audio packets into one PES packet

Conflicts:
	libavformat/mpegtsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-03 21:01:40 +02:00
Lou Logan
44cae91252 cmdutils: fix "Commmand" typo 
Signed-off-by: Lou Logan <lou@lrcd.com>
 2015-04-03 10:43:21 -08:00
Andreas Cadhalpun
1f47c2399d mpeg4: only show the divx_packed warning, when a packed frame is present 
Otherwise it is shown even after the file was fixed with avidemux,
because the userdata string still ends with 'p'.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-03 20:23:24 +02:00
Michael Niedermayer
6eb6956d06 ffmpeg: Fix indentation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-03 19:39:06 +02:00
Michael Niedermayer
98c7729c13 ffmpeg: last frame duplication heuristic 
This improves the last frames duration with CFR and when the input durations
are inaccurate or missing

Fixes Ticket4119

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-03 19:09:31 +02:00
Rong Yan
af5fec9538 avcodec/ppc/fdctdsp: POWER LE support in ff_fdct_altivec() 
add marcos VEC_FMERGEH() VEC_FMERGEL()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-03 18:10:27 +02:00
Himangi Saraogi
24326930d8 filtfmts: Avoid null pointer dereference 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-03 17:23:45 +02:00
Steve Dierker
acbb90407a libavformat/mxf.c: Relaxed ProRes pattern 
I found another MXF File containing ProRes with the following
codec_uls: 060E2B34040101010E04020102110500
Therefor I relaxed the pattern.

Related to issue #4349

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-03 13:26:39 +02:00
Martin Storsjö
7d097a0fc5 mpegtsenc: Take max_delay into account when buffering multiple audio packets into one PES packet 
Make sure we don't buffer up more than max_delay worth of data
before writing a PES packet, even if pes_payload_size is set to
a larger value.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-04-03 14:06:15 +03:00
Mariusz Szczepańczyk
f10aa0e125 doc/examples: Handle new types in avio_list_dir 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-03 04:09:40 +02:00
Mariusz Szczepańczyk
26e0e393d0 lavf/avio: Add new types to AVIODirEntryType, bump minor version 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-03 04:09:34 +02:00
Stephen Hutchinson
b2c05867f5 doc: Slightly revise AviSynth version info 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-03 00:17:51 +02:00
Lukasz Marek
cd3d0d5422 lavf/ftp: remove fixed length buffers from context 
It saves some memory.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2015-04-03 00:10:09 +02:00
Lukasz Marek
c043def91f lavf/ftp: parse user and password once 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2015-04-03 00:09:54 +02:00
Stephen Hutchinson
3723a18310 avisynth: Bump minimum required version to interface version 6 
The AVSC_API changes in the new headers mean that the 2.6 alphas
are just as incompatible as 2.5 is.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-02 23:52:48 +02:00
Stephen Hutchinson
d858c3a18f avisynth: Fix detection of AviSynth 2.5 
In order to safely exit when the user tries to use AviSynth 2.5,
the continue_on_fail value for 2.6's functions need to be set to
1.  Otherwise, the library loader fails before the 'upgrade to
2.6' log message appears.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-02 23:30:08 +02:00
James Almer
3000183732 avcodec/pngenc: don't return a value in a void function 
Should fix compilation failures with strict compilers

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-02 23:22:28 +02:00
Lukasz Marek
0bf980919e fate: add AVDictionary tests 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2015-04-02 23:15:57 +02:00
Lukasz Marek
96f896750d lavu/dict: add more tests 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2015-04-02 23:15:57 +02:00
Lukasz Marek
a8c5b4551e lavu/dict: fix set function when reuse existing key pointer 
Fixes following scenario:

av_dict_set(&d, "key", "old", 0);
AVDictionaryEentry *e = av_dict_get(d, "key", NULL, 0);
av_dict_set(&d, e->key, "new", 0);

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2015-04-02 23:15:57 +02:00
Donny Yang
b0a2aee408 png: Use libavutil's crc functions instead of zlib's 
Signed-off-by: Donny Yang <work@kota.moe>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-02 20:41:51 +02:00
Tim Nicholson
27565ace60 ffmpeg_opt.c: fix regression introduced in 5743095c 
-vtag is an input and output option.

Signed-off-by: Tim Nicholson <tim.nicholson@bbc.co.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-02 20:04:00 +02:00
Michael Niedermayer
c299fbbb22 avcodec/vda_h264: try to fix build 
Found-by: Stefano Pigozzi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-02 16:04:22 +02:00
Rainer Hochecker
3e53211a57 vda: fix h264 decoding for avcC,vda wants the entire buffer 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-02 15:06:28 +02:00
Timo Rothenpieler
764f87b6ab avcodec/nvenc: Fix profile parameter handling 
It was not possible to set a profile before, the builtin profile
parameter does not seem to work propperly.
To be compatible with libx264, this overlays it with a local parameter
that expects a string, instead of an int, that takes the well known values
"high", "main" or "baseline".

Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-02 14:33:42 +02:00
Carl Eugen Hoyos
703402683a Bump lavc and lavf minor versions for apng muxer and encoder. 2015-04-02 14:09:11 +02:00
Himangi Saraogi
d768f8f5cf ffmpeg: Avoid null pointer dereferences 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-02 13:06:00 +02:00
Donny Yang
80be7daaa8 apng: Add a basic APNG muxer 
Additionally, update some documentation with support for APNG

Signed-off-by: Donny Yang <work@kota.moe>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-02 04:52:59 +02:00
Donny Yang
d759844863 apng: Add a basic APNG encoder 
Signed-off-by: Donny Yang <work@kota.moe>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-02 04:02:43 +02:00
Lukasz Marek
08d0dbf2ae lavu/dict: don't accept AV_DICT_DONT_STRDUP_VAL for av_dict_set_int 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-02 00:48:19 +02:00
Pranav Vaish
f669d8c1b7 avcodec/ccaption_dec: Remove the GOTO statement 2015-04-02 00:06:44 +02:00
Michael Niedermayer
53bf6b155c Merge commit 'e3ec6fe7bb2a622a863e3912181717a659eb1bad' 
* commit 'e3ec6fe7bb2a622a863e3912181717a659eb1bad':
  rtsp: Add a buffer_size option

Conflicts:
	libavformat/rtsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-01 21:34:20 +02:00
Michael Niedermayer
b99a8e4e4a Merge commit '8c9c5479c4ba729b4ba868ab541a90b2061a7c2f' 
* commit '8c9c5479c4ba729b4ba868ab541a90b2061a7c2f':
  rtp: Add an option to set the send/receive buffer size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-01 21:12:47 +02:00
Michael Niedermayer
fde2e35e56 Merge commit '3c47e7c4350f73fc77d8e76f0dd6d2946b13c5cc' 
* commit '3c47e7c4350f73fc77d8e76f0dd6d2946b13c5cc':
  rtp: Map the urloptions to AVOptions

Conflicts:
	libavformat/rtpproto.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-01 21:03:10 +02:00
Michael Niedermayer
5dd5b7d531 Revert "avcodec/exr: fix memset first arg in reverse_lut()" 
This reverts commit 586ba24ff2.

Fixes Ticket 4386

Found-by: Martin Vignali <martin.vignali@gmail.com>
 2015-04-01 19:53:23 +02:00
Himangi Saraogi
5b02e84bdb lavc/smvjpegdec: Avoid null dereference and return meaningful error codes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-01 19:33:45 +02:00
Michael Niedermayer
b9fbd034bf avformat/xwma: Use ff_alloc_extradata() 
This prevents the fields from potentially becoming inconsistent in case of errors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-01 18:25:34 +02:00
Michael Niedermayer
5b911f1d5b avformat/webmdashenc: use AVERROR(ENOMEM) for memory allocation failures 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-01 18:11:48 +02:00
Michael Niedermayer
5b32558fd8 tools/sidxindex: Use av_*malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-01 17:43:25 +02:00
Michael Niedermayer
c49e7924a8 avutil/eval: check for av_malloc failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-01 15:59:58 +02:00
Michael Niedermayer
61123634dd avutil/eval: factor av_expr_free() calls out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-01 15:59:58 +02:00
Luca Barbato
e3ec6fe7bb rtsp: Add a buffer_size option 
And forward it to rtp and udp.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-04-01 14:26:35 +02:00
Luca Barbato
8c9c5479c4 rtp: Add an option to set the send/receive buffer size 
It gets forwarded down to UDP.
 2015-04-01 14:26:35 +02:00
Luca Barbato
3c47e7c435 rtp: Map the urloptions to AVOptions 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-04-01 14:26:35 +02:00
Timo Rothenpieler
b63c9a9990 avcodec/nvenc: Fix typoed nv_status checks 
Thanks to Wyatt Aaron for pointing this out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-01 11:55:26 +02:00
Donny Yang
3c912391dd avcodec/png: Clearly separate encoding header and frames 
Signed-off-by: Donny Yang <work@kota.moe>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-01 01:04:40 +02:00
Lukasz Marek
31886968d3 lavu/avstring: add av_append_path_component() funcion 
Convinient function to build paths.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-31 23:50:46 +02:00
wm4
8b76c0eb56 avformat/mp3dec: offset seek index to end of id3v2 tag 
The Xing index won't account for the id3 tag - it's relative to the
headers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-31 23:22:07 +02:00
Michael Niedermayer
2ddedfd39c avcodec/libx265: export choosen picture types 
Fixes part of ticket 4285

Reviewed-by Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-31 20:21:10 +02:00