diff options
| author | wm4 <wm4@nowhere> | 2013-04-30 00:52:32 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-04-30 00:52:32 +0200 |
| commit | ea7b920184a865a3343001318fc4a32dcfc7b4f5 (patch) | |
| tree | fbefd8539b77ee7473ad73740cc8ffa97bc4ffbe /demux/demux_packet.h | |
| parent | 3dcc83a70609d392c8ecd917dd5c16995424e9c4 (diff) | |
| parent | d98e61ea438db66323734ad1b6bea66411a3c97b (diff) | |
| download | mpv-ea7b920184a865a3343001318fc4a32dcfc7b4f5.tar.bz2 mpv-ea7b920184a865a3343001318fc4a32dcfc7b4f5.tar.xz | |
Merge branch 'master' into low_quality_intel_crap
Conflicts:
video/out/gl_video_shaders.glsl
video/out/vo_opengl.c
Diffstat (limited to 'demux/demux_packet.h')
| -rw-r--r-- | demux/demux_packet.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/demux/demux_packet.h b/demux/demux_packet.h index db5d41402c..39f10b9b74 100644 --- a/demux/demux_packet.h +++ b/demux/demux_packet.h @@ -31,8 +31,6 @@ typedef struct demux_packet { int64_t pos; // position in index (AVI) or file (MPG) unsigned char *buffer; 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; struct AVPacket *avpacket; // original libavformat packet (demux_lavf) } demux_packet_t; |