Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Revert "v210enc: use FFALIGN()"
  doxygen: Do not include license boilerplates in Doxygen comment blocks.
  avplay: reset decoder flush state when seeking
  ape: skip packets with invalid size
  ape: calculate final packet size instead of guessing
  ape: stop reading after the last frame has been read
  ape: return AVERROR_EOF instead of AVERROR(EIO) when demuxing is finished
  ape: return error if seeking to the current packet fails in ape_read_packet()
  avcodec: Clarify AVFrame member documentation.
  v210dec: check for coded_frame allocation failure
  v210enc: use stride as it is already calculated
  v210enc: use FFALIGN()
  v210enc: return proper AVERROR codes instead of -1
  v210enc: do not set coded_frame->key_frame
  v210enc: check for coded_frame allocation failure
  drawtext: add 'fix_bounds' option on coords fixing
  drawtext: fix text_{w, h} expression vars
  drawtext: add missing braces around an if() block.

Conflicts:
	libavcodec/arm/vp8.h
	libavcodec/arm/vp8dsp_init_arm.c
	libavcodec/v210dec.c
	libavfilter/vf_drawtext.c
	libavformat/ape.c

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

14 files changed, 17 insertions, 17 deletions

diff --git a/libavcodec/alacenc.c b/libavcodec/alacenc.c
index e8d1bc03f2..fde3b53e5e 100644
--- a/libavcodec/alacenc.c
+++ b/libavcodec/alacenc.c
@@ -1,4 +1,4 @@
-/**
+/*
  * ALAC audio encoder
  * Copyright (c) 2008  Jaikrishnan Menon <realityman@gmx.net>
  *
diff --git a/libavcodec/arm/vp8.h b/libavcodec/arm/vp8.h
index 55193394c5..d3fce4cafe 100644
--- a/libavcodec/arm/vp8.h
+++ b/libavcodec/arm/vp8.h
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
diff --git a/libavcodec/arm/vp8_armv6.S b/libavcodec/arm/vp8_armv6.S
index 8a3beb9fbb..9399bb28d7 100644
--- a/libavcodec/arm/vp8_armv6.S
+++ b/libavcodec/arm/vp8_armv6.S
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (C) 2010 Mans Rullgard
  *
  * This file is part of FFmpeg.
diff --git a/libavcodec/arm/vp8dsp_init_arm.c b/libavcodec/arm/vp8dsp_init_arm.c
index b56e6f42e0..14021c954d 100644
--- a/libavcodec/arm/vp8dsp_init_arm.c
+++ b/libavcodec/arm/vp8dsp_init_arm.c
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
diff --git a/libavcodec/arm/vp8dsp_neon.S b/libavcodec/arm/vp8dsp_neon.S
index b4ab1c7032..a9f698dfed 100644
--- a/libavcodec/arm/vp8dsp_neon.S
+++ b/libavcodec/arm/vp8dsp_neon.S
@@ -1,4 +1,4 @@
-/**
+/*
  * VP8 NEON optimisations
  *
  * Copyright (c) 2010 Rob Clark <rob@ti.com>
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index ee3833b0c8..8513cebde1 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -884,7 +884,7 @@ typedef struct AVFrame {
      * For audio, only linesize[0] may be set. For planar audio, each channel
      * plane must be the same size.
      *
-     * - encoding: Set by user (video only)
+     * - encoding: Set by user
      * - decoding: set by AVCodecContext.get_buffer()
      */
     int linesize[AV_NUM_DATA_POINTERS];
@@ -1134,7 +1134,7 @@ typedef struct AVFrame {
 
     /**
      * number of audio samples (per channel) described by this frame
-     * - encoding: unused
+     * - encoding: Set by user
      * - decoding: Set by libavcodec
      */
     int nb_samples;
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index a1c3bca2dd..ecf883e652 100644
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -1,4 +1,4 @@
-/**
+/*
  * FLAC audio encoder
  * Copyright (c) 2006  Justin Ruggles <justin.ruggles@gmail.com>
  *
diff --git a/libavcodec/jfdctint.c b/libavcodec/jfdctint.c
index 0482bc5643..ed6b7ffca2 100644
--- a/libavcodec/jfdctint.c
+++ b/libavcodec/jfdctint.c
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
diff --git a/libavcodec/lpc.c b/libavcodec/lpc.c
index 3401226d0f..5faddc24a6 100644
--- a/libavcodec/lpc.c
+++ b/libavcodec/lpc.c
@@ -1,4 +1,4 @@
-/**
+/*
  * LPC utility code
  * Copyright (c) 2006  Justin Ruggles <justin.ruggles@gmail.com>
  *
diff --git a/libavcodec/lpc.h b/libavcodec/lpc.h
index 8b70a9d5d7..c58e37c4bc 100644
--- a/libavcodec/lpc.h
+++ b/libavcodec/lpc.h
@@ -1,4 +1,4 @@
-/**
+/*
  * LPC utility code
  * Copyright (c) 2006  Justin Ruggles <justin.ruggles@gmail.com>
  *
diff --git a/libavcodec/ppc/vp8dsp_altivec.c b/libavcodec/ppc/vp8dsp_altivec.c
index 8bb60aae0b..28d23cb9aa 100644
--- a/libavcodec/ppc/vp8dsp_altivec.c
+++ b/libavcodec/ppc/vp8dsp_altivec.c
@@ -1,4 +1,4 @@
-/**
+/*
  * VP8 compatible video decoder
  *
  * Copyright (C) 2010 David Conrad
diff --git a/libavcodec/v210enc.c b/libavcodec/v210enc.c
index 947797df14..a2efb5e83f 100644
--- a/libavcodec/v210enc.c
+++ b/libavcodec/v210enc.c
@@ -28,7 +28,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
 {
     if (avctx->width & 1) {
         av_log(avctx, AV_LOG_ERROR, "v210 needs even width\n");
-        return -1;
+        return AVERROR(EINVAL);
     }
 
     if (avctx->pix_fmt != PIX_FMT_YUV422P10) {
@@ -62,9 +62,9 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
     uint8_t *p = buf;
     uint8_t *pdst = buf;
 
-    if (buf_size < aligned_width * avctx->height * 8 / 3) {
+    if (buf_size < avctx->height * stride) {
         av_log(avctx, AV_LOG_ERROR, "output buffer too small\n");
-        return -1;
+        return AVERROR(ENOMEM);
     }
 
 #define CLIP(v) av_clip(v, 4, 1019)
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
index d68a91ea54..370fb0070c 100644
--- a/libavcodec/vp8.c
+++ b/libavcodec/vp8.c
@@ -1,4 +1,4 @@
-/**
+/*
  * VP8 compatible video decoder
  *
  * Copyright (C) 2010 David Conrad
diff --git a/libavcodec/vp8.h b/libavcodec/vp8.h
index 36c21df217..5d2a3b773d 100644
--- a/libavcodec/vp8.h
+++ b/libavcodec/vp8.h
@@ -1,4 +1,4 @@
-/**
+/*
  * VP8 compatible video decoder
  *
  * Copyright (C) 2010 David Conrad