summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-04-20 21:29:22 +0200
committerwm4 <wm4@nowhere>2014-04-21 02:57:16 +0200
commitfd2f40762fb07bb50d385bac287a7ee1da36857c (patch)
treeb037a982c8d50497b74490d306721b18e27cee57 /demux
parent3b5a331c40b936190bb25d4b40474c979bde95da (diff)
downloadmpv-fd2f40762fb07bb50d385bac287a7ee1da36857c.tar.bz2
mpv-fd2f40762fb07bb50d385bac287a7ee1da36857c.tar.xz
demux: export video rotation parameter
Now the rotation hint is propagated everywhere. It just isn't used anywhere yet.
Diffstat (limited to 'demux')
-rw-r--r--demux/demux_lavf.c8
-rw-r--r--demux/stheader.h1
2 files changed, 9 insertions, 0 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index 90fde22eba..08f05c18df 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -478,6 +478,14 @@ static void handle_stream(demuxer_t *demuxer, int i)
/ (float)(codec->height * codec->sample_aspect_ratio.den);
sh_video->i_bps = codec->bit_rate / 8;
+ AVDictionaryEntry *rot = av_dict_get(st->metadata, "rotate", NULL, 0);
+ if (rot && rot->value) {
+ char *end = NULL;
+ long int r = strtol(rot->value, &end, 10);
+ if (end && !end[0])
+ sh_video->rotate = ((r % 360) + 360) % 360;
+ }
+
// This also applies to vfw-muxed mkv, but we can't detect these easily.
sh_video->avi_dts = matches_avinputformat_name(priv, "avi");
diff --git a/demux/stheader.h b/demux/stheader.h
index 2940dc6a4d..99dc35832a 100644
--- a/demux/stheader.h
+++ b/demux/stheader.h
@@ -81,6 +81,7 @@ typedef struct sh_video {
float aspect; // aspect ratio stored in the file (for prescaling)
int i_bps; // == bitrate (compressed bytes/sec)
int disp_w, disp_h; // display size
+ int rotate; // intended display rotation, in degrees, [0, 359]
MP_BITMAPINFOHEADER *bih;
} sh_video_t;