|
Lines 62-68
Link Here
|
| 62 |
|
62 |
|
| 63 |
typedef struct AVCodecTag { |
63 |
typedef struct AVCodecTag { |
| 64 |
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52,39,00) |
64 |
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52,39,00) |
| 65 |
enum CodecID id; |
65 |
enum AVCodecID id; |
| 66 |
#else |
66 |
#else |
| 67 |
int id; |
67 |
int id; |
| 68 |
#endif |
68 |
#endif |
|
Lines 70-83
Link Here
|
| 70 |
} AVCodecTag; |
70 |
} AVCodecTag; |
| 71 |
|
71 |
|
| 72 |
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52,34,00) |
72 |
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52,34,00) |
| 73 |
static uint FFCodecID2Tag(CodecID codec_id) |
73 |
static uint FFCodecID2Tag(AVCodecID codec_id) |
| 74 |
{ |
74 |
{ |
| 75 |
unsigned int ff_codec_get_tag(const AVCodecTag *tags, int id); |
75 |
unsigned int ff_codec_get_tag(const AVCodecTag *tags, int id); |
| 76 |
extern const AVCodecTag ff_codec_bmp_tags[]; |
76 |
extern const AVCodecTag ff_codec_bmp_tags[]; |
| 77 |
return ff_codec_get_tag(ff_codec_bmp_tags, codec_id); |
77 |
return ff_codec_get_tag(ff_codec_bmp_tags, codec_id); |
| 78 |
} |
78 |
} |
| 79 |
#else |
79 |
#else |
| 80 |
static uint FFCodecID2Tag(CodecID codec_id) |
80 |
static uint FFCodecID2Tag(AVCodecID codec_id) |
| 81 |
{ |
81 |
{ |
| 82 |
unsigned int codec_get_tag(const AVCodecTag *tags, int id); |
82 |
unsigned int codec_get_tag(const AVCodecTag *tags, int id); |
| 83 |
extern const AVCodecTag codec_bmp_tags[]; |
83 |
extern const AVCodecTag codec_bmp_tags[]; |
|
Lines 388-394
Link Here
|
| 388 |
return (tag>>bit_begin) & 0xFF; |
388 |
return (tag>>bit_begin) & 0xFF; |
| 389 |
} |
389 |
} |
| 390 |
|
390 |
|
| 391 |
static std::string CodecID2Str(CodecID codec_id) |
391 |
static std::string CodecID2Str(AVCodecID codec_id) |
| 392 |
{ |
392 |
{ |
| 393 |
#ifdef _MSC_VER |
393 |
#ifdef _MSC_VER |
| 394 |
std::string tag_str = boost::format("%1%") % codec_id % bf::stop; |
394 |
std::string tag_str = boost::format("%1%") % codec_id % bf::stop; |
|
Lines 406-412
Link Here
|
| 406 |
|
406 |
|
| 407 |
#else // CALC_FF_TAG |
407 |
#else // CALC_FF_TAG |
| 408 |
|
408 |
|
| 409 |
static std::string CodecID2Str(CodecID codec_id) |
409 |
static std::string CodecID2Str(AVCodecID codec_id) |
| 410 |
{ |
410 |
{ |
| 411 |
return Int2Str(codec_id); |
411 |
return Int2Str(codec_id); |
| 412 |
} |
412 |
} |
