Bug fix of wrong video frame rate with FFmpeg

Change-Id: Iff3f19a062aedad56a4c28bf9ac2036cf792ae1e

diff --git a/formats/ffmpeg/Makefile.am b/formats/ffmpeg/Makefile.am
index e41fc133c707ef11ac09a6d128f0a0d5b904aef6..653a8a41de936c116041a8cabcf9cd94cb2ccfad 100755 (executable)
--- a/formats/ffmpeg/Makefile.am
+++ b/formats/ffmpeg/Makefile.am
@@ -57,5 +57,3 @@ libmmfile_formats_la_LIBADD = $(MMCOMMON_LIBS) \
 
 libmmfile_formats_la_CFLAGS += $(DLOG_CFLAGS)
 libmmfile_formats_la_LIBADD += $(DLOG_LIBS)
-
-libmmfile_formats_la_CFLAGS += -D__MMFILE_LIBAV_VERSION__=11.4

diff --git a/formats/ffmpeg/mm_file_format_ffmpeg.c b/formats/ffmpeg/mm_file_format_ffmpeg.c
index 8abe14dc0d88876e73bca7b17b42e59d01700459..c775a307bcc1def3eeea3c001cfbbaf1968a4129 100644 (file)
--- a/formats/ffmpeg/mm_file_format_ffmpeg.c
+++ b/formats/ffmpeg/mm_file_format_ffmpeg.c
@@ -523,11 +523,10 @@ int mmfile_format_read_stream_ffmpg(MMFileFormatContext *formatContext)
                                                                                        1);
 
                                if (videoStream->framePerSec == 0) {
-#ifndef __MMFILE_LIBAV_VERSION__
-                                       videoStream->framePerSec = av_q2d(pFormatCtx->streams[i]->r_frame_rate);
-#else
-                                       videoStream->framePerSec = av_q2d(pFormatCtx->streams[i]->avg_frame_rate);
-#endif
+                                       if ((int)av_q2d(pFormatCtx->streams[i]->avg_frame_rate) != 0)
+                                               videoStream->framePerSec = av_q2d(pFormatCtx->streams[i]->avg_frame_rate);
+                                       else
+                                               videoStream->framePerSec = av_q2d(pFormatCtx->streams[i]->r_frame_rate);
                                }
 
                                videoStream->width                      = pVideoCodecCtx->width;

diff --git a/packaging/libmm-fileinfo.spec b/packaging/libmm-fileinfo.spec
index b89a8c072cba060ba46856c0c95ad93fbc924670..ba4ea9c42b2a4e571a52db16abafcf0fc4b77cd1 100644 (file)
--- a/packaging/libmm-fileinfo.spec
+++ b/packaging/libmm-fileinfo.spec
@@ -1,6 +1,6 @@
 Name:      libmm-fileinfo
 Summary:    Media Fileinfo
-Version:    1.0.0
+Version:    1.0.1
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0