diff options
author | Diego Biurrun <diego@biurrun.de> | 2012-08-24 13:31:50 +0200 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2012-10-12 20:56:54 +0200 |
commit | c1ef30a6ba2cdc15147c4e80766e9bda629ffc1d (patch) | |
tree | dacd008cb6db7e5d2794770f2469acf6fd5dc4af /avconv.c | |
parent | d5c62122a7b26704bf867a1262df358623bf5edf (diff) | |
download | ffmpeg-c1ef30a6ba2cdc15147c4e80766e9bda629ffc1d.tar.gz |
De-doxygenize some top-level files
Diffstat (limited to 'avconv.c')
-rw-r--r-- | avconv.c | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -246,7 +246,7 @@ static void assert_codec_experimental(AVCodecContext *c, int encoder) } } -/** +/* * Update the requested input sample format based on the output sample format. * This is currently only used to request float output from decoders which * support multiple sample formats, one of which is AV_SAMPLE_FMT_FLT. @@ -660,7 +660,7 @@ static void do_video_stats(AVFormatContext *os, OutputStream *ost, } } -/** +/* * Read one frame for lavfi output for ost and encode it. */ static int poll_filter(OutputStream *ost) @@ -723,7 +723,7 @@ static int poll_filter(OutputStream *ost) return 0; } -/** +/* * Read as many frames from possible from lavfi and encode them. * * Always read from the active stream with the lowest timestamp. If no frames @@ -1941,10 +1941,7 @@ static int transcode_init(void) return 0; } -/** - * @return 1 if there are still streams where more output is wanted, - * 0 otherwise - */ +/* Return 1 if there remain streams where more output is wanted, 0 otherwise. */ static int need_output(void) { int i; @@ -2128,13 +2125,13 @@ static void reset_eagain(void) input_files[i]->eagain = 0; } -/** +/* * Read one packet from an input file and send it for * - decoding -> lavfi (audio/video) * - decoding -> encoding -> muxing (subtitles) * - muxing (streamcopy) * - * @return + * Return * - 0 -- one packet was read and processed * - AVERROR(EAGAIN) -- no packets were available for selected file, * this function should be called again |