]>
Commit | Line | Data |
---|---|---|
9a9be085 WF |
1 | --- fuse-utils-1.1.1/fmfconv_ff.c.orig 2013-08-26 21:45:51.749946717 +0200 |
2 | +++ fuse-utils-1.1.1/fmfconv_ff.c 2013-08-26 21:46:33.397257449 +0200 | |
3 | @@ -224,7 +224,7 @@ | |
4 | */ | |
5 | ||
6 | static int | |
7 | -add_audio_stream( enum CodecID codec_id, int freq, int stereo ) | |
8 | +add_audio_stream( enum AVCodecID codec_id, int freq, int stereo ) | |
9 | { | |
10 | AVCodecContext *c; | |
11 | ||
12 | @@ -440,7 +440,7 @@ | |
13 | ||
14 | /* add a video output stream */ | |
15 | static int | |
16 | -add_video_stream( enum CodecID codec_id, int w, int h, int timing ) | |
17 | +add_video_stream( enum AVCodecID codec_id, int w, int h, int timing ) | |
18 | { | |
19 | AVCodecContext *c; | |
20 | ||
21 | @@ -674,7 +674,7 @@ | |
22 | { | |
23 | ||
24 | AVCodec *ac, *vc; | |
25 | - enum CodecID acodec, vcodec; | |
26 | + enum AVCodecID acodec, vcodec; | |
27 | ||
28 | ff_picture = NULL; | |
29 | ff_tmp_picture = NULL; |