hrev51074 adds 1 changeset to branch 'master'
old head: bc600adbd8c290c9bbfa3cf6e37d5b76ad603287
new head: fbd8cde1832d1e4cfd27503b8df2a1b6494bb63e
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=fbd8cde1832d+%5Ebc600adbd8c2
----------------------------------------------------------------------------
fbd8cde1832d: ffmpeg: remove overzealous assert.
Fixes #12370.
[ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51074
Commit: fbd8cde1832d1e4cfd27503b8df2a1b6494bb63e
URL: http://cgit.haiku-os.org/haiku/commit/?id=fbd8cde1832d
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Fri Apr 7 19:37:57 2017 UTC
Ticket: https://dev.haiku-os.org/ticket/12370
----------------------------------------------------------------------------
1 file changed, 2 insertions(+), 2 deletions(-)
src/add-ons/media/plugins/ffmpeg/Utilities.h | 4 ++--
----------------------------------------------------------------------------
diff --git a/src/add-ons/media/plugins/ffmpeg/Utilities.h
b/src/add-ons/media/plugins/ffmpeg/Utilities.h
index 209bd1e..3903948 100644
--- a/src/add-ons/media/plugins/ffmpeg/Utilities.h
+++ b/src/add-ons/media/plugins/ffmpeg/Utilities.h
@@ -44,7 +44,6 @@
ConvertAVCodecContextToVideoAspectWidthAndHeight(AVCodecContext& contextIn,
uint16& pixelWidthAspectOut, uint16& pixelHeightAspectOut)
{
assert(contextIn.sample_aspect_ratio.num >= 0);
- assert(contextIn.sample_aspect_ratio.den > 0);
assert(contextIn.width > 0);
assert(contextIn.height > 0);
@@ -53,7 +52,8 @@
ConvertAVCodecContextToVideoAspectWidthAndHeight(AVCodecContext& contextIn,
// Aßmus
AVRational pixelAspectRatio;
- if (contextIn.sample_aspect_ratio.num == 0) {
+ if (contextIn.sample_aspect_ratio.num == 0
+ || contextIn.sample_aspect_ratio.den == 0) {
// AVCodecContext doesn't contain a video aspect ratio, so
calculate it
// ourselve based solely on the video dimensions
av_reduce(&pixelAspectRatio.num, &pixelAspectRatio.den,
contextIn.width,