diff options
author | Uoti Urpala <uau@mplayer2.org> | 2012-07-25 00:23:27 +0300 |
---|---|---|
committer | Uoti Urpala <uau@mplayer2.org> | 2012-07-25 01:10:30 +0300 |
commit | 8079f4ff821aa811de449f08dfdba777e8dd0397 (patch) | |
tree | 4f18f58d5e0fafc317e7d5541f5f291db7532d06 /libmpdemux/demux_mov.c | |
parent | 5f3c3f8c32d20405a2caf7de66aa1ea7f513d4d2 (diff) | |
download | mpv-8079f4ff821aa811de449f08dfdba777e8dd0397.tar.bz2 mpv-8079f4ff821aa811de449f08dfdba777e8dd0397.tar.xz |
demux, vd_ffmpeg: fix demux keyframe flag, set AV_PKT_FLAG_KEY
There was some confusion about the "flags" field in demuxer packets.
Demuxers set it to either 1 or 0x10 to indicate a keyframe (and the
field was not used to indicate anything else). This didn't cause
visible problems because nothing read the value. Replace the "flags"
field with a boolean "keyframe" field. Set AV_PKT_FLAG_KEY based on
this field in packets fed to libavcodec video decoders (looks like PNG
and ZeroCodec are the only ones which depend on values from demuxer;
previously this was hardcoded to true for PNG).
Make demux_mf set the keyframe field in every packet. This matters for
PNG files now that the demuxer flag is forwarded to libavcodec.
Fix logic setting the field in demux_mkv. It had probably not been
updated when adding SimpleBlock support. This probably makes no
difference for any current practical use.
Diffstat (limited to 'libmpdemux/demux_mov.c')
-rw-r--r-- | libmpdemux/demux_mov.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index bccf808465..96fb1a2d86 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -2195,7 +2195,6 @@ if(trak->pos==0 && trak->stream_header_len>0){ trak->stream_header = NULL; trak->stream_header_len = 0; dp->pts=pts; - dp->flags=0; dp->pos=pos; // FIXME? ds_add_packet(ds,dp); } else |