[FFmpeg-cvslog] avformat/oggparsedirac: Export sample aspect ratio

Michael Niedermayer git at videolan.org
Thu Dec 17 19:11:16 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Dec 17 16:01:43 2015 +0100| [e839db2288447db471af3e4643d1f350265cd1ac] | committer: Michael Niedermayer

avformat/oggparsedirac: Export sample aspect ratio

Reviewed-by: Hendrik Leppkes <h.leppkes at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e839db2288447db471af3e4643d1f350265cd1ac
---

 libavformat/oggparsedirac.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/oggparsedirac.c b/libavformat/oggparsedirac.c
index a39ea4a..3e5e393 100644
--- a/libavformat/oggparsedirac.c
+++ b/libavformat/oggparsedirac.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/imgutils.h"
 #include "libavutil/intreadwrite.h"
 #include "libavcodec/dirac.h"
 #include "avformat.h"
@@ -51,6 +52,8 @@ static int dirac_header(AVFormatContext *s, int idx)
     st->codec->colorspace      = dsh->colorspace;
     st->codec->profile         = dsh->profile;
     st->codec->level           = dsh->level;
+    if (av_image_check_sar(st->codec->width, st->codec->height, dsh->sample_aspect_ratio) >= 0)
+        st->sample_aspect_ratio = dsh->sample_aspect_ratio;
 
     // dirac in ogg always stores timestamps as though the video were interlaced
     avpriv_set_pts_info(st, 64, dsh->framerate.den, 2 * dsh->framerate.num);



More information about the ffmpeg-cvslog mailing list