generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
67,829 Commits 24 Branches 241 Tags 173 MiB
4e20e94921
Commit Graph

67829 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
ecb748866e Merge commit '8e104619a627fcf5f4c2bd3c09d0c2d323aae745' 
* commit '8e104619a627fcf5f4c2bd3c09d0c2d323aae745':
  shorten: check for return value

Conflicts:
	libavcodec/shorten.c

See: e20ebe491c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 14:21:58 +01:00
Michael Niedermayer
785f71fcd5 Merge commit 'd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a' 
* commit 'd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a':
  dcadec: initialize variables before use

Conflicts:
	libavcodec/dcadec.c

See: 53918a1c54
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 14:21:18 +01:00
Michael Niedermayer
2c4d5d3497 Merge commit '1a9c1333b5d70b427c82cb98f383aa2fa9b2b319' 
* commit '1a9c1333b5d70b427c82cb98f383aa2fa9b2b319':
  escape124: explicitly set get_bits1 variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 14:01:41 +01:00
Michael Niedermayer
9b424accbe Merge commit '2ffb0598dbdb81c40650952aa9299fa02fa5e834' 
* commit '2ffb0598dbdb81c40650952aa9299fa02fa5e834':
  mlpdec: check for negative index

Conflicts:
	libavcodec/mlpdec.c

See: 8491ac3ad2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 13:59:53 +01:00
Michael Niedermayer
e266e186cf Merge commit '6abe7edabb7d57e82d7ea6312d30cf05d2192c5b' 
* commit '6abe7edabb7d57e82d7ea6312d30cf05d2192c5b':
  ffv1: fix out-of-bounds read

The change should be harmless but theres no out of array access before
the change

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 13:46:54 +01:00
Michael Niedermayer
198e55bfa7 Merge commit '5aa710f46119bb9c1c38542f80f5338eb8b5ffb2' 
* commit '5aa710f46119bb9c1c38542f80f5338eb8b5ffb2':
  vorbisenc: add missing parenthesis

Conflicts:
	libavcodec/vorbisenc.c

See: f72b735d41
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 13:34:39 +01:00
Michael Niedermayer
b882079b12 Merge commit 'e9a6ae775dabef3942632e8d4ef95fff94a1b310' 
* commit 'e9a6ae775dabef3942632e8d4ef95fff94a1b310':
  dpxenc: mention missing break

Conflicts:
	libavcodec/dpxenc.c

No change as the changed code is implemented differently in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 13:32:08 +01:00
Michael Niedermayer
ccfae03815 Merge commit '4dda5e9b0829b119c17d950906c61d3ebffc494f' 
* commit '4dda5e9b0829b119c17d950906c61d3ebffc494f':
  sunrastenc: mention missing break

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 13:31:08 +01:00
Michael Niedermayer
ef4e54e0df Merge commit '28d82b7675bea76a1349070a3cdd737d964d4775' 
* commit '28d82b7675bea76a1349070a3cdd737d964d4775':
  vc1dec: refactor check with missing parenthesis

Conflicts:
	libavcodec/vc1_mc.c
	tests/ref/fate/vc1_ilaced_twomv

Theres no change to the reference checksums as this bug was not
in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 13:23:42 +01:00
Michael Niedermayer
94cf1ef008 Merge commit '2c98dc75f2802a2fe91922d4a11b698b66420e5b' 
* commit '2c98dc75f2802a2fe91922d4a11b698b66420e5b':
  vc1dec: always initialize tx and ty

Not merged, tx/ty are initialized on every codepath before use

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 13:11:41 +01:00
Michael Niedermayer
7f8ef7876e Merge commit 'e3f50f247155216229e34f165bae8c329d5a001e' 
* commit 'e3f50f247155216229e34f165bae8c329d5a001e':
  dnxhdenc: check negative index

Conflicts:
	libavcodec/dnxhdenc.c

Not merged, the cid index thats taken out of our table will be found again in
said table.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 12:56:32 +01:00
Michael Niedermayer
76fa78911f Merge commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67' 
* commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67':
  display: fix order of operands

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 12:53:31 +01:00
Michael Niedermayer
946a5cb64d Merge commit 'bdcb5794f0c2d74371152303bffe4172671af264' 
* commit 'bdcb5794f0c2d74371152303bffe4172671af264':
  nellymoserenc: fix array index

Not merged, the original code was correct.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 12:38:05 +01:00
Michael Niedermayer
0f29e92091 Merge commit 'aa7c429c4e8e561009176d51b7dcb626c85eb276' 
* commit 'aa7c429c4e8e561009176d51b7dcb626c85eb276':
  nellymoserenc: fix array element ordering

See: 62722ae2d4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 12:13:06 +01:00
Michael Niedermayer
7b824e8b25 Merge commit '8dd0a2c5cf40a8a49faae985adc11750b6429132' 
* commit '8dd0a2c5cf40a8a49faae985adc11750b6429132':
  libopusenc: prevent an out-of-bounds read by returning early

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 12:12:27 +01:00
Michael Niedermayer
3c6e148e84 Merge commit 'b09cf8afc5199d359ac985ad7cea72a6a9f20e4e' 
* commit 'b09cf8afc5199d359ac985ad7cea72a6a9f20e4e':
  libopusenc: check return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 12:02:05 +01:00
Michael Niedermayer
8e6084eebe Merge commit '29234f56818135faf2f1868ab324c073abd28fbd' 
* commit '29234f56818135faf2f1868ab324c073abd28fbd':
  vp7: fix checking vp7_feature_value_size()

See: 28f8114bd2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 12:00:29 +01:00
Michael Niedermayer
64e12aec96 Merge commit '68a35473ed423a14731c418939fba7913647979a' 
* commit '68a35473ed423a14731c418939fba7913647979a':
  4xm: more thorought check for negative index and negative shift

Conflicts:
	libavcodec/4xm.c

Mostly not merged, the added checks, check for impossible conditions
for paranoias sake they are replaced by asserts but thats probably overkill
the vlc table does not contain out of range values or holes,
nor does it permit the log2 values to become negative. Whenever a
log2 value reaches 0 the selected table no longer contains an entry to trigger
the case that would decrease it further

Adding such impossible checks would confuse the reader

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 11:37:59 +01:00
Michael Niedermayer
3e1ac10345 avcodec/utils: Add ATRAC3+ to av_get_audio_frame_duration() 
Fixes Ticket3979

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-13 02:48:40 +01:00
Vittorio Giovara
a2448cfe16 jpeg2000: do not compute the same value twice 
CC: libav-stable@libav.org
Bug-Id: CID 1026771 / CID 1026772 / CID 1026773
 2014-11-13 01:41:27 +01:00
Vittorio Giovara
59846452af svq1enc: check ff_get_buffer return value 
CC: libav-stable@libav.org
Bug-Id: CID 747723
 2014-11-13 01:41:27 +01:00
Vittorio Giovara
994ab1804b ansi: check ff_set_dimensions return value 
CC: libav-stable@libav.org
Bug-Id: CID 1135737
 2014-11-13 01:41:27 +01:00
Vittorio Giovara
c7384664ba avs: check ff_set_dimensions return value 
CC: libav-stable@libav.org
Bug-Id: CID 1135738
 2014-11-13 01:41:27 +01:00
Vittorio Giovara
2b5c1efa14 g2meet: check ff_set_dimensions return value 
CC: libav-stable@libav.org
Bug-Id: CID 1135739
 2014-11-13 01:41:26 +01:00
Vittorio Giovara
c6d7c201df indeo3: check ff_set_dimensions return value 
CC: libav-stable@libav.org
Bug-Id: CID 1135740
 2014-11-13 01:41:26 +01:00
Vittorio Giovara
8e104619a6 shorten: check for return value 
Avoid a possible negative bitshift.

CC: libav-stable@libav.org
Bug-Id: CID 1194400
 2014-11-13 01:41:26 +01:00
Vittorio Giovara
d5d2d6c3b8 dcadec: initialize variables before use 
CC: libav-stable@libav.org
Bug-Id: CID 700751 / CID 700752
 2014-11-13 01:41:26 +01:00
Vittorio Giovara
1a9c1333b5 escape124: explicitly set get_bits1 variable 
Makes coverity less confused.

CC: libav-stable@libav.org
Bug-Id: CID 1203487
 2014-11-13 01:41:26 +01:00
Vittorio Giovara
2ffb0598db mlpdec: check for negative index 
CC: libav-stable@libav.org
Bug-Id: CID 970924
 2014-11-13 01:41:26 +01:00
Vittorio Giovara
6abe7edabb ffv1: fix out-of-bounds read 
CC: libav-stable@libav.org
Bug-Id: CID 1047234
 2014-11-13 01:41:26 +01:00
Vittorio Giovara
5aa710f461 vorbisenc: add missing parenthesis 
Bug-Id: CID 1238791
 2014-11-13 01:41:26 +01:00
Vittorio Giovara
e9a6ae775d dpxenc: mention missing break 
Bug-Id: CID 732229
 2014-11-13 01:41:26 +01:00
Vittorio Giovara
4dda5e9b08 sunrastenc: mention missing break 
Bug-Id: CID 732231
 2014-11-13 01:41:26 +01:00
Vittorio Giovara
28d82b7675 vc1dec: refactor check with missing parenthesis 
FATE tests updated accordingly, no visual difference.

CC: libav-stable@libav.org
Bug-Id: CID 1087087
 2014-11-13 01:41:25 +01:00
Vittorio Giovara
2c98dc75f2 vc1dec: always initialize tx and ty 
CC: libav-stable@libav.org
Bug-Id: CID 1245702 / CID 1245703
 2014-11-13 01:41:25 +01:00
Vittorio Giovara
e3f50f2471 dnxhdenc: check negative index 
CC: libav-stable@libav.org
Bug-Id: CID 700464
 2014-11-13 01:41:25 +01:00
Vittorio Giovara
b1b1a7370e display: fix order of operands 
CC: libav-stable@libav.org
Bug-Id: CID 1238828 / CID 1238832
 2014-11-13 01:41:25 +01:00
Vittorio Giovara
bdcb5794f0 nellymoserenc: fix array index 
CC: libav-stable@libav.org
Bug-Id: CID 732258
 2014-11-13 01:41:25 +01:00
Michael Niedermayer
aa7c429c4e nellymoserenc: fix array element ordering 
Fixes assertion failures and valgrind warnings in trellis encoder.

CC: libav-stable@libav.org
Bug-Id: CID 732256 / CID 732257
 2014-11-13 01:41:25 +01:00
Vittorio Giovara
8dd0a2c5cf libopusenc: prevent an out-of-bounds read by returning early 
CC: libav-stable@libav.org
Bug-Id: CID 1244188
 2014-11-13 01:41:25 +01:00
Vittorio Giovara
b09cf8afc5 libopusenc: check return value 
CC: libav-stable@libav.org
Bug-Id: CID 739870
 2014-11-13 01:41:25 +01:00
Michael Niedermayer
29234f5681 vp7: fix checking vp7_feature_value_size() 
CC: libav-stable@libav.org
Bug-Id: CID 1197061
 2014-11-13 01:41:25 +01:00
Vittorio Giovara
68a35473ed 4xm: more thorought check for negative index and negative shift 
CC: libav-stable@libav.org
Bug-Id: CID 1087094
 2014-11-13 01:18:09 +01:00
Michael Niedermayer
2f6bb86f85 swscale/utils: support bayer input + scaling, and bayer input + any supported output 
Fixes Ticket4053

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-12 23:59:37 +01:00
Lukasz Marek
173d51c982 lavu/opt: fix av_opt_get function 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-12 23:34:05 +01:00
Lukasz Marek
5aed6f56d9 ffserver_config: report not closed last tag 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-12 23:33:08 +01:00
Lukasz Marek
5dc0f607e7 lavu/opt: fix memleak in test 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-12 23:32:31 +01:00
Michael Niedermayer
d03867c248 avcodec/dvbsubdec: av_assert* instead of assert() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-12 20:08:24 +01:00
James Almer
84ccc317ce x86/flacdsp: separate decoder and encoder dsp initialization 
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-11-12 14:41:45 -03:00
Michael Niedermayer
39dfe6801a avcodec/dvbsubdec: Cleanup on *malloc failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-12 17:54:52 +01:00