diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-06-29 21:59:37 +0200 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-07-27 15:24:58 +0100 |
| commit | 7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615 (patch) | |
| tree | 4613835d2ddad31bb5603827f28d8a4a6e4d9e21 /doc | |
| parent | 4b6b1082a73907c7c3de2646c6398bc61320f2c6 (diff) | |
| download | ffmpeg-7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615.tar.gz | |
lavc: AV-prefix all codec flags
Convert doxygen to multiline and express bitfields more simply.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/examples/avcodec.c | 2 | ||||
| -rw-r--r-- | doc/examples/output.c | 4 | ||||
| -rw-r--r-- | doc/examples/transcode_aac.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/examples/avcodec.c b/doc/examples/avcodec.c index 1478881c25..1fd0a60254 100644 --- a/doc/examples/avcodec.c +++ b/doc/examples/avcodec.c @@ -481,7 +481,7 @@ static void video_decode_example(const char *outfilename, const char *filename) picture = av_frame_alloc(); if(codec->capabilities&CODEC_CAP_TRUNCATED) - c->flags|= CODEC_FLAG_TRUNCATED; /* we do not send complete frames */ + c->flags |= AV_CODEC_FLAG_TRUNCATED; // we do not send complete frames /* For some codecs, such as msmpeg4 and mpeg4, width and height MUST be initialized there because this information is not diff --git a/doc/examples/output.c b/doc/examples/output.c index 0534554360..b46f9bc458 100644 --- a/doc/examples/output.c +++ b/doc/examples/output.c @@ -104,7 +104,7 @@ static void add_audio_stream(OutputStream *ost, AVFormatContext *oc, // some formats want stream headers to be separate if (oc->oformat->flags & AVFMT_GLOBALHEADER) - c->flags |= CODEC_FLAG_GLOBAL_HEADER; + c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; /* initialize sample format conversion; * to simplify the code, we always pass the data through lavr, even @@ -358,7 +358,7 @@ static void add_video_stream(OutputStream *ost, AVFormatContext *oc, } /* Some formats want stream headers to be separate. */ if (oc->oformat->flags & AVFMT_GLOBALHEADER) - c->flags |= CODEC_FLAG_GLOBAL_HEADER; + c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; } static AVFrame *alloc_picture(enum AVPixelFormat pix_fmt, int width, int height) diff --git a/doc/examples/transcode_aac.c b/doc/examples/transcode_aac.c index 60698f719f..30e6189942 100644 --- a/doc/examples/transcode_aac.c +++ b/doc/examples/transcode_aac.c @@ -191,7 +191,7 @@ static int open_output_file(const char *filename, * Mark the encoder so that it behaves accordingly. */ if ((*output_format_context)->oformat->flags & AVFMT_GLOBALHEADER) - (*output_codec_context)->flags |= CODEC_FLAG_GLOBAL_HEADER; + (*output_codec_context)->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; /** Open the encoder for the audio stream to use it later. */ if ((error = avcodec_open2(*output_codec_context, output_codec, NULL)) < 0) { |