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_packet.h | |
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_packet.h')
-rw-r--r-- | libmpdemux/demux_packet.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmpdemux/demux_packet.h b/libmpdemux/demux_packet.h index 30cd0010f5..d64291f4e0 100644 --- a/libmpdemux/demux_packet.h +++ b/libmpdemux/demux_packet.h @@ -19,6 +19,7 @@ #ifndef MPLAYER_DEMUX_PACKET_H #define MPLAYER_DEMUX_PACKET_H +#include <stdbool.h> #include <sys/types.h> // Holds one packet/frame/whatever @@ -29,7 +30,7 @@ typedef struct demux_packet { double stream_pts; off_t pos; // position in index (AVI) or file (MPG) unsigned char *buffer; - int flags; // keyframe, etc + bool keyframe; int refcount; // counter for the master packet, if 0, buffer can be free()d struct demux_packet *master; //in clones, pointer to the master packet struct demux_packet *next; |