Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'

* commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be':
  Remove libmpeg2 #define remnants
  De-doxygenize some top-level files

Conflicts:
	ffmpeg.c
	ffmpeg.h
	ffmpeg_filter.c
	ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 4 insertions, 7 deletions

diff --git a/ffmpeg.c b/ffmpeg.c
index 7dbc4b74ed..97a1e4dff5 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -975,7 +975,7 @@ static void do_video_stats(AVFormatContext *os, OutputStream *ost,
     }
 }
 
-/**
+/*
  * Get and encode new output from any of the filtergraphs, without causing
  * activity.
  *
@@ -2403,10 +2403,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;
@@ -2685,8 +2682,8 @@ static void reset_eagain(void)
         output_streams[i]->unavailable = 0;
 }
 
-/**
- * @return
+/*
+ * Return
  * - 0 -- one packet was read and processed
  * - AVERROR(EAGAIN) -- no packets were available for selected file,
  *   this function should be called again