generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
65,929 Commits 24 Branches 241 Tags 173 MiB
7997d78643
Commit Graph

65929 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Almer
7997d78643 lavc/libwebpenc: use WebPMemoryWriterClear() 
WebPMemoryWriterClear() must be used instead of free() when libwebp ABI version is > 0x0203

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-08-27 15:42:13 -03:00
Michael Niedermayer
7c51f5bd39 swr: aarch64 audio_convert and neon clobber test 
Ported from avresample
Code by:  Mans Rullgard, Janne Grunau, Martin Storsjo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-27 20:06:37 +02:00
Timothy Gu
25cb697d0c bktr: Fix Fabrice's name 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>

This file with the incorrect name was added after the name was fixed in all other files.
This is thus fixing a mistake

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-27 19:17:58 +02:00
James Almer
d3e9bee6f7 lavf/mp3enc: don't abort if audio packets can't be buffered 
Instead skip the picture streams and flush the queued audio packets.
Should address ticket #3851.

Signed-off-by: James Almer <jamrial@gmail.com>
 2014-08-27 13:51:34 -03:00
Jean-Francois Thibert
12df9b9a15 Improved AC3 decoder level support (heavy drc, dialnorm) 
Added support for AC3 heavy dynamic range compression used
to restrict the output range and added a setting to specify
the output target level and use the dialog normalization
field to apply it in the digital domain.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-27 14:31:39 +02:00
Michael Niedermayer
7a67ab5cba ffmpeg_opt: reduce diff to libav in opt_target() by 16 lines 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-27 14:27:30 +02:00
Michael Niedermayer
2082c00ea2 Merge commit 'f5245a9c6206878b892adf3ccbccc9311c202af5' 
* commit 'f5245a9c6206878b892adf3ccbccc9311c202af5':
  avconv: fix parsing the AVOptions for -target

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-27 12:55:31 +02:00
Michael Niedermayer
ad207f1119 Merge commit '1688eef25385089026aba55da1885f70a57815ab' 
* commit '1688eef25385089026aba55da1885f70a57815ab':
  avconv: fix the muxrate values for -target

Conflicts:
	ffmpeg_opt.c

No change, as ffmpegs muxrate is in bits/sec

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-27 12:38:53 +02:00
Michael Niedermayer
127aee4ccb Merge commit '75bbaf2493a71ee66eaabe3c21fadd84d07888de' 
* commit '75bbaf2493a71ee66eaabe3c21fadd84d07888de':
  mpegenc: limit the maximum muxrate

Conflicts:
	libavformat/mpegenc.c

See: 28d35dbe9f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-27 12:00:10 +02:00
Anton Khirnov
f5245a9c62 avconv: fix parsing the AVOptions for -target 
CC: libav-stable@libav.org
 2014-08-27 06:21:55 +00:00
Anton Khirnov
1688eef253 avconv: fix the muxrate values for -target 
The mpegenc private option values are in 50-byte units.

CC: libav-stable@libav.org
 2014-08-27 06:21:55 +00:00
Anton Khirnov
75bbaf2493 mpegenc: limit the maximum muxrate 
It is written to the file as a 22-bit value.

CC: libav-stable@libav.org
 2014-08-27 06:21:54 +00:00
Michael Niedermayer
9e8ab36f54 avformat/mxfenc: dont warn about d10_channelcount being ignored if its not set 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-27 02:13:50 +02:00
Michael Niedermayer
570397c731 Merge commit 'e87f5e4e5f2e2e36b0b7826d708cda7049877af0' 
* commit 'e87f5e4e5f2e2e36b0b7826d708cda7049877af0':
  h264: fully check cropping amount from sps

Conflicts:
	libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-26 22:01:45 +02:00
Michael Niedermayer
9c41b59423 Merge commit '0a024268261d05ccdcf7e03c85fb78d22037a464' 
* commit '0a024268261d05ccdcf7e03c85fb78d22037a464':
  libxvid: K&R formatting cosmetics

Conflicts:
	libavcodec/libxvid.c
	libavcodec/libxvid_rc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-26 21:45:39 +02:00
Michael Niedermayer
ffa90d99fd Merge commit '56a721f020273d69daa8dcb0d99e42a43a0a0d4d' 
* commit '56a721f020273d69daa8dcb0d99e42a43a0a0d4d':
  doc: fix a typo

Conflicts:
	doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-26 20:48:07 +02:00
Michael Niedermayer
7206221d56 Merge commit '4c8bd8ddb049950347a5018fecbca7ee25d48c44' 
* commit '4c8bd8ddb049950347a5018fecbca7ee25d48c44':
  os_support: Adjust an outdated #endif comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-26 20:40:40 +02:00
ThomasVolkert
e15824e75b avformat/rtpdec_h261: Fix sanity checks 
Fixes mbap and quant

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-26 20:37:58 +02:00
Hii
604c4eab2b libx264: fix -b_qfactor and -chromaoffset 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-26 20:03:42 +02:00
Vittorio Giovara
e87f5e4e5f h264: fully check cropping amount from sps 
Even if sps.crop is true, the cropping amount may be zero.
Fixes a sample with a valid but broken container cropping.
 2014-08-26 13:31:29 -04:00
Gabriel Dume
0a02426826 libxvid: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-08-26 19:22:17 +02:00
Gabriel Dume
56a721f020 doc: fix a typo 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-08-26 17:27:15 +02:00
Diego Biurrun
4c8bd8ddb0 os_support: Adjust an outdated #endif comment 2014-08-26 06:34:41 -07:00
Michael Niedermayer
46ad2c4aed avformat/utils: remove assert that tests the same condition as the if() directly above 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-26 15:23:23 +02:00
Michael Niedermayer
bf16872fec avformat/nsvdec: fix out-commented asserts so the function names exist 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-26 15:21:25 +02:00
Michael Niedermayer
85f0bde4f0 avcodec/snowenc: remove out-commented assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-26 15:20:58 +02:00
Michael Niedermayer
cf0e8e7ad4 Merge commit '4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9' 
* commit '4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9':
  mpeg: Write H264 streams at offset 2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-26 14:05:07 +02:00
Michael Niedermayer
ba650ea118 Merge commit 'a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e' 
* commit 'a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e':
  vc1: Fix the skip condition

Conflicts:
	libavcodec/vc1_parser.c

See: ede411dd03
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-26 13:01:06 +02:00
Michael Niedermayer
d5ee74e57d Merge commit 'ab56fabe6294524e99815451ad01e4ff50c6d734' 
* commit 'ab56fabe6294524e99815451ad01e4ff50c6d734':
  vfwcap: Add fallback define for HWND_MESSAGE

The merged commit reverts the HWND_MESSAGE removial, and adds a #ifndef around
    commit 8bc52dbd9d
        vfwcap: Drop fallback VfW defines
        The defines were added long ago when MinGW still lacked them.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-26 12:22:55 +02:00
James Almer
c2c56d54ee configure: update libvpx_vp9_encoder check 
Required to add support for the aq_mode setting.
Any libvpx snapshot prior to 1.3.0 is not recommended for vp9 encoding for that matter.

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-08-26 00:53:50 -03:00
Luca Barbato
4e9e6fa99f mpeg: Write H264 streams at offset 2 
It hints that the content is H264 according to HD-DVD.
 2014-08-26 03:43:13 +02:00
Luca Barbato
a4d3c20035 vc1: Fix the skip condition 
As written in the comment above, skip must be added only if a
start code is found.
 2014-08-26 03:43:13 +02:00
ThomasVolkert
96b2ba68c4 avformat/rtpdec: support for HEVC/H.265 RTP payload format (draft v6) depacketizing 2014-08-26 02:18:08 +02:00
Diego Biurrun
ab56fabe62 vfwcap: Add fallback define for HWND_MESSAGE 
Some obsolete versions of the MinGW32 runtime (<4.0.0) lack the definition.
 2014-08-25 16:41:22 -07:00
Michael Niedermayer
1f7e6c0713 doc/snow: remove possibly wrong todo item 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-26 01:19:26 +02:00
Michael Niedermayer
e96109f93c ffplay: use av_malloc_array() 
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-26 00:41:09 +02:00
Alexander Strasser
db85d11d9d libavformat/ftp: Do not leak memory in routine ftp_features 
Setting the pointer to NULL inside both ftp_send_command
and ftp_features is redundant. Generally always setting to
NULL in ftp_send_command seems safer, but throughout the file
that parameter was always passed initialized. So I do it here
too for consistency.

Should fix CID1231988 (RESOURCE_LEAK)

OKed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
 2014-08-26 00:52:29 +02:00
Christophe Gisquet
f75baa6c9b huffyuvdec: decode the last odd sample 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-25 23:24:07 +02:00
Christophe Gisquet
6ee7681723 huffyuvenc: write last odd sample 
If width is odd, last sample wouldn't be written.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-25 23:12:30 +02:00
Michael Niedermayer
2a85826e57 avcodec/vp9: Use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-25 22:55:11 +02:00
Vignesh Venkatasubramanian
080acf7771 lavf/matroskadec: Ensure cues_end is initialized 
Ensure that cues_start and cues_end are always initialized and
the webm_dash_manifest_cues function returns appropriate error if
they are not computed correctly.

This fixes coverity defect CID1231991.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-25 18:25:39 +02:00
Michael Niedermayer
bb29896793 avutil/opencl: use av_malloc(z)_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-25 16:06:10 +02:00
Michael Niedermayer
52fca28c3b avcodec/vorbisenc: use av_malloc(z)_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-25 16:03:54 +02:00
Michael Niedermayer
beaf86bd02 doc/APIchanges: fill in dates and hashes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-25 15:57:37 +02:00
Michael Niedermayer
d647ef0c80 avcodec/mpegvideo_parser: consider vbv_delay in bitrate heuristic also for mpeg2 
Fixes bitrate detection in CBR mpeg2
Fixes ticket3678
 2014-08-25 14:15:43 +02:00
Michael Niedermayer
08a110ca87 Merge commit '6ee1cb5740e7490151db7dcec7e20ceaf8a2fe1f' 
* commit '6ee1cb5740e7490151db7dcec7e20ceaf8a2fe1f':
  libavformat: use MSG_NOSIGNAL when applicable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-25 13:27:21 +02:00
Michael Niedermayer
215db2935b Merge commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d' 
* commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d':
  lavf: add AVFormatContext.max_ts_probe

Conflicts:
	doc/APIchanges
	libavformat/avformat.h
	libavformat/utils.c
	libavformat/version.h

lavf-fate/mp3 changes as the estimated input bitrate changes and that is
copied to the output

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-25 13:25:09 +02:00
Michael Niedermayer
f1b04f803e Merge commit '6ca11f7157d0ffd11ea9a4211b04981b46dc75d6' 
* commit '6ca11f7157d0ffd11ea9a4211b04981b46dc75d6':
  doc/APIchanges: fill in missing hashes and dates

Conflicts:
	doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-25 12:09:29 +02:00
Rémi Denis-Courmont
6ee1cb5740 libavformat: use MSG_NOSIGNAL when applicable 
If the remote end of a connection oriented socket hangs up, generating
an EPIPE error is preferable over an unhandled SIGPIPE signal.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-08-25 10:49:14 +03:00
Anton Khirnov
b263f8ffe7 lavf: add AVFormatContext.max_ts_probe 
It allows to configure how long will avformat_find_stream_info() wait
to get the first timestamp.
 2014-08-25 05:17:54 +00:00