RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-19 13:27:00 +00:00
Code Issues Projects Releases Wiki Activity
66,614 Commits 37 Branches 400 Tags 271 MiB
298f7f1fac
Commit Graph

66614 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
298f7f1fac Merge commit '7c710c38f6481b892e01d3c1e4781ad160b2935e' into release/2.4 
* commit '7c710c38f6481b892e01d3c1e4781ad160b2935e':
  audiointerleave: check av_new_packet return value

Conflicts:
	libavformat/audiointerleave.c

See: 3ca8a23288
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 01:19:11 +01:00
Michael Niedermayer
fefb152cd9 Merge commit 'a7e79f6a43bdc7e3b164dd78b060f0d5575a0cf0' into release/2.4 
* commit 'a7e79f6a43bdc7e3b164dd78b060f0d5575a0cf0':
  avfilter: check filter link validity

Conflicts:
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 01:11:20 +01:00
Michael Niedermayer
275cd55a0f Merge commit '556a5090f2b0a20fd9998e1a327875f5b0c8d1d5' into release/2.4 
* commit '556a5090f2b0a20fd9998e1a327875f5b0c8d1d5':
  mp3dec: fix reading the Xing tag

Conflicts:
	libavformat/mp3dec.c

See: 19ff479f69
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 01:10:56 +01:00
Michael Niedermayer
749fadaa65 Merge commit '1551602b423755c4ed98c5b7b2c2d6504416726e' into release/2.4 
* commit '1551602b423755c4ed98c5b7b2c2d6504416726e':
  nutdec: check av_new_packet return value

Conflicts:
	libavformat/nutdec.c

See: bb502411dd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 01:10:10 +01:00
Michael Niedermayer
8120061be2 Merge commit '4cd0041d38664adcb6f4b3038e277631b85d5dc8' into release/2.4 
* commit '4cd0041d38664adcb6f4b3038e277631b85d5dc8':
  rmdec: check av_new_packet return value

Conflicts:
	libavformat/rmdec.c

See: c01a462cda
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 01:04:15 +01:00
Michael Niedermayer
34b28d3823 Merge commit 'd1ad85fc020653be5ad25ed1d3d5091e89fee782' into release/2.4 
* commit 'd1ad85fc020653be5ad25ed1d3d5091e89fee782':
  vf_format: check input validity

See: ee16e0cacc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 01:03:19 +01:00
Michael Niedermayer
153a012384 Merge commit '6cf27b550d66963b89b5917568b85c4b49fb18ba' into release/2.4 
* commit '6cf27b550d66963b89b5917568b85c4b49fb18ba':
  aviobuf: check context before using it

See: 7441d1ec33
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 01:02:42 +01:00
Michael Niedermayer
d6f4e475a1 Merge commit '5aceced0a0d235d485e88fda502019b221dbf3d2' into release/2.4 
* commit '5aceced0a0d235d485e88fda502019b221dbf3d2':
  avio: fix sizeof argument

See: a96577df38
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 01:01:57 +01:00
Michael Niedermayer
a299d93928 Merge commit '27487944eff721ef8e310db1a2a52329d9377f71' into release/2.4 
* commit '27487944eff721ef8e310db1a2a52329d9377f71':
  swscale: fix sign extensions in yuv planar conversion

Conflicts:
	libswscale/rgb2rgb_template.c

See: a07e9d72a1
See: a30972609c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 00:51:22 +01:00
Michael Niedermayer
39f2e53a24 Merge commit '51f76e4e932ebdce8ccf6cf0797651d632cfc3e2' into release/2.4 
* commit '51f76e4e932ebdce8ccf6cf0797651d632cfc3e2':
  oss_audio: use a macro to simplify ioctl() error checking

Conflicts:
	libavdevice/oss_audio.c

See: 69c7aad494
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 00:50:34 +01:00
Michael Niedermayer
adfb4661d9 Merge commit 'c246b0b4c3a3b02a714e99423cf23d59f8f81409' into release/2.4 
* commit 'c246b0b4c3a3b02a714e99423cf23d59f8f81409':
  avresample: Make sure the even check does not overflow

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 00:49:47 +01:00
Michael Niedermayer
b400412443 Merge commit 'daef7feb09a0dde2265d56f77de8ae03f9612d47' into release/2.4 
* commit 'daef7feb09a0dde2265d56f77de8ae03f9612d47':
  af_resample: check av_opt_set_dict return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 00:49:07 +01:00
Michael Niedermayer
158cf1d52d Merge commit '2496dbd68b29bd36fbf4753a46163d33f6dae70e' into release/2.4 
* commit '2496dbd68b29bd36fbf4753a46163d33f6dae70e':
  vf_showinfo: Forward the av_image_get_linesize error

Conflicts:
	libavfilter/vf_showinfo.c

See: 2aecfd4f20
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 00:41:02 +01:00
Michael Niedermayer
6fd7456f85 Merge commit '608e8d8dd754199b657b439f9e722e0b45f84461' into release/2.4 
* commit '608e8d8dd754199b657b439f9e722e0b45f84461':
  vf_drawtext: Do not leak the mmapped textfile

Conflicts:
	libavfilter/vf_drawtext.c

See: 6956b048d8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 00:40:14 +01:00
Michael Niedermayer
ee025a0c61 Merge commit '4d48691622149ba5998de08a0acec85d1f4ed46a' into release/2.4 
* commit '4d48691622149ba5998de08a0acec85d1f4ed46a':
  cmdutils: Use the correct guard

Conflicts:
	cmdutils.c

See: 35daf3ca81
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 00:38:44 +01:00
Michael Niedermayer
679c3d210f Merge commit 'bb823e26b1cbb91b475c10772cdfd867d4809a65' into release/2.4 
* commit 'bb823e26b1cbb91b475c10772cdfd867d4809a65':
  avformat: Make avformat_free_context handle NULL

See: ee23dcf534
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 00:38:03 +01:00
Michael Niedermayer
1da83d52bc Merge commit 'b31bb39bdd7b5a53e0d282acc0f0f62b32b17acc' into release/2.4 
* commit 'b31bb39bdd7b5a53e0d282acc0f0f62b32b17acc':
  rtsp: Check a memory allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 00:36:31 +01:00
Michael Niedermayer
564d943b27 avformat/rmdec: Check for overflow in ff_rm_read_mdpr_codecdata() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 03abf55f25)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 00:26:12 +01:00
Michael Niedermayer
aded1110a3 avformat/rmdec: rm_read_extradata: add error message for oversized extradata 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 50f9de59a0)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 00:25:55 +01:00
Michael Niedermayer
365e0652f9 Merge commit '036f5c5420e4529f05fa5180f5fa28ca2c5c4065' into release/2.4 
* commit '036f5c5420e4529f05fa5180f5fa28ca2c5c4065':
  rm: Use the correct codec_data_size signedness

Conflicts:
	libavformat/rm.h
	libavformat/rmdec.c

See: a6f730730b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 00:25:10 +01:00
Michael Niedermayer
1dc53463d9 Merge commit 'da35008c314eae5a10a8c070f5185b7694c0a37e' into release/2.4 
* commit 'da35008c314eae5a10a8c070f5185b7694c0a37e':
  latm: Do not give a score for a single instance

Conflicts:
	libavformat/rawdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 00:24:03 +01:00
Michael Niedermayer
705e0e0513 avformat/mpeg: do not count PES packets inside PES packets during probing 
Fixes: misdetection of test2.mp3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e15b29bb18)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 00:11:01 +01:00
Michael Niedermayer
85d05fdc80 Merge commit '4baee1124b905cbd75240530e081c8ffa68fddbe' into release/2.4 
* commit '4baee1124b905cbd75240530e081c8ffa68fddbe':
  mp3: Tweak the probe scores

Conflicts:
	libavformat/mp3dec.c

See: ef79bbeddd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 00:07:12 +01:00
Michael Niedermayer
c8a2b1ac3c Merge commit 'bbb86717b303a3e4c0809d3cc6fb55580766a17e' into release/2.4 
* commit 'bbb86717b303a3e4c0809d3cc6fb55580766a17e':
  vf_frei0r: do not increment string if it reached the end

See: 02a6ee5168
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 00:06:13 +01:00
Michael Niedermayer
12d6bbf7cb Merge commit '1fd55ec507f6f47b4d9fddf8e79a0df4540ef6e4' into release/2.4 
* commit '1fd55ec507f6f47b4d9fddf8e79a0df4540ef6e4':
  svq1dec: Unbreak the scratch buffer allocation

Conflicts:
	libavcodec/svq1dec.c

See: 4213fc5b9e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 00:05:18 +01:00
Michael Niedermayer
0d801c0bfd Merge commit '20f9cf744a9a82ac4b269cb4317a5d59a8553baf' into release/2.4 
* commit '20f9cf744a9a82ac4b269cb4317a5d59a8553baf':
  vaapi: wrap codec specific functions in appropiate #ifs

Conflicts:
	libavcodec/vaapi.c

See: f2118d44c9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-17 23:58:28 +01:00
Michael Niedermayer
9d43e51eec Merge commit '20d6ae4626a42fbc6e7b9c0040bdd64397b23e11' into release/2.4 
* commit '20d6ae4626a42fbc6e7b9c0040bdd64397b23e11':
  hevc: always clip luma_log2_weight_denom

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-17 23:56:07 +01:00
Michael Niedermayer
73046fa195 Merge commit '23fe589e19487bc9a40b77dae9509068da5b14b8' into release/2.4 
* commit '23fe589e19487bc9a40b77dae9509068da5b14b8':
  prores: Evaluate all the quantizers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-17 23:55:12 +01:00
Michael Niedermayer
0295615f0a Merge commit '9bd4561d74a46dd6557140e286228e09e380674c' into release/2.4 
* commit '9bd4561d74a46dd6557140e286228e09e380674c':
  tiff: Check the check_size() return value and forward it

Conflicts:
	libavcodec/tiffenc.c

See: d50aa006fb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-17 23:25:41 +01:00
Michael Niedermayer
c69fff3790 Merge commit 'cbf31d5f15774b3ffd1e2009159dc7154a767b09' into release/2.4 
* commit 'cbf31d5f15774b3ffd1e2009159dc7154a767b09':
  rtpdec_h263_rfc2190: Clear the stored bits if discarding buffered data

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-17 23:23:27 +01:00
Michael Niedermayer
3c33983b74 Merge commit '21683549edf436024cc3efbc4f8d1d55221c5336' into release/2.4 
* commit '21683549edf436024cc3efbc4f8d1d55221c5336':
  h261dec: Fix context initialization sequence

See: 6c1ee1a114
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-17 23:22:54 +01:00
Michael Niedermayer
e7b8fa2c00 Merge commit 'cbfdbba58e1460bd0791911ad84a6c76b5500a0e' into release/2.4 
* commit 'cbfdbba58e1460bd0791911ad84a6c76b5500a0e':
  cmdutils: check file access functions return values

Conflicts:
	cmdutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-17 23:14:06 +01:00
Michael Niedermayer
0afeb76e75 Merge commit '1411f073fdceeff1f39dbaa035c3c0275f69095f' into release/2.4 
* commit '1411f073fdceeff1f39dbaa035c3c0275f69095f':
  aacenc: correctly check returned value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-17 23:08:10 +01:00
Michael Niedermayer
98d4a07ccf Merge commit '76e9a17f3392e752193015765e9216c2f0716b96' into release/2.4 
* commit '76e9a17f3392e752193015765e9216c2f0716b96':
  lavfi: always check av_expr_parse_and_eval() return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-17 23:07:18 +01:00
Michael Niedermayer
3cc8822c93 Merge commit '3d0752d82f8eaa326cff306ae50b0186a5b4d304' into release/2.4 
* commit '3d0752d82f8eaa326cff306ae50b0186a5b4d304':
  xsub: Support DXSA subtitles

Conflicts:
	libavcodec/xsubdec.c

See: d6f910ea47
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-17 23:01:33 +01:00
Michael Niedermayer
05b1ac2470 Merge commit 'bfe18be88a66da25b60a091de6011197dcb231fd' into release/2.4 
* commit 'bfe18be88a66da25b60a091de6011197dcb231fd':
  mpeg4audio: check the init_get_bits() return value

Conflicts:
	libavcodec/mpeg4audio.c

See: deefdf9788
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-17 23:00:30 +01:00
Michael Niedermayer
cc598bf7dc Merge commit 'f6c82b34a320f105af266997f5951cbe7dfc8a05' into release/2.4 
* commit 'f6c82b34a320f105af266997f5951cbe7dfc8a05':
  segment: Fix the failure paths

Conflicts:
	libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-17 22:56:52 +01:00
Michael Niedermayer
dd4adba811 Merge commit '3280b86c85f5a88397fce0230d1878fee79fbb93' into release/2.4 
* commit '3280b86c85f5a88397fce0230d1878fee79fbb93':
  swscale: check memory allocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-17 22:47:02 +01:00
Michael Niedermayer
ee910aef38 Merge commit '61335ab33e594d47b84fde7367ee10dc66fc3465' into release/2.4 
* commit '61335ab33e594d47b84fde7367ee10dc66fc3465':
  opt: check memory allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-17 22:43:37 +01:00
Michael Niedermayer
cdf37f2548 Merge commit '932caa50a5dec7f2a69da8a417ccae84d19ae5e5' into release/2.4 
* commit '932caa50a5dec7f2a69da8a417ccae84d19ae5e5':
  libavformat: Check for malloc failures in avformat_new_stream

See: a66893ac94
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-17 22:40:39 +01:00
wm4
b96163f055 avformat/utils: check for malloc failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a66893ac94)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-17 22:39:23 +01:00
Michael Niedermayer
1fd7fb9036 Update for 2.4.6 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-13 17:14:46 +01:00
Vittorio Giovara
7c710c38f6 audiointerleave: check av_new_packet return value 
CC: libav-stable@libav.org
Bug-Id: CID 1087078
 2015-01-13 00:02:45 +01:00
Vittorio Giovara
a7e79f6a43 avfilter: check filter link validity 
Remove now redundant check.

CC: libav-stable@libav.org
Bug-Id: CID 700371
 2015-01-13 00:02:32 +01:00
Anton Khirnov
556a5090f2 mp3dec: fix reading the Xing tag 
The quality scale field is only supposed to be present if the fourth bit
is set. In practice, lame always sets it, but other tools might not.

CC:libav-stable@libav.org
 2015-01-13 00:02:16 +01:00
Vittorio Giovara
1551602b42 nutdec: check av_new_packet return value 
CC: libav-stable@libav.org
Bug-Id: CID 733713
 2015-01-13 00:01:33 +01:00
Vittorio Giovara
4cd0041d38 rmdec: check av_new_packet return value 
CC: libav-stable@libav.org
Bug-Id: CID 733714
 2015-01-13 00:01:18 +01:00
Vittorio Giovara
d1ad85fc02 vf_format: check input validity 
CC: libav-stable@libav.org
 2015-01-13 00:01:08 +01:00
Vittorio Giovara
6cf27b550d aviobuf: check context before using it 
Avoid a possible null pointer dereference.

CC: libav-stable@libav.org
Bug-Id: CID 1135769
 2015-01-13 00:00:56 +01:00
Michael Niedermayer
5aceced0a0 avio: fix sizeof argument 
CC: libav-stable@libav.org
Bug-Id: CID 732284
 2015-01-13 00:00:43 +01:00