generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'abda15a990527557c20848f6ca2f82eb85e76dc9'

Browse Source 
* commit 'abda15a990527557c20848f6ca2f82eb85e76dc9':
  cdg: set the keyframe flag on the first packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-09 21:29:21 +02:00
commit 714d9bd6ee
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/cdg.c
View File

@ -26,6 +26,10 @@
#define CDG_COMMAND 0x09 #define CDG_COMMAND 0x09
#define CDG_MASK 0x3F #define CDG_MASK 0x3F
typedef struct CDGContext {
int got_first_packet;
} CDGContext;
static int read_header(AVFormatContext *s) static int read_header(AVFormatContext *s)
{ {
AVStream *vst; AVStream *vst;
@ -50,6 +54,7 @@ static int read_header(AVFormatContext *s)
static int read_packet(AVFormatContext *s, AVPacket *pkt) static int read_packet(AVFormatContext *s, AVPacket *pkt)
{ {
CDGContext *priv = s->priv_data;
int ret; int ret;
while (1) { while (1) {
@ -59,6 +64,11 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
av_free_packet(pkt); av_free_packet(pkt);
} }
if (!priv->got_first_packet) {
pkt->flags |= AV_PKT_FLAG_KEY;
priv->got_first_packet = 1;
}
pkt->stream_index = 0; pkt->stream_index = 0;
pkt->dts= pkt->dts=
pkt->pts= pkt->pos / CDG_PACKET_SIZE; pkt->pts= pkt->pos / CDG_PACKET_SIZE;
@ -72,6 +82,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
AVInputFormat ff_cdg_demuxer = { AVInputFormat ff_cdg_demuxer = {
.name = "cdg", .name = "cdg",
.long_name = NULL_IF_CONFIG_SMALL("CD Graphics"), .long_name = NULL_IF_CONFIG_SMALL("CD Graphics"),
.priv_data_size = sizeof(CDGContext),
.read_header = read_header, .read_header = read_header,
.read_packet = read_packet, .read_packet = read_packet,
.flags = AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,