summaryrefslogtreecommitdiff
path: root/libavformat/version.h
diff options
context:
space:
mode:
authorMarton Balint <cus@passwd.hu>2012-05-07 20:27:08 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-05-14 23:40:46 +0200
commit94a9ac127703eb6af25dd474b0f6ce5e2b54bdee (patch)
tree5ae694935d3c12ad39a833196c460a8b07a4ddee /libavformat/version.h
parent9cf5bcded074cf3294ee1bd4800ec54f1a09a979 (diff)
lavf: add av_guess_frame_sample_aspect_ratio function
Guesses the sample aspect ratio of a frame, based on both the stream and the frame aspect ratio. Since the frame aspect ratio is set by the codec but the stream aspect ratio is set by the demuxer, these two may not be equal. This function tries to return the value that you should use if you would like to display the frame. Basic logic is to use the stream aspect ratio if it is set to something sane otherwise use the frame aspect ratio. This way a container setting, which is usually easy to modify can override the coded value in the frames. Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/version.h')
-rw-r--r--libavformat/version.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/version.h b/libavformat/version.h
index a3143c395f..17f8b161c1 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -30,7 +30,7 @@
#include "libavutil/avutil.h"
#define LIBAVFORMAT_VERSION_MAJOR 54
-#define LIBAVFORMAT_VERSION_MINOR 4
+#define LIBAVFORMAT_VERSION_MINOR 5
#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \