generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
70,083 Commits 24 Branches 241 Tags 173 MiB
48214956b2
Commit Graph

70083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek Buitenhuis
d617e77cec libx265: Add crf private option 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2015-02-18 10:18:12 -05:00
Derek Buitenhuis
2de887e45b libx265: Reduce the scope of some variables 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2015-02-18 10:16:50 -05:00
Michael Niedermayer
b68d902b6e avformat/ffmenc: Use av_freep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 14:31:11 +01:00
Michael Niedermayer
c8c10a5fc7 avformat/ffmenc: Fix memleak of buf 
Fixes CID1257015

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 14:30:15 +01:00
Clément Bœsch
8087632027 avfilter/showpalette: fix leak in case of error 
Fixes CID1270820
Fixes CID1270818
 2015-02-18 14:04:10 +01:00
Clément Bœsch
80f44eafaa avfilter/palettegen: fix leak in case of error 2015-02-18 14:04:10 +01:00
Clément Bœsch
f40266560b avfilter/paletteuse: fix leak in case of error 
Fixes CID1270819
 2015-02-18 14:04:10 +01:00
Michael Niedermayer
9f6431c8f6 avfilter/af_channelmap: Move potential dereference after NULL check in get_channel_idx() 
Fixes CID1270822

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 13:40:39 +01:00
Michael Niedermayer
bdb3194217 avfilter/vf_qp: Fix leak of out_qp_table_buf 
Fixes CID1270821

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 13:12:06 +01:00
Michael Niedermayer
a76e91bf67 avfilter/avfiltergraph: assert that the heap_bubble index is valid 
This might help coverity

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 12:31:02 +01:00
Michael Niedermayer
424ed1a83e avcodec/faxcompr: Fix memleak 
Fixes CID1270816

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 11:38:00 +01:00
Paul B Mahol
956bd71eeb avcodec/opusdec: remove unused headers 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-02-18 09:58:16 +00:00
Michael Niedermayer
8bc80016c1 avfilter/vf_removelogo: Add () to protect the argument of apply_mask_fudge_factor() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 01:56:19 +01:00
Michael Niedermayer
d501b986a9 swscale/bayer_template: Add () to protect the argument of BAYER_READ() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 01:55:15 +01:00
Michael Niedermayer
0babb896b4 compat/avisynth/windowsPorts/windows2linux: Add () to protect macro arguments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 01:49:35 +01:00
Michael Niedermayer
b7c19aee6c avcodec/wavpack: Add () to protect the arguments of UPDATE_WEIGHT_CLIP() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 01:49:35 +01:00
Michael Niedermayer
dfc2a3982f avcodec/wmalosslessdec: Add () to protect the arguments of WMASIGN() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 01:49:28 +01:00
Supraja Meedinti
092ee6cd32 libavutil: optimize twofish cipher 
before:
lavu       TWOFISH      size: 1048576  runs:   1024  time:   90.052 +- 4.630
after:
lavu       TWOFISH      size: 1048576  runs:   1024  time:   18.085 +- 0.241
gcrypt     TWOFISH      size: 1048576  runs:   1024  time:   25.666 +- 0.307
tomcrypt   TWOFISH      size: 1048576  runs:   1024  time:   18.428 +- 0.363

Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 00:59:55 +01:00
Michael Niedermayer
77ae94727f Merge commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d' 
* commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d':
  riff: Support QT RLE Animation in avi ('rle ' FourCC)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 23:51:39 +01:00
Michael Niedermayer
97bd0e2a93 Merge commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4' 
* commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4':
  riff: Support ProRes in avi (APCH fourcc)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 23:42:54 +01:00
Michael Niedermayer
d06dce21a4 Merge commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd' 
* commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd':
  wmv2: Return meaningful error codes

Conflicts:
	libavcodec/wmv2dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 23:34:36 +01:00
Michael Niedermayer
41572ac698 Merge commit 'f3e045263e445c4ab54d85ecae359494cd96a3e2' 
* commit 'f3e045263e445c4ab54d85ecae359494cd96a3e2':
  qdm2: Return meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 23:26:56 +01:00
Michael Niedermayer
d128794fbc Merge commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012' 
* commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012':
  libxvid: Return meaningful error messages

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

See: 2a89afb376 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 23:13:12 +01:00
Michael Niedermayer
2e786bc498 avcodec/aac_adtstoasc_bsf: Clear extradata_size on allocation failure 
This keeps the fields consistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 22:58:31 +01:00
Michael Niedermayer
38e867f6c0 Merge commit '18f4fa251b0eb36392839f5bf6180f280dc04d8d' 
* commit '18f4fa251b0eb36392839f5bf6180f280dc04d8d':
  aac_adtstoasc_bsf: Check extradata memory allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 22:55:27 +01:00
Michael Niedermayer
62aec0c2d5 Merge commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc' 
* commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc':
  avpacket: Check buffer reference

Conflicts:
	libavcodec/avpacket.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 22:47:36 +01:00
Michael Niedermayer
7a7b77e6c9 Merge commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46' 
* commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46':
  vorbisdec: Check memory allocations

Conflicts:
	libavcodec/vorbisdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 22:39:32 +01:00
Michael Niedermayer
3d5c0ba816 Merge commit 'ec17782e17de1e8501ca213e276dfe5412ff1d11' 
* commit 'ec17782e17de1e8501ca213e276dfe5412ff1d11':
  dvdsubdec: Check memory allocations

Conflicts:
	libavcodec/dvdsubdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 22:31:26 +01:00
Michael Niedermayer
2a1b79d7e6 Merge commit 'e51f22122d23589e93ac4f0b3e570bb925755915' 
* commit 'e51f22122d23589e93ac4f0b3e570bb925755915':
  swscale: Check memory allocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 22:22:17 +01:00
Michael Niedermayer
880cee0044 Merge commit '3035d21b5a77df0e9531df397fc06d59488996c7' 
* commit '3035d21b5a77df0e9531df397fc06d59488996c7':
  nutdec: Check memory allocations

Conflicts:
	libavformat/nutdec.c

See: 55ae13e3de
See: 269845db86
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 22:09:29 +01:00
Michael Niedermayer
95165f7c1b avformat/movenc: Fix stts_entries allocation check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 21:51:35 +01:00
Michael Niedermayer
80c5dc5610 Merge commit 'a8765852158ecb2ae34895fa35ff51dc95c186f9' 
* commit 'a8765852158ecb2ae34895fa35ff51dc95c186f9':
  movenc: Check memory allocations

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 21:50:08 +01:00
Michael Niedermayer
575ed4fe37 Merge commit 'da7e31a240f276836a0b90ca6c0714181b353cc4' 
* commit 'da7e31a240f276836a0b90ca6c0714181b353cc4':
  rmdec: Check memory allocations from ff_rm_alloc_rmstream()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 21:42:36 +01:00
Michael Niedermayer
beae6ac5db Merge commit 'd89e58f53939d91a88aa7042c94d9d1cd364da52' 
* commit 'd89e58f53939d91a88aa7042c94d9d1cd364da52':
  dct-test: Fix initialization syntax

See: 392b4b663c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 21:36:01 +01:00
Michael Niedermayer
563ed912ea Merge commit 'bb7701684c7170dfd5f33a3c7d827265844619f2' 
* commit 'bb7701684c7170dfd5f33a3c7d827265844619f2':
  lavf: Document the codec context initialization

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 21:26:04 +01:00
Michael Niedermayer
2980c8e7d3 Merge commit 'cb70a93ca1e7fae1b5dfb65ad149d311a65206a4' 
* commit 'cb70a93ca1e7fae1b5dfb65ad149d311a65206a4':
  lavc: Document interaction between avcodec_open2() and decoding routines

Conflicts:
	libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 21:25:07 +01:00
Michael Niedermayer
79216a189b Merge commit '733f4b05f0e120ddd0393b23f2b6d9106cf922e4' 
* commit '733f4b05f0e120ddd0393b23f2b6d9106cf922e4':
  avplay: Check format allocation inside decode_thread()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 21:16:34 +01:00
Michael Niedermayer
32b2b7bd8c Merge commit '266f241193b2fa8c99bb8b1f007c66bedd3b7d97' 
* commit '266f241193b2fa8c99bb8b1f007c66bedd3b7d97':
  avplay: Check frame allocation inside video_thread()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 21:09:11 +01:00
Michael Niedermayer
15cd2a93e7 Merge commit '81688e68f93f3142e2093f1a3d226edaeb179992' 
* commit '81688e68f93f3142e2093f1a3d226edaeb179992':
  avconv: Check rc_override memory allocation

Conflicts:
	ffmpeg_opt.c

See: 7efabffc28
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 21:00:04 +01:00
Michael Niedermayer
9d5017a20c Merge commit '9d3b752fceb0f2a42cac7c2a1109b0629823c99f' 
* commit '9d3b752fceb0f2a42cac7c2a1109b0629823c99f':
  graphparser: Check av_get_token() memory error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 20:48:22 +01:00
Michael Niedermayer
a4cd057bc7 avformat/matroskaenc: Use the correct data type for the chapter times 
Fixes potential integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 20:40:00 +01:00
Michael Niedermayer
d302853bca Merge commit '5dc47a2bd52e375ed742c45d08356b45098f458d' 
* commit '5dc47a2bd52e375ed742c45d08356b45098f458d':
  matroskaenc: Validate chapter start and end times

Conflicts:
	libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 20:25:47 +01:00
Michael Niedermayer
d2668ae472 Merge commit 'f8c1719771dc4ac2e13e6bc8bf741854a30e3a86' 
* commit 'f8c1719771dc4ac2e13e6bc8bf741854a30e3a86':
  dca: Remove separate header for DCA ExSS

Conflicts:
	libavcodec/dca.h
	libavcodec/dca_exss.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 20:18:19 +01:00
Michael Niedermayer
03dab49a12 avcodec/vp56: Add () to protect TRANSPOSE()s arguments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 19:13:26 +01:00
Vittorio Giovara
195942ed9b riff: Support QT RLE Animation in avi ('rle ' FourCC) 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-02-17 12:18:20 -05:00
Vittorio Giovara
c78dc12118 riff: Support ProRes in avi (APCH fourcc) 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-02-17 12:18:20 -05:00
Himangi Saraogi
42c8f92e2f wmv2: Return meaningful error codes 2015-02-17 12:18:20 -05:00
Himangi Saraogi
f3e045263e qdm2: Return meaningful error codes 2015-02-17 12:18:20 -05:00
Himangi Saraogi
a1e2c47cd4 libxvid: Return meaningful error messages 2015-02-17 12:18:20 -05:00
Himangi Saraogi
18f4fa251b aac_adtstoasc_bsf: Check extradata memory allocation 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-02-17 12:18:10 -05:00