summaryrefslogtreecommitdiffstats
path: root/demux/demux_lavf.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-10-30 20:55:42 +0100
committerwm4 <wm4@nowhere>2017-10-30 20:55:42 +0100
commita7f4ecb01299835a1afe5cc051be1e9bb5d4f15d (patch)
tree47018827973ad72e5470298349a28bfd50e23a40 /demux/demux_lavf.c
parent1c46bd5e5048a2ba587ed2ff74f416f365624df9 (diff)
downloadmpv-a7f4ecb01299835a1afe5cc051be1e9bb5d4f15d.tar.bz2
mpv-a7f4ecb01299835a1afe5cc051be1e9bb5d4f15d.tar.xz
Bump libav* API use
(Not tested on Windows and OSX.)
Diffstat (limited to 'demux/demux_lavf.c')
-rw-r--r--demux/demux_lavf.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index 11fa1c59b6..ea496ecf95 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -33,13 +33,10 @@
#include <libavutil/avstring.h>
#include <libavutil/mathematics.h>
#include <libavutil/replaygain.h>
+#include <libavutil/spherical.h>
#include <libavutil/display.h>
#include <libavutil/opt.h>
-#if HAVE_AVUTIL_SPHERICAL
-#include <libavutil/spherical.h>
-#endif
-
#include "common/msg.h"
#include "common/tags.h"
#include "common/av_common.h"
@@ -643,7 +640,6 @@ static void handle_new_stream(demuxer_t *demuxer, int i)
sh->codec->rotate = (((int)(-r) % 360) + 360) % 360;
}
-#if HAVE_AVUTIL_SPHERICAL
sd = av_stream_get_side_data(st, AV_PKT_DATA_SPHERICAL, NULL);
if (sd) {
AVSphericalMapping *sp = (void *)sd;
@@ -654,7 +650,6 @@ static void handle_new_stream(demuxer_t *demuxer, int i)
mpsp->ref_angles[1] = sp->pitch / (float)(1 << 16);
mpsp->ref_angles[2] = sp->roll / (float)(1 << 16);
}
-#endif
// This also applies to vfw-muxed mkv, but we can't detect these easily.
sh->codec->avi_dts = matches_avinputformat_name(priv, "avi");
@@ -810,13 +805,6 @@ static int demux_open_lavf(demuxer_t *demuxer, enum demux_check check)
if (index_mode != 1)
avfc->flags |= AVFMT_FLAG_IGNIDX;
-#if LIBAVFORMAT_VERSION_MICRO >= 100
- /* Keep side data as side data instead of mashing it into the packet
- * stream.
- * Note: Libav doesn't have this horrible insanity. */
- av_opt_set(avfc, "fflags", "+keepside", 0);
-#endif
-
if (lavfdopts->probesize) {
if (av_opt_set_int(avfc, "probesize", lavfdopts->probesize, 0) < 0)
MP_ERR(demuxer, "couldn't set option probesize to %u\n",