diff options
author | Clément Bœsch <u@pkh.me> | 2017-04-29 13:49:06 +0200 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2017-04-29 13:49:06 +0200 |
commit | 85452f9ab7aaa6417e8c8b1b2eb285e7dce55a9c (patch) | |
tree | d5d7d31dfade4d09e01122f074a6519925ad3abf /libavfilter/framequeue.h | |
parent | e166fe2e1f0ae175a6b7f1f4b137c1366fd7f633 (diff) | |
parent | e807491fc6a336e4becc0cbc981274a8fde18aba (diff) | |
download | ffmpeg-85452f9ab7aaa6417e8c8b1b2eb285e7dce55a9c.tar.gz |
Merge commit 'e807491fc6a336e4becc0cbc981274a8fde18aba'
* commit 'e807491fc6a336e4becc0cbc981274a8fde18aba':
mpeg12dec: avoid signed overflow in bitrate calculation
mpegvideo_parser: avoid signed overflow in bitrate calculation
This merge is a noop.
2017-04-29 12:54:15 @ubitux michaelni: is 740959fdbfbf804ccd8a6e426b1b1ba321fe5cfb enough to fix the overflow fixed in 58405de0951a843765625159402870c1eea3c3b1?
2017-04-29 12:55:53 @ubitux same question with e807491fc6a336e4becc0cbc981274a8fde18aba
2017-04-29 13:21:45 michaelni ubitux, the libav code refered to is wrong for us and i doubt the problem it fixes applies to us.
2017-04-29 13:24:29 @ubitux michaelni: ok, for both commits?
2017-04-29 13:33:55 michaelni yes, they do more or less the same thing
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavfilter/framequeue.h')
0 files changed, 0 insertions, 0 deletions