1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
diff -aur synfig-0.63.02/src/modules/mod_libavcodec/trgt_av.cpp synfig-0.63.02.new/src/modules/mod_libavcodec/trgt_av.cpp
--- synfig-0.63.02/src/modules/mod_libavcodec/trgt_av.cpp 2011-09-29 10:51:41.000000000 +0200
+++ synfig-0.63.02.new/src/modules/mod_libavcodec/trgt_av.cpp 2011-10-31 16:39:03.000000000 +0100
@@ -441,7 +441,7 @@
if( context->coded_frame )
pkt.pts = context->coded_frame->pts;
if( context->coded_frame && context->coded_frame->key_frame)
- pkt.flags |= PKT_FLAG_KEY;
+ pkt.flags |= AV_PKT_FLAG_KEY;
//kluge for raw picture format (they said they'd fix)
if (formatc->oformat->flags & AVFMT_RAWPICTURE)
@@ -463,7 +463,7 @@
if( context->coded_frame )
pkt.pts = context->coded_frame->pts;
if( context->coded_frame && context->coded_frame->key_frame)
- pkt.flags |= PKT_FLAG_KEY;
+ pkt.flags |= AV_PKT_FLAG_KEY;
ret = av_write_frame(formatc, &pkt);
@@ -567,17 +567,17 @@
if (typestring)
{
//formatptr guess_format(type, filename, MIME type)
- format = guess_format(typestring,NULL,NULL);
+ format = av_guess_format(typestring,NULL,NULL);
}
else
{
- format = guess_format(NULL, filename, NULL);
+ format = av_guess_format(NULL, filename, NULL);
}
if(!format)
{
synfig::warning("Unable to Guess the output, defaulting to mpeg");
- format = guess_format("mpeg", NULL, NULL);
+ format = av_guess_format("mpeg", NULL, NULL);
}
if(!format)
@@ -753,7 +753,7 @@
context = st->codec;
context->codec_id = (CodecID)codec_id;
- context->codec_type = CODEC_TYPE_VIDEO;
+ context->codec_type = AVMEDIA_TYPE_VIDEO;
//PARAMETERS MUST BE PASSED IN SOMEHOW (ANOTHER FUNCTION PARAMETER???)
@@ -800,7 +800,7 @@
context = stream->codec;
context->codec_id = (CodecID)codec_id;
- context->codec_type = CODEC_TYPE_AUDIO;
+ context->codec_type = AVMEDIA_TYPE_AUDIO;
/* put sample parameters */
context->bit_rate = 64000;
|
