1 diff -rupN a/plugins/video/common/dyna.cxx b/plugins/video/common/dyna.cxx
2 --- a/plugins/video/common/dyna.cxx 2013-02-20 02:18:05.000000000 +0000
3 +++ b/plugins/video/common/dyna.cxx 2013-07-22 16:55:47.307946942 +0000
4 @@ -210,7 +210,7 @@ static void logCallbackFFMPEG(void * avc
8 -FFMPEGLibrary::FFMPEGLibrary(CodecID codec)
9 +FFMPEGLibrary::FFMPEGLibrary(AVCodecID codec)
12 if (m_codec==CODEC_ID_H264)
13 @@ -348,12 +348,12 @@ bool FFMPEGLibrary::Load()
17 -AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum CodecID id)
18 +AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum AVCodecID id)
20 return Favcodec_find_encoder(id);
23 -AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum CodecID id)
24 +AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum AVCodecID id)
26 WaitAndSignal m(processLock);
28 diff -rupN a/plugins/video/common/dyna.h b/plugins/video/common/dyna.h
29 --- a/plugins/video/common/dyna.h 2013-02-20 02:18:05.000000000 +0000
30 +++ b/plugins/video/common/dyna.h 2013-07-22 16:55:47.191281134 +0000
31 @@ -88,13 +88,13 @@ class DynaLink
35 - FFMPEGLibrary(CodecID codec);
36 + FFMPEGLibrary(AVCodecID codec);
41 - AVCodec *AvcodecFindEncoder(enum CodecID id);
42 - AVCodec *AvcodecFindDecoder(enum CodecID id);
43 + AVCodec *AvcodecFindEncoder(enum AVCodecID id);
44 + AVCodec *AvcodecFindDecoder(enum AVCodecID id);
45 AVCodecContext *AvcodecAllocContext(void);
46 AVFrame *AvcodecAllocFrame(void);
47 int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec);
48 @@ -117,15 +117,15 @@ class FFMPEGLibrary
49 DynaLink m_libAvcodec;
54 char m_codecString[32];
56 void (*Favcodec_init)(void);
57 void (*Fav_init_packet)(AVPacket *pkt);
59 void (*Favcodec_register_all)(void);
60 - AVCodec *(*Favcodec_find_encoder)(enum CodecID id);
61 - AVCodec *(*Favcodec_find_decoder)(enum CodecID id);
62 + AVCodec *(*Favcodec_find_encoder)(enum AVCodecID id);
63 + AVCodec *(*Favcodec_find_decoder)(enum AVCodecID id);
64 AVCodecContext *(*Favcodec_alloc_context)(void);
65 AVFrame *(*Favcodec_alloc_frame)(void);
66 int (*Favcodec_open)(AVCodecContext *ctx, AVCodec *codec);
67 diff -rupN a/plugins/video/common/ffmpeg/libavcodec/avcodec.h b/plugins/video/common/ffmpeg/libavcodec/avcodec.h
68 --- a/plugins/video/common/ffmpeg/libavcodec/avcodec.h 2013-02-20 02:18:04.000000000 +0000
69 +++ b/plugins/video/common/ffmpeg/libavcodec/avcodec.h 2013-07-22 16:55:47.167947971 +0000
71 * 1. no value of a existing codec ID changes (that would break ABI),
72 * 2. it is as close as possible to similar codecs.
79 @@ -1390,7 +1390,7 @@ typedef struct AVCodecContext {
82 enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
83 - enum CodecID codec_id; /* see CODEC_ID_xxx */
84 + enum AVCodecID codec_id; /* see CODEC_ID_xxx */
87 * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
88 @@ -2843,7 +2843,7 @@ typedef struct AVCodec {
91 enum AVMediaType type;
95 int (*init)(AVCodecContext *);
96 int (*encode)(AVCodecContext *, uint8_t *buf, int buf_size, void *data);
97 @@ -2898,7 +2898,7 @@ typedef struct AVHWAccel {
105 * Supported pixel format.
106 @@ -3402,10 +3402,10 @@ void avcodec_register(AVCodec *codec);
108 * Find a registered encoder with a matching codec ID.
110 - * @param id CodecID of the requested encoder
111 + * @param id AVCodecID of the requested encoder
112 * @return An encoder if one was found, NULL otherwise.
114 -AVCodec *avcodec_find_encoder(enum CodecID id);
115 +AVCodec *avcodec_find_encoder(enum AVCodecID id);
118 * Find a registered encoder with the specified name.
119 @@ -3418,10 +3418,10 @@ AVCodec *avcodec_find_encoder_by_name(co
121 * Find a registered decoder with a matching codec ID.
123 - * @param id CodecID of the requested decoder
124 + * @param id AVCodecID of the requested decoder
125 * @return A decoder if one was found, NULL otherwise.
127 -AVCodec *avcodec_find_decoder(enum CodecID id);
128 +AVCodec *avcodec_find_decoder(enum AVCodecID id);
131 * Find a registered decoder with the specified name.
132 @@ -3822,7 +3822,7 @@ char av_get_pict_type_char(int pict_type
133 * @param[in] codec_id the codec
134 * @return Number of bits per sample or zero if unknown for the given codec.
136 -int av_get_bits_per_sample(enum CodecID codec_id);
137 +int av_get_bits_per_sample(enum AVCodecID codec_id);
139 #if FF_API_OLD_SAMPLE_FMT
141 diff -rupN a/plugins/video/H.263-1998/h263-1998.cxx b/plugins/video/H.263-1998/h263-1998.cxx
142 --- a/plugins/video/H.263-1998/h263-1998.cxx 2013-02-20 02:18:03.000000000 +0000
143 +++ b/plugins/video/H.263-1998/h263-1998.cxx 2013-07-22 16:55:47.314613571 +0000
144 @@ -203,7 +203,7 @@ H263_Base_EncoderContext::~H263_Base_Enc
145 PTRACE(4, m_prefix, "Encoder closed");
148 -bool H263_Base_EncoderContext::Init(CodecID codecId)
149 +bool H263_Base_EncoderContext::Init(AVCodecID codecId)
151 PTRACE(5, m_prefix, "Opening encoder");
153 diff -rupN a/plugins/video/H.263-1998/h263-1998.h b/plugins/video/H.263-1998/h263-1998.h
154 --- a/plugins/video/H.263-1998/h263-1998.h 2013-02-20 02:18:03.000000000 +0000
155 +++ b/plugins/video/H.263-1998/h263-1998.h 2013-07-22 16:55:47.307946942 +0000
156 @@ -115,7 +115,7 @@ class H263_Base_EncoderContext
157 virtual ~H263_Base_EncoderContext();
159 virtual bool Init() = 0;
160 - virtual bool Init(CodecID codecId);
161 + virtual bool Init(AVCodecID codecId);
163 virtual bool SetOptions(const char * const * options);
164 virtual void SetOption(const char * option, const char * value);
165 diff -rupN a/plugins/video/H.264/h264-x264.cxx b/plugins/video/H.264/h264-x264.cxx
166 --- a/plugins/video/H.264/h264-x264.cxx 2013-02-20 02:18:02.000000000 +0000
167 +++ b/plugins/video/H.264/h264-x264.cxx 2013-07-22 17:05:35.383661843 +0000
169 #include "plugin-config.h"
172 +#define FF_IDCT_H264 11
173 +#define CODEC_FLAG2_SKIP_RD 0x00004000
175 #include <codec/opalplugin.hpp>
177 #include "../common/ffmpeg.h"