generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
69,016 Commits 24 Branches 241 Tags 173 MiB
4207c5a4ce
Commit Graph

69016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
93870f0a0b Merge commit '3852e2c926ddb166c7aa69c4644a86100ea144d9' 
* commit '3852e2c926ddb166c7aa69c4644a86100ea144d9':
  libopenh264enc: Fix a typo and some nitpicks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 17:27:19 +01:00
Michael Niedermayer
de8f70b8e0 Merge commit '71ec3d36fa6122b3b6c5c68a21b9c70cb2e668e8' 
* commit '71ec3d36fa6122b3b6c5c68a21b9c70cb2e668e8':
  doc: Add initial documentation about the OpenH264 encoder wrapper

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 17:13:38 +01:00
Carl Eugen Hoyos
26ac6d5435 lavfi/boxblur: Readd 8bit colour spaces on big-endian. 2015-01-08 15:24:59 +01:00
Michael Niedermayer
bf3126db6a avformat/hlsenc: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 14:51:04 +01:00
Michael Niedermayer
26c72d2941 avformat/img2dec: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 14:50:34 +01:00
Michael Niedermayer
50bb9b87ab avformat/img2enc: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 14:50:07 +01:00
Michael Niedermayer
b565fd4464 avformat/hdsenc: Simplify code by using avio_closep() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 14:13:36 +01:00
Michael Niedermayer
e5993aeb60 avdevice/lavfi: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 14:11:44 +01:00
Michael Niedermayer
eb3e661bab ffserver: Use avio_closep() to avoid leaving stale pointers in memor 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 14:11:12 +01:00
Michael Niedermayer
78cb3c069d ffmpeg: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 14:10:58 +01:00
Michael Niedermayer
558cef8860 ffmpeg_opt: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 14:10:23 +01:00
Martin Storsjö
2dbd35b00c libfdk-aacdec: Make sure decoding doesn't add any extra delay in the latest version of fdk-aac 
The latest version added support for a new option for enabling
a signal level limiter, which adds some extra delay. In fdk-aac, this
is enabled by default, but disable it by default here since we'd rather
have zero-delay decoding.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-01-08 13:58:43 +02:00
Martin Storsjö
3852e2c926 libopenh264enc: Fix a typo and some nitpicks 
Also move the .long_name entry to below the .name entry.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-01-08 13:53:25 +02:00
Martin Storsjö
71ec3d36fa doc: Add initial documentation about the OpenH264 encoder wrapper 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-01-08 13:53:15 +02:00
Michael Niedermayer
a85f033149 doc/examples/transcoding: Use avio_closep() in examples as it avoids leaving stale pointers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 05:29:10 +01:00
Michael Niedermayer
a63c17cec7 idoc/examples/remuxing: Use avio_closep() in examples as it avoids leaving stale pointers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 05:28:59 +01:00
Michael Niedermayer
c61b84ccfd doc/examples/transcode_aac: Use avio_closep() in examples as it avoids leaving stale pointers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 05:28:51 +01:00
Michael Niedermayer
1d2410639d doc/examples/muxing: Use avio_closep() in examples as it avoids leaving stale pointers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 05:28:15 +01:00
Lou Logan
919e038a95 doc: fix typos 
Signed-off-by: Lou Logan <lou@lrcd.com>
 2015-01-07 17:17:33 -09:00
wm4
bcaa9099b3 avcodec/dvdsubdec: error on bitmaps with size 0 
Attemtping to decode them could lead to invalid writes with some fuzzed
samples.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 01:42:42 +01:00
Michael Niedermayer
3ed80bd95e Merge commit '5a1addd7c1d8ff218ed4b84f4f02fdb83980094c' 
* commit '5a1addd7c1d8ff218ed4b84f4f02fdb83980094c':
  xsub: Support DXSA subtitles

Conflicts:
	libavcodec/xsubdec.c

See: d6f910ea47
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 00:09:13 +01:00
Michael Niedermayer
0e1bb03cb0 Merge commit '01168bf1405ddbf671f1074a927b951b8777adbb' 
* commit '01168bf1405ddbf671f1074a927b951b8777adbb':
  mpeg: Remove unused field

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 22:48:24 +01:00
Michael Niedermayer
e2404096b0 avformat/segment: Clear contexts after deallocation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 22:29:16 +01:00
Michael Niedermayer
2a741baeff Merge commit 'b3f04657368a32a9903406395f865e230b1de348' 
* commit 'b3f04657368a32a9903406395f865e230b1de348':
  segment: Fix the failure paths

Conflicts:
	libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 22:15:45 +01:00
Michael Niedermayer
86e7d20ac2 avcodec/aic: Use av_malloc_array 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 19:46:16 +01:00
Michael Niedermayer
7efabffc28 ffmpeg_opt: Check for av_realloc_array() failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 18:22:37 +01:00
Michael Niedermayer
2d7fd4cc33 ffmpeg_opt: Use av_realloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 18:22:37 +01:00
Michael Niedermayer
e00499eb4c avcodec/libxvid: fix potential integer overflow 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 18:22:31 +01:00
Michael Niedermayer
dfffc4aadc avformat/dvbsub: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 17:21:31 +01:00
Alexandre Colucci
5a1addd7c1 xsub: Support DXSA subtitles 
These have a DXSA tag and contain alpha in addition to
color values for palette.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-01-07 13:51:30 +01:00
Luca Barbato
01168bf140 mpeg: Remove unused field 2015-01-07 13:49:10 +01:00
Michael Niedermayer
ad465e7897 avcodec/mpeg12: Try to fetch pts/dts from both the packet associated with the picture start code as well as earlier start codes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 13:25:09 +01:00
Luca Barbato
b3f0465736 segment: Fix the failure paths 
A failure in segment_end() or segment_start() would lead to freeing
a dangling pointer and in general further calls to seg_write_packet()
or to seg_write_trailer() would have the same faulty behaviour.

CC: libav-stable@libav.org
Reported-By: luodalongde@gmail.com
 2015-01-07 12:36:28 +01:00
Michael Niedermayer
69ee915e1c avcodec/parser: add fuzzy mode to ff_fetch_timestamp() 
This will be needed for the following timestamp fix

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 11:52:08 +01:00
Michael Niedermayer
ddae03f69b avcodec/allcodecs: prefer x264 over openh264 if both are available 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 01:15:57 +01:00
Michael Niedermayer
c09eeca546 Merge commit '8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4' 
* commit '8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4':
  libavcodec: Add an OpenH264 encoder wrapper

Conflicts:
	Changelog
	configure
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 00:48:23 +01:00
Michael Niedermayer
cb03d29dec Merge commit '2a1500fb552364488cfbee3e29e296788a3a6bdd' 
* commit '2a1500fb552364488cfbee3e29e296788a3a6bdd':
  movenc: Fix a typo in a comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 00:46:47 +01:00
Michael Niedermayer
0d0a905152 Merge commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f' 
* commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f':
  movenc: Readd an accidentally removed condition

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 00:39:44 +01:00
Michael Niedermayer
4009ee3ecc Merge commit '8e03ca2fff40ce065ea5a516200e777c96cd785e' 
* commit '8e03ca2fff40ce065ea5a516200e777c96cd785e':
  isom: add 'mp1v' fourcc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 00:31:05 +01:00
Michael Niedermayer
89388cf60b Merge commit '1c6183233d56fb27a4a154e7e64ecab98bd877f1' 
* commit '1c6183233d56fb27a4a154e7e64ecab98bd877f1':
  msmpeg4: check memory allocations and propagate errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 00:13:24 +01:00
Michael Niedermayer
40e123bc67 Merge commit 'ed97963bdbf3bb17fca4f9ea0aa1a97722dec907' 
* commit 'ed97963bdbf3bb17fca4f9ea0aa1a97722dec907':
  ulti: invert the order of parameters of ulti_decode_frame()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 00:05:04 +01:00
Michael Niedermayer
f2f88b952d Merge commit '4438c256387a5845e5cdc5c14c43f4047b68301b' 
* commit '4438c256387a5845e5cdc5c14c43f4047b68301b':
  vf_interlace: remove the warning tag in the message

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 00:03:10 +01:00
Michael Niedermayer
82b1bcd7f9 Merge commit '15ea222778caaec0877b3f9938140b707c931d96' 
* commit '15ea222778caaec0877b3f9938140b707c931d96':
  vf_interlace: merge FIELD_LOWER check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 23:50:51 +01:00
Michael Niedermayer
6279cb3597 Merge commit '046f75a970701b4c947d38bfd2186dcc5f2ddae2' 
* commit '046f75a970701b4c947d38bfd2186dcc5f2ddae2':
  vf_interlace: also assert for height

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 23:40:16 +01:00
Michael Niedermayer
ac3f6429ba vfilter/vf_tinterlace: Fix issues with linesize and cols 
Based on patch by Vittorio Giovara <vittorio.giovara@gmail.com> from 696141e898

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 23:21:28 +01:00
Michael Niedermayer
f931b1ef45 Merge commit '696141e898193311c994b399a8dc60713709092f' 
* commit '696141e898193311c994b399a8dc60713709092f':
  vf_interlace: use image width rather than linesize

Conflicts:
	libavfilter/vf_interlace.c

See: f043965cd5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 22:46:10 +01:00
Michael Niedermayer
30cf755548 Merge commit 'fe082998683334e7f573cfe3876810fb80c5249c' 
* commit 'fe082998683334e7f573cfe3876810fb80c5249c':
  build: Use -Werror=format-security

Conflicts:
	configure

See: 97592faa51
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 22:34:08 +01:00
Michael Niedermayer
2ab6deb36f Merge commit '2cef68da69a17ed09c313ba3c3850ec1cc0a80e0' 
* commit '2cef68da69a17ed09c313ba3c3850ec1cc0a80e0':
  vda: error out if decoded CVPixelBuffer is empty

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 22:13:39 +01:00
Michael Niedermayer
9198397115 avcodec/ffv1enc: Fix incompatible pointer type warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 22:05:13 +01:00
Michael Niedermayer
3b3782d74e Merge commit '0352ff102d62ee94e79e0baaf64d5ad4e66f907b' 
* commit '0352ff102d62ee94e79e0baaf64d5ad4e66f907b':
  ffv1: const correctness for encode_rgb_frame()

Conflicts:
	libavcodec/ffv1enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 22:05:06 +01:00