1 https://bugs.gentoo.org/show_bug.cgi?id=479394
4 --- cinelerra/ffmpeg.h.ORIG 2012-07-06 22:40:26.000000000 +0200
5 +++ cinelerra/ffmpeg.h 2013-08-01 12:58:12.342474136 +0200
7 static int convert_cmodel_transfer(VFrame *frame_in,VFrame *frame_out);
8 static int init_picture_from_frame(AVPicture *picture, VFrame *frame);
10 - static CodecID codec_id(char *codec_string);
11 + static AVCodecID codec_id(char *codec_string);
14 static PixelFormat color_model_to_pix_fmt(int color_model);
15 --- cinelerra/ffmpeg.C.ORIG 2013-08-01 11:24:43.794419246 +0200
16 +++ cinelerra/ffmpeg.C 2013-08-01 12:57:48.121473899 +0200
19 avcodec_register_all();
21 - CodecID id = codec_id(codec_string);
22 + AVCodecID id = codec_id(codec_string);
23 codec = avcodec_find_decoder(id);
25 printf("FFMPEG::init no decoder for '%s'", codec_string);
30 -CodecID FFMPEG::codec_id(char *codec_string) {
31 +AVCodecID FFMPEG::codec_id(char *codec_string) {
32 #define CODEC_IS(x) (! strncmp(codec_string, x, 4))
34 if (CODEC_IS(QUICKTIME_DV) ||
35 --- quicktime/ffmpeg/ffmpeg.c.ORIG 2012-07-06 22:40:26.000000000 +0200
36 +++ quicktime/ffmpeg/ffmpeg.c 2013-08-01 12:57:59.025474005 +0200
41 -static enum CodecID find_codec_or_die(const char *name, int type, int encoder)
42 +static enum AVCodecID find_codec_or_die(const char *name, int type, int encoder)
44 const char *codec_string = encoder ? "encoder" : "decoder";
46 --- quicktime/ffmpeg/libavformat/electronicarts.c.ORIG 2012-07-06 22:40:26.000000000 +0200
47 +++ quicktime/ffmpeg/libavformat/electronicarts.c 2013-08-01 13:00:57.855475755 +0200
49 typedef struct EaDemuxContext {
52 - enum CodecID video_codec;
53 + enum AVCodecID video_codec;
55 int video_stream_index;
57 - enum CodecID audio_codec;
58 + enum AVCodecID audio_codec;
59 int audio_stream_index;
60 int audio_frame_counter;
62 --- quicktime/ffmpeg/libavformat/img2.c.ORIG 2012-07-06 22:40:26.000000000 +0200
63 +++ quicktime/ffmpeg/libavformat/img2.c 2013-08-01 12:59:21.408474812 +0200
77 -static enum CodecID av_str2id(const IdStrMap *tags, const char *str)
78 +static enum AVCodecID av_str2id(const IdStrMap *tags, const char *str)
80 str= strrchr(str, '.');
81 if(!str) return CODEC_ID_NONE;
86 -enum CodecID av_guess_image2_codec(const char *filename){
87 +enum AVCodecID av_guess_image2_codec(const char *filename){
88 return av_str2id(img_tags, filename);
91 --- quicktime/ffmpeg/libavformat/matroskadec.c.ORIG 2012-07-06 22:40:26.000000000 +0200
92 +++ quicktime/ffmpeg/libavformat/matroskadec.c 2013-08-01 12:59:57.556475165 +0200
96 for (i = 0; i < matroska->num_tracks; i++) {
97 - enum CodecID codec_id = CODEC_ID_NONE;
98 + enum AVCodecID codec_id = CODEC_ID_NONE;
99 uint8_t *extradata = NULL;
100 int extradata_size = 0;
101 int extradata_offset = 0;
102 @@ -2495,7 +2495,7 @@
106 - /* Set the FourCC from the CodecID. */
107 + /* Set the FourCC from the AVCodecID. */
108 /* This is the MS compatibility mode which stores a
109 * BITMAPINFOHEADER in the CodecPrivate. */
110 if (!strcmp(track->codec_id,
111 @@ -2600,7 +2600,7 @@
113 if (codec_id == CODEC_ID_NONE) {
114 av_log(matroska->ctx, AV_LOG_INFO,
115 - "Unknown/unsupported CodecID %s.\n",
116 + "Unknown/unsupported AVCodecID %s.\n",
120 --- quicktime/ffmpeg/libavformat/matroska.h.ORIG 2012-07-06 22:40:26.000000000 +0200
121 +++ quicktime/ffmpeg/libavformat/matroska.h 2013-08-01 13:00:22.218475407 +0200
122 @@ -220,12 +220,12 @@
124 typedef struct CodecTags{
130 typedef struct CodecMime{
136 #define MATROSKA_CODEC_ID_VIDEO_VFW_FOURCC "V_MS/VFW/FOURCC"
137 --- quicktime/ffmpeg/libavformat/mov.c.ORIG 2012-07-06 22:40:26.000000000 +0200
138 +++ quicktime/ffmpeg/libavformat/mov.c 2013-08-01 12:59:33.935474934 +0200
141 for(pseudo_stream_id=0; pseudo_stream_id<entries; pseudo_stream_id++) {
142 //Parsing Sample description table
146 MOV_atom_t a = { 0, 0, 0 };
147 offset_t start_pos = url_ftell(pb);
148 --- quicktime/ffmpeg/libavformat/mxf.c.ORIG 2012-07-06 22:40:26.000000000 +0200
149 +++ quicktime/ffmpeg/libavformat/mxf.c 2013-08-01 12:59:12.025474720 +0200
153 unsigned matching_len;
159 --- quicktime/ffmpeg/libavformat/riff.h.ORIG 2012-07-06 22:40:26.000000000 +0200
160 +++ quicktime/ffmpeg/libavformat/riff.h 2013-08-01 12:59:45.950475052 +0200
162 extern const AVCodecTag codec_wav_tags[];
164 unsigned int codec_get_tag(const AVCodecTag *tags, int id);
165 -enum CodecID codec_get_id(const AVCodecTag *tags, unsigned int tag);
166 +enum AVCodecID codec_get_id(const AVCodecTag *tags, unsigned int tag);
167 void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale);
169 #endif /* FFMPEG_RIFF_H */
170 --- quicktime/ffmpeg/libavformat/rtp.c.ORIG 2012-07-06 22:40:26.000000000 +0200
171 +++ quicktime/ffmpeg/libavformat/rtp.c 2013-08-01 12:59:01.778474619 +0200
174 const char enc_name[6];
175 enum CodecType codec_type;
176 - enum CodecID codec_id;
177 + enum AVCodecID codec_id;
180 } AVRtpPayloadTypes[]=
185 -enum CodecID ff_rtp_codec_id(const char *buf, enum CodecType codec_type)
186 +enum AVCodecID ff_rtp_codec_id(const char *buf, enum CodecType codec_type)
190 --- quicktime/ffmpeg/libavformat/rtp_internal.h.ORIG 2012-07-06 22:40:26.000000000 +0200
191 +++ quicktime/ffmpeg/libavformat/rtp_internal.h 2013-08-01 13:00:09.147475279 +0200
193 // fields from AVRtpDynamicPayloadType_s
194 const char enc_name[50]; /* XXX: still why 50 ? ;-) */
195 enum CodecType codec_type;
196 - enum CodecID codec_id;
197 + enum AVCodecID codec_id;
200 int (*parse_sdp_a_line) (AVStream * stream,
203 void ff_rtp_send_data(AVFormatContext *s1, const uint8_t *buf1, int len, int m);
204 const char *ff_rtp_enc_name(int payload_type);
205 -enum CodecID ff_rtp_codec_id(const char *buf, enum CodecType codec_type);
206 +enum AVCodecID ff_rtp_codec_id(const char *buf, enum CodecType codec_type);
208 void av_register_rtp_dynamic_payload_handlers(void);
210 --- quicktime/wma.h.ORIG 2012-07-06 22:40:26.000000000 +0200
211 +++ quicktime/wma.h 2013-08-01 13:11:46.431482103 +0200
214 extern void quicktime_init_codec_wmav1(quicktime_audio_map_t *);
215 extern void quicktime_init_codec_wmav2(quicktime_audio_map_t *);
216 +#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000