diff options
author | wm4 <wm4@nowhere> | 2014-02-06 14:05:04 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-02-06 14:05:04 +0100 |
commit | 47bc87208b1325398c7af6fcca3dbd54fd80c518 (patch) | |
tree | b796ae8dc2fa6de648ce0403b2383bdd773ce327 | |
parent | 30ffbc65bd758742e6c1989796a009912bee7222 (diff) | |
download | mpv-47bc87208b1325398c7af6fcca3dbd54fd80c518.tar.bz2 mpv-47bc87208b1325398c7af6fcca3dbd54fd80c518.tar.xz |
demux_lavf: don't check for error when setting "keepside" flag
This flag doesn't exist on Libav (because they never do this insane
packet merging stuff), so this would print unnecessary warnings there.
-rw-r--r-- | demux/demux_lavf.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index cda0d07485..17053a5520 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -562,10 +562,7 @@ static int demux_open_lavf(demuxer_t *demuxer, enum demux_check check) avfc->flags |= AVFMT_FLAG_IGNIDX; /* Keep side data as side data instead of mashing it into the packet * stream. */ - if (av_opt_set(avfc, "fflags", "+keepside", 0) < 0) { - MP_WARN(demuxer, "demux_lavf, couldn't set option keepdata; " - "in-stream metadata updates will be ignored\n"); - } + av_opt_set(avfc, "fflags", "+keepside", 0); if (lavfdopts->probesize) { if (av_opt_set_int(avfc, "probesize", lavfdopts->probesize, 0) < 0) |