diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | doc/developer.texi | 2 | ||||
| -rw-r--r-- | doc/examples/decoding_encoding.c | 12 | ||||
| -rw-r--r-- | doc/examples/muxing.c | 12 |
4 files changed, 16 insertions, 13 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index a6b45c8d7c..f1f7633c01 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -70,6 +70,9 @@ API changes, most recent first: 2012-03-26 - a67d9cf - lavfi 2.66.100 Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions. +2012-08-xx - xxxxxxx - lavc 54.25 - avcodec.h + Rename CodecID to AVCodecID and all CODEC_ID_* to AV_CODEC_ID_*. + 2012-08-03 - xxxxxxx - lavu 51.37.1 - cpu.h lsws 2.1.1 - swscale.h Rename AV_CPU_FLAG_MMX2 ---> AV_CPU_FLAG_MMXEXT. diff --git a/doc/developer.texi b/doc/developer.texi index d4013bcda0..964c9af4c1 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -393,7 +393,7 @@ send a reminder by email. Your patch should eventually be dealt with. @item Did you register it in @file{allcodecs.c} or @file{allformats.c}? @item - Did you add the CodecID to @file{avcodec.h}? + Did you add the AVCodecID to @file{avcodec.h}? @item If it has a fourCC, did you add it to @file{libavformat/riff.c}, even if it is only a decoder? diff --git a/doc/examples/decoding_encoding.c b/doc/examples/decoding_encoding.c index 4650f2babd..3576cc0f8b 100644 --- a/doc/examples/decoding_encoding.c +++ b/doc/examples/decoding_encoding.c @@ -57,7 +57,7 @@ static void audio_encode_example(const char *filename) printf("Encode audio file %s\n", filename); /* find the MP2 encoder */ - codec = avcodec_find_encoder(CODEC_ID_MP2); + codec = avcodec_find_encoder(AV_CODEC_ID_MP2); if (!codec) { fprintf(stderr, "codec not found\n"); exit(1); @@ -128,7 +128,7 @@ static void audio_decode_example(const char *outfilename, const char *filename) printf("Decode audio file %s\n", filename); /* find the mpeg audio decoder */ - codec = avcodec_find_decoder(CODEC_ID_MP2); + codec = avcodec_find_decoder(AV_CODEC_ID_MP2); if (!codec) { fprintf(stderr, "codec not found\n"); exit(1); @@ -242,7 +242,7 @@ static void video_encode_example(const char *filename, int codec_id) c->max_b_frames=1; c->pix_fmt = PIX_FMT_YUV420P; - if(codec_id == CODEC_ID_H264) + if(codec_id == AV_CODEC_ID_H264) av_opt_set(c->priv_data, "preset", "slow", 0); /* open it */ @@ -354,7 +354,7 @@ static void video_decode_example(const char *outfilename, const char *filename) printf("Decode video file %s\n", filename); /* find the mpeg1 video decoder */ - codec = avcodec_find_decoder(CODEC_ID_MPEG1VIDEO); + codec = avcodec_find_decoder(AV_CODEC_ID_MPEG1VIDEO); if (!codec) { fprintf(stderr, "codec not found\n"); exit(1); @@ -465,8 +465,8 @@ int main(int argc, char **argv) audio_encode_example("/tmp/test.mp2"); audio_decode_example("/tmp/test.sw", "/tmp/test.mp2"); - video_encode_example("/tmp/test.h264", CODEC_ID_H264); - video_encode_example("/tmp/test.mpg", CODEC_ID_MPEG1VIDEO); + video_encode_example("/tmp/test.h264", AV_CODEC_ID_H264); + video_encode_example("/tmp/test.mpg", AV_CODEC_ID_MPEG1VIDEO); filename = "/tmp/test.mpg"; } else { filename = argv[1]; diff --git a/doc/examples/muxing.c b/doc/examples/muxing.c index 130c0184ce..3209bb89c8 100644 --- a/doc/examples/muxing.c +++ b/doc/examples/muxing.c @@ -58,7 +58,7 @@ static int audio_input_frame_size; * add an audio output stream */ static AVStream *add_audio_stream(AVFormatContext *oc, AVCodec **codec, - enum CodecID codec_id) + enum AVCodecID codec_id) { AVCodecContext *c; AVStream *st; @@ -183,7 +183,7 @@ static int frame_count, video_outbuf_size; /* Add a video output stream. */ static AVStream *add_video_stream(AVFormatContext *oc, AVCodec **codec, - enum CodecID codec_id) + enum AVCodecID codec_id) { AVCodecContext *c; AVStream *st; @@ -220,11 +220,11 @@ static AVStream *add_video_stream(AVFormatContext *oc, AVCodec **codec, c->time_base.num = 1; c->gop_size = 12; /* emit one intra frame every twelve frames at most */ c->pix_fmt = STREAM_PIX_FMT; - if (c->codec_id == CODEC_ID_MPEG2VIDEO) { + if (c->codec_id == AV_CODEC_ID_MPEG2VIDEO) { /* just for testing, we also add B frames */ c->max_b_frames = 2; } - if (c->codec_id == CODEC_ID_MPEG1VIDEO) { + if (c->codec_id == AV_CODEC_ID_MPEG1VIDEO) { /* Needed to avoid using macroblocks in which some coeffs overflow. * This does not happen with normal video, it just happens here as * the motion of the chroma plane does not match the luma plane. */ @@ -445,10 +445,10 @@ int main(int argc, char **argv) * and initialize the codecs. */ video_st = NULL; audio_st = NULL; - if (fmt->video_codec != CODEC_ID_NONE) { + if (fmt->video_codec != AV_CODEC_ID_NONE) { video_st = add_video_stream(oc, &video_codec, fmt->video_codec); } - if (fmt->audio_codec != CODEC_ID_NONE) { + if (fmt->audio_codec != AV_CODEC_ID_NONE) { audio_st = add_audio_stream(oc, &audio_codec, fmt->audio_codec); } |