Merge commit '5ac673b5531d846b79a3d77e3e932e0cb1234c45'

* commit '5ac673b5531d846b79a3d77e3e932e0cb1234c45':
  atrac3: use AVCodecContext.channels instead of keeping a private copy
  atrac3: simplify some loop indexing
  atrac3: cosmetics: pretty-printing and renaming
  pcm: define AVCodec instances only for enabled codecs
  libxvid: remove useless doxy comments.
  lavc: remove stats_out from the options table.

Conflicts:
	libavcodec/atrac3.c
	libavcodec/pcm.c

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

1 files changed, 0 insertions, 27 deletions

diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c
index fa3be7c51f..dae8ac8244 100644
--- a/libavcodec/libxvid.c
+++ b/libavcodec/libxvid.c
@@ -342,14 +342,6 @@ static void xvid_correct_framerate(AVCodecContext *avctx)
     }
 }
 
-/**
- * Create the private context for the encoder.
- * All buffers are allocated, settings are loaded from the user,
- * and the encoder context created.
- *
- * @param avctx AVCodecContext pointer to context
- * @return Returns 0 on success, -1 on failure
- */
 static av_cold int xvid_encode_init(AVCodecContext *avctx)  {
     int xerr, i;
     int xvid_flags = avctx->flags;
@@ -621,15 +613,6 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx)  {
     return 0;
 }
 
-/**
- * Encode a single frame.
- *
- * @param avctx AVCodecContext pointer to context
- * @param frame Pointer to encoded frame buffer
- * @param buf_size Size of encoded frame buffer
- * @param data Pointer to AVFrame of unencoded frame
- * @return Returns 0 on success, -1 on failure
- */
 static int xvid_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
                              const AVFrame *picture, int *got_packet)
 {
@@ -747,13 +730,6 @@ static int xvid_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     }
 }
 
-/**
- * Destroy the private context for the encoder.
- * All buffers are freed, and the Xvid encoder context is destroyed.
- *
- * @param avctx AVCodecContext pointer to context
- * @return Returns 0, success guaranteed
- */
 static av_cold int xvid_encode_close(AVCodecContext *avctx) {
     struct xvid_context *x = avctx->priv_data;
 
@@ -772,9 +748,6 @@ static av_cold int xvid_encode_close(AVCodecContext *avctx) {
     return 0;
 }
 
-/**
- * Xvid codec definition for libavcodec.
- */
 AVCodec ff_libxvid_encoder = {
     .name           = "libxvid",
     .type           = AVMEDIA_TYPE_VIDEO,