@@ -35,19 +35,19 @@ API changes, most recent first:

 2012-01-24 - xxxxxxx - lavfi 2.60.100

   Add avfilter_graph_dump.

-2012-xx-xx - xxxxxxx - lavu 51.24.0 - error.h

+2012-02-25 - c9bca80 - lavu 51.24.0 - error.h

   Add AVERROR_UNKNOWN

-2012-xx-xx - xxxxxxx - lavc 54.x.x

+2012-02-20 - e9cda85 - lavc 54.2.0

   Add duration field to AVCodecParserContext

-2012-02-xx - xxxxxxx - lavu 51.23.1 - mathematics.h

+2012-02-20 - 0b42a93 - lavu 51.23.1 - mathematics.h

   Add av_rescale_q_rnd()

-2012-02-xx - xxxxxxx - lavu 51.22.1 - pixdesc.h

+2012-02-08 - 38d5533 - lavu 51.22.1 - pixdesc.h

   Add PIX_FMT_PSEUDOPAL flag.

-2012-02-01 - xxxxxxx - lavc 54.01.0

+2012-02-08 - 52f82a1 - lavc 54.01.0

   Add avcodec_encode_video2() and deprecate avcodec_encode_video().

 2012-02-01 - 316fc74 - lavc 54.01.0

@@ -891,12 +891,48 @@ typedef struct AVFrame {

     int linesize[AV_NUM_DATA_POINTERS];

     /**

-     * pointer to the first allocated byte of the picture. Can be used in get_buffer/release_buffer.

-     * This isn't used by libavcodec unless the default get/release_buffer() is used.

-     * - encoding:

-     * - decoding:

+     * pointers to the data planes/channels.

+     *

+     * For video, this should simply point to data[].

+     *

+     * For planar audio, each channel has a separate data pointer, and

+     * linesize[0] contains the size of each channel buffer.

+     * For packed audio, there is just one data pointer, and linesize[0]

+     * contains the total size of the buffer for all channels.

+     *

+     * Note: Both data and extended_data will always be set by get_buffer(),

+     * but for planar audio with more channels that can fit in data,

+     * extended_data must be used by the decoder in order to access all

+     * channels.

+     *

+     * encoding: unused

+     * decoding: set by AVCodecContext.get_buffer()

      */

-    uint8_t *base[AV_NUM_DATA_POINTERS];

+    uint8_t **extended_data;

+

+    /**

+     * width and height of the video frame

+     * - encoding: unused

+     * - decoding: Read by user.

+     */

+    int width, height;

+

+    /**

+     * number of audio samples (per channel) described by this frame

+     * - encoding: Set by user

+     * - decoding: Set by libavcodec

+     */

+    int nb_samples;

+

+    /**

+     * format of the frame, -1 if unknown or unset

+     * Values correspond to enum PixelFormat for video frames,

+     * enum AVSampleFormat for audio)

+     * - encoding: unused

+     * - decoding: Read by user.

+     */

+    int format;

+

     /**

      * 1 -> keyframe, 0-> not

      * - encoding: Set by libavcodec.

@@ -912,6 +948,21 @@ typedef struct AVFrame {

     enum AVPictureType pict_type;

     /**

+     * pointer to the first allocated byte of the picture. Can be used in get_buffer/release_buffer.

+     * This isn't used by libavcodec unless the default get/release_buffer() is used.

+     * - encoding:

+     * - decoding:

+     */

+    uint8_t *base[AV_NUM_DATA_POINTERS];

+

+    /**

+     * sample aspect ratio for the video frame, 0/1 if unknown\unspecified

+     * - encoding: unused

+     * - decoding: Read by user.

+     */

+    AVRational sample_aspect_ratio;

+

+    /**

      * presentation timestamp in time_base units (time when frame should be shown to user)

      * If AV_NOPTS_VALUE then frame_rate = 1/time_base will be assumed.

      * - encoding: MUST be set by user.

@@ -920,6 +971,20 @@ typedef struct AVFrame {

     int64_t pts;

     /**

+     * reordered pts from the last AVPacket that has been input into the decoder

+     * - encoding: unused

+     * - decoding: Read by user.

+     */

+    int64_t pkt_pts;

+

+    /**

+     * dts from the last AVPacket that has been input into the decoder

+     * - encoding: unused

+     * - decoding: Read by user.

+     */

+    int64_t pkt_dts;

+

+    /**

      * picture number in bitstream order

      * - encoding: set by

      * - decoding: Set by libavcodec.

@@ -963,6 +1028,11 @@ typedef struct AVFrame {

     int qstride;

     /**

+     *

+     */

+    int qscale_type;

+

+    /**

      * mbskip_table[mb]>=1 if MB didn't change

      * stride= mb_width = (width+15)>>4

      * - encoding: unused

@@ -993,12 +1063,19 @@ typedef struct AVFrame {

     uint32_t *mb_type;

     /**

-     * log2 of the size of the block which a single vector in motion_val represents:

-     * (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2)

+     * DCT coefficients

      * - encoding: unused

      * - decoding: Set by libavcodec.

      */

-    uint8_t motion_subsample_log2;

+    short *dct_coeff;

+

+    /**

+     * motion reference frame index

+     * the order in which these are stored can depend on the codec.

+     * - encoding: Set by user.

+     * - decoding: Set by libavcodec.

+     */

+    int8_t *ref_index[2];

     /**

      * for some private data of the user

@@ -1031,11 +1108,6 @@ typedef struct AVFrame {

     int repeat_pict;

     /**

-     *

-     */

-    int qscale_type;

-

-    /**

      * The content of the picture is interlaced.

      * - encoding: Set by user.

      * - decoding: Set by libavcodec. (default 0)

@@ -1050,13 +1122,6 @@ typedef struct AVFrame {

     int top_field_first;

     /**

-     * Pan scan.

-     * - encoding: Set by user.

-     * - decoding: Set by libavcodec.

-     */

-    AVPanScan *pan_scan;

-

-    /**

      * Tell user application that palette has changed from previous frame.

      * - encoding: ??? (no palette-enabled encoder yet)

      * - decoding: Set by libavcodec. (default 0).

@@ -1071,19 +1136,11 @@ typedef struct AVFrame {

     int buffer_hints;

     /**

-     * DCT coefficients

-     * - encoding: unused

-     * - decoding: Set by libavcodec.

-     */

-    short *dct_coeff;

-

-    /**

-     * motion reference frame index

-     * the order in which these are stored can depend on the codec.

+     * Pan scan.

      * - encoding: Set by user.

      * - decoding: Set by libavcodec.

      */

-    int8_t *ref_index[2];

+    AVPanScan *pan_scan;

     /**

      * reordered opaque 64bit (generally an integer or a double precision float

@@ -1106,20 +1163,6 @@ typedef struct AVFrame {

     void *hwaccel_picture_private;

     /**

-     * reordered pts from the last AVPacket that has been input into the decoder

-     * - encoding: unused

-     * - decoding: Read by user.

-     */

-    int64_t pkt_pts;

-

-    /**

-     * dts from the last AVPacket that has been input into the decoder

-     * - encoding: unused

-     * - decoding: Read by user.

-     */

-    int64_t pkt_dts;

-

-    /**

      * the AVCodecContext which ff_thread_get_buffer() was last called on

      * - encoding: Set by libavcodec.

      * - decoding: Set by libavcodec.

@@ -1134,54 +1177,12 @@ typedef struct AVFrame {

     void *thread_opaque;

     /**

-     * number of audio samples (per channel) described by this frame

-     * - encoding: Set by user

-     * - decoding: Set by libavcodec

-     */

-    int nb_samples;

-

-    /**

-     * pointers to the data planes/channels.

-     *

-     * For video, this should simply point to data[].

-     *

-     * For planar audio, each channel has a separate data pointer, and

-     * linesize[0] contains the size of each channel buffer.

-     * For packed audio, there is just one data pointer, and linesize[0]

-     * contains the total size of the buffer for all channels.

-     *

-     * Note: Both data and extended_data will always be set by get_buffer(),

-     * but for planar audio with more channels that can fit in data,

-     * extended_data must be used by the decoder in order to access all

-     * channels.

-     *

-     * encoding: unused

-     * decoding: set by AVCodecContext.get_buffer()

-     */

-    uint8_t **extended_data;

-

-    /**

-     * sample aspect ratio for the video frame, 0/1 if unknown\unspecified

-     * - encoding: unused

-     * - decoding: Read by user.

-     */

-    AVRational sample_aspect_ratio;

-

-    /**

-     * width and height of the video frame

-     * - encoding: unused

-     * - decoding: Read by user.

-     */

-    int width, height;

-

-    /**

-     * format of the frame, -1 if unknown or unset

-     * Values correspond to enum PixelFormat for video frames,

-     * enum AVSampleFormat for audio)

+     * log2 of the size of the block which a single vector in motion_val represents:

+     * (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2)

      * - encoding: unused

-     * - decoding: Read by user.

+     * - decoding: Set by libavcodec.

      */

-    int format;

+    uint8_t motion_subsample_log2;

     /**

      * frame timestamp estimated using various heuristics, in stream time base

@@ -1200,7 +1201,6 @@ typedef struct AVFrame {

      * - decoding: Read by user.

      */

     int64_t pkt_pos;

-

 } AVFrame;

 struct AVCodecInternal;

@@ -1229,6 +1229,63 @@ typedef struct AVCodecContext {

      * - set by avcodec_alloc_context3

      */

     const AVClass *av_class;

+    int log_level_offset;

+

+    enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */

+    struct AVCodec  *codec;

+    char             codec_name[32];

+    enum CodecID     codec_id; /* see CODEC_ID_xxx */

+

+    /**

+     * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').

+     * This is used to work around some encoder bugs.

+     * A demuxer should set this to what is stored in the field used to identify the codec.

+     * If there are multiple such fields in a container then the demuxer should choose the one

+     * which maximizes the information about the used codec.

+     * If the codec tag field in a container is larger than 32 bits then the demuxer should

+     * remap the longer ID to 32 bits with a table or other structure. Alternatively a new

+     * extra_codec_tag + size could be added but for this a clear advantage must be demonstrated

+     * first.

+     * - encoding: Set by user, if not then the default based on codec_id will be used.

+     * - decoding: Set by user, will be converted to uppercase by libavcodec during init.

+     */

+    unsigned int codec_tag;

+

+    /**

+     * fourcc from the AVI stream header (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').

+     * This is used to work around some encoder bugs.

+     * - encoding: unused

+     * - decoding: Set by user, will be converted to uppercase by libavcodec during init.

+     */

+    unsigned int stream_codec_tag;

+

+    /**

+     * Some codecs need additional format info. It is stored here.

+     * If any muxer uses this then ALL demuxers/parsers AND encoders for the

+     * specific codec MUST set it correctly otherwise stream copy breaks.

+     * In general use of this field by muxers is not recommended.

+     * - encoding: Set by libavcodec.

+     * - decoding: Set by libavcodec. (FIXME: Is this OK?)

+     */

+    int sub_id;

+

+    void *priv_data;

+

+    /**

+     * Private context used for internal data.

+     *

+     * Unlike priv_data, this is not codec-specific. It is used in general

+     * libavcodec functions.

+     */

+    struct AVCodecInternal *internal;

+

+    /**

+     * Private data of the user, can be used to carry app specific stuff.

+     * - encoding: Set by user.

+     * - decoding: Set by user.

+     */

+    void *opaque;

+

     /**

      * the average bitrate

      * - encoding: Set by user; unused for constant quantizer encoding.

@@ -1245,30 +1302,33 @@ typedef struct AVCodecContext {

     int bit_rate_tolerance;

     /**

-     * CODEC_FLAG_*.

+     * Global quality for codecs which cannot change it per frame.

+     * This should be proportional to MPEG-1/2/4 qscale.

      * - encoding: Set by user.

-     * - decoding: Set by user.

+     * - decoding: unused

      */

-    int flags;

+    int global_quality;

     /**

-     * Some codecs need additional format info. It is stored here.

-     * If any muxer uses this then ALL demuxers/parsers AND encoders for the

-     * specific codec MUST set it correctly otherwise stream copy breaks.

-     * In general use of this field by muxers is not recommended.

-     * - encoding: Set by libavcodec.

-     * - decoding: Set by libavcodec. (FIXME: Is this OK?)

+     * - encoding: Set by user.

+     * - decoding: unused

      */

-    int sub_id;

+    int compression_level;

+#define FF_COMPRESSION_DEFAULT -1

     /**

-     * Motion estimation algorithm used for video coding.

-     * 1 (zero), 2 (full), 3 (log), 4 (phods), 5 (epzs), 6 (x1), 7 (hex),

-     * 8 (umh), 9 (iter), 10 (tesa) [7, 8, 10 are x264 specific, 9 is snow specific]

-     * - encoding: MUST be set by user.

-     * - decoding: unused

+     * CODEC_FLAG_*.

+     * - encoding: Set by user.

+     * - decoding: Set by user.

      */

-    int me_method;

+    int flags;

+

+    /**

+     * CODEC_FLAG2_*

+     * - encoding: Set by user.

+     * - decoding: Set by user.

+     */

+    int flags2;

     /**

      * some codecs need / can use extradata like Huffman tables.

@@ -1294,6 +1354,39 @@ typedef struct AVCodecContext {

      */

     AVRational time_base;

+    /**

+     * For some codecs, the time base is closer to the field rate than the frame rate.

+     * Most notably, H.264 and MPEG-2 specify time_base as half of frame duration

+     * if no telecine is used ...

+     *

+     * Set to time_base ticks per frame. Default 1, e.g., H.264/MPEG-2 set it to 2.

+     */

+    int ticks_per_frame;

+

+    /**

+     * Encoding: Number of frames delay there will be from the encoder input to

+     *           the decoder output. (we assume the decoder matches the spec)

+     * Decoding: Number of frames delay in addition to what a standard decoder

+     *           as specified in the spec would produce.

+     *

+     * Video:

+     *   Number of frames the decoded output will be delayed relative to the

+     *   encoded input.

+     *

+     * Audio:

+     *   Number of "priming" samples added to the beginning of the stream

+     *   during encoding. The decoded output will be delayed by this many

+     *   samples relative to the input to the encoder. Note that this field is

+     *   purely informational and does not directly affect the pts output by

+     *   the encoder, which should always be based on the actual presentation

+     *   time, including any delay.

+     *

+     * - encoding: Set by libavcodec.

+     * - decoding: Set by libavcodec.

+     */

+    int delay;

+

+

     /* video only */

     /**

      * picture width / height.

@@ -1304,6 +1397,13 @@ typedef struct AVCodecContext {

      */

     int width, height;

+    /**

+     * Bitstream width / height, may be different from width/height if lowres enabled.

+     * - encoding: unused

+     * - decoding: Set by user before init if known. Codec should override / dynamically change if needed.

+     */

+    int coded_width, coded_height;

+

 #define FF_ASPECT_EXTENDED 15

     /**

@@ -1323,6 +1423,15 @@ typedef struct AVCodecContext {

     enum PixelFormat pix_fmt;

     /**

+     * Motion estimation algorithm used for video coding.

+     * 1 (zero), 2 (full), 3 (log), 4 (phods), 5 (epzs), 6 (x1), 7 (hex),

+     * 8 (umh), 9 (iter), 10 (tesa) [7, 8, 10 are x264 specific, 9 is snow specific]

+     * - encoding: MUST be set by user.

+     * - decoding: unused

+     */

+    int me_method;

+

+    /**

      * If non NULL, 'draw_horiz_band' is called by the libavcodec

      * decoder to draw a horizontal band. It improves cache usage. Not

      * all codecs can do that. You must check the codec capabilities

@@ -1349,71 +1458,16 @@ typedef struct AVCodecContext {

                             const AVFrame *src, int offset[AV_NUM_DATA_POINTERS],

                             int y, int type, int height);

-    /* audio only */

-    int sample_rate; ///< samples per second

-    int channels;    ///< number of audio channels

-

-    /**

-     * audio sample format

-     * - encoding: Set by user.

-     * - decoding: Set by libavcodec.

-     */

-    enum AVSampleFormat sample_fmt;  ///< sample format

-

-    /* The following data should not be initialized. */

     /**

-     * Samples per packet, initialized when calling 'init'.

-     */

-    int frame_size;

-    int frame_number;   ///< audio or video frame number

-

-    /**

-     * Encoding: Number of frames delay there will be from the encoder input to

-     *           the decoder output. (we assume the decoder matches the spec)

-     * Decoding: Number of frames delay in addition to what a standard decoder

-     *           as specified in the spec would produce.

-     *

-     * Video:

-     *   Number of frames the decoded output will be delayed relative to the

-     *   encoded input.

-     *

-     * Audio:

-     *   Number of "priming" samples added to the beginning of the stream

-     *   during encoding. The decoded output will be delayed by this many

-     *   samples relative to the input to the encoder. Note that this field is

-     *   purely informational and does not directly affect the pts output by

-     *   the encoder, which should always be based on the actual presentation

-     *   time, including any delay.

-     *

-     * - encoding: Set by libavcodec.

-     * - decoding: Set by libavcodec.

-     */

-    int delay;

-

-    /* - encoding parameters */

-    float qcompress;  ///< amount of qscale change between easy & hard scenes (0.0-1.0)

-    float qblur;      ///< amount of qscale smoothing over time (0.0-1.0)

-

-    /**

-     * minimum quantizer

-     * - encoding: Set by user.

-     * - decoding: unused

-     */

-    int qmin;

-

-    /**

-     * maximum quantizer

-     * - encoding: Set by user.

-     * - decoding: unused

-     */

-    int qmax;

-

-    /**

-     * maximum quantizer difference between frames

-     * - encoding: Set by user.

-     * - decoding: unused

+     * callback to negotiate the pixelFormat

+     * @param fmt is the list of formats which are supported by the codec,

+     * it is terminated by -1 as 0 is a valid format, the formats are ordered by quality.

+     * The first is always the native one.

+     * @return the chosen format

+     * - encoding: unused

+     * - decoding: Set by user, if not set the native format will be chosen.

      */

-    int max_qdiff;

+    enum PixelFormat (*get_format)(struct AVCodecContext *s, const enum PixelFormat * fmt);

     /**

      * maximum number of B-frames between non-B-frames

@@ -1438,92 +1492,6 @@ typedef struct AVCodecContext {

     int b_frame_strategy;

-    struct AVCodec *codec;

-

-    void *priv_data;

-

-    int rtp_payload_size;   /* The size of the RTP payload: the coder will  */

-                            /* do its best to deliver a chunk with size     */

-                            /* below rtp_payload_size, the chunk will start */

-                            /* with a start code on some codecs like H.263. */

-                            /* This doesn't take account of any particular  */

-                            /* headers inside the transmitted RTP payload.  */

-

-

-    /* The RTP callback: This function is called    */

-    /* every time the encoder has a packet to send. */

-    /* It depends on the encoder if the data starts */

-    /* with a Start Code (it should). H.263 does.   */

-    /* mb_nb contains the number of macroblocks     */

-    /* encoded in the RTP payload.                  */

-    void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb);

-

-    /* statistics, used for 2-pass encoding */

-    int mv_bits;

-    int header_bits;

-    int i_tex_bits;

-    int p_tex_bits;

-    int i_count;

-    int p_count;

-    int skip_count;

-    int misc_bits;

-

-    /**

-     * number of bits used for the previously encoded frame

-     * - encoding: Set by libavcodec.

-     * - decoding: unused

-     */

-    int frame_bits;

-

-    /**

-     * Private data of the user, can be used to carry app specific stuff.

-     * - encoding: Set by user.

-     * - decoding: Set by user.

-     */

-    void *opaque;

-

-    char codec_name[32];

-    enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */

-    enum CodecID codec_id; /* see CODEC_ID_xxx */

-

-    /**

-     * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').

-     * This is used to work around some encoder bugs.

-     * A demuxer should set this to what is stored in the field used to identify the codec.

-     * If there are multiple such fields in a container then the demuxer should choose the one

-     * which maximizes the information about the used codec.

-     * If the codec tag field in a container is larger than 32 bits then the demuxer should

-     * remap the longer ID to 32 bits with a table or other structure. Alternatively a new

-     * extra_codec_tag + size could be added but for this a clear advantage must be demonstrated

-     * first.

-     * - encoding: Set by user, if not then the default based on codec_id will be used.

-     * - decoding: Set by user, will be converted to uppercase by libavcodec during init.

-     */

-    unsigned int codec_tag;

-

-    /**

-     * Work around bugs in encoders which sometimes cannot be detected automatically.

-     * - encoding: Set by user

-     * - decoding: Set by user

-     */

-    int workaround_bugs;

-#define FF_BUG_AUTODETECT       1  ///< autodetection

-#define FF_BUG_OLD_MSMPEG4      2

-#define FF_BUG_XVID_ILACE       4

-#define FF_BUG_UMP4             8

-#define FF_BUG_NO_PADDING       16

-#define FF_BUG_AMV              32

-#define FF_BUG_AC_VLC           0  ///< Will be removed, libavcodec can now handle these non-compliant files by default.

-#define FF_BUG_QPEL_CHROMA      64

-#define FF_BUG_STD_QPEL         128

-#define FF_BUG_QPEL_CHROMA2     256

-#define FF_BUG_DIRECT_BLOCKSIZE 512

-#define FF_BUG_EDGE             1024

-#define FF_BUG_HPEL_CHROMA      2048

-#define FF_BUG_DC_CLIP          4096

-#define FF_BUG_MS               8192 ///< Work around various bugs in Microsoft's broken decoders.

-#define FF_BUG_TRUNCATED       16384

-

     /**

      * luma single coefficient elimination threshold

      * - encoding: Set by user.

@@ -1539,25 +1507,6 @@ typedef struct AVCodecContext {

     int chroma_elim_threshold;

     /**

-     * strictly follow the standard (MPEG4, ...).

-     * - encoding: Set by user.

-     * - decoding: Set by user.

-     * Setting this to STRICT or higher means the encoder and decoder will

-     * generally do stupid things, whereas setting it to unofficial or lower

-     * will mean the encoder might produce output that is not supported by all

-     * spec-compliant decoders. Decoders don't differentiate between normal,

-     * unofficial and experimental (that is, they always try to decode things

-     * when they can) unless they are explicitly asked to behave stupidly

-     * (=strictly conform to the specs)

-     */

-    int strict_std_compliance;

-#define FF_COMPLIANCE_VERY_STRICT   2 ///< Strictly conform to an older more strict version of the spec or reference software.

-#define FF_COMPLIANCE_STRICT        1 ///< Strictly conform to all the things in the spec no matter what consequences.

-#define FF_COMPLIANCE_NORMAL        0

-#define FF_COMPLIANCE_UNOFFICIAL   -1 ///< Allow unofficial extensions

-#define FF_COMPLIANCE_EXPERIMENTAL -2 ///< Allow nonstandardized experimental things.

-

-    /**

      * qscale offset between IP and B-frames

      * - encoding: Set by user.

      * - decoding: unused

@@ -1565,74 +1514,6 @@ typedef struct AVCodecContext {

     float b_quant_offset;

     /**

-     * Called at the beginning of each frame to get a buffer for it.

-     *

-     * The function will set AVFrame.data[], AVFrame.linesize[].

-     * AVFrame.extended_data[] must also be set, but it should be the same as

-     * AVFrame.data[] except for planar audio with more channels than can fit

-     * in AVFrame.data[]. In that case, AVFrame.data[] shall still contain as

-     * many data pointers as it can hold.

-     *

-     * if CODEC_CAP_DR1 is not set then get_buffer() must call

-     * avcodec_default_get_buffer() instead of providing buffers allocated by

-     * some other means.

-     *

-     * AVFrame.data[] should be 32- or 16-byte-aligned unless the CPU doesn't

-     * need it. avcodec_default_get_buffer() aligns the output buffer properly,

-     * but if get_buffer() is overridden then alignment considerations should

-     * be taken into account.

-     *

-     * @see avcodec_default_get_buffer()

-     *

-     * Video:

-     *

-     * If pic.reference is set then the frame will be read later by libavcodec.

-     * avcodec_align_dimensions2() should be used to find the required width and

-     * height, as they normally need to be rounded up to the next multiple of 16.

-     *

-     * If frame multithreading is used and thread_safe_callbacks is set,

-     * it may be called from a different thread, but not from more than one at

-     * once. Does not need to be reentrant.

-     *

-     * @see release_buffer(), reget_buffer()

-     * @see avcodec_align_dimensions2()

-     *

-     * Audio:

-     *

-     * Decoders request a buffer of a particular size by setting

-     * AVFrame.nb_samples prior to calling get_buffer(). The decoder may,

-     * however, utilize only part of the buffer by setting AVFrame.nb_samples

-     * to a smaller value in the output frame.

-     *

-     * Decoders cannot use the buffer after returning from

-     * avcodec_decode_audio4(), so they will not call release_buffer(), as it

-     * is assumed to be released immediately upon return.

-     *

-     * As a convenience, av_samples_get_buffer_size() and

-     * av_samples_fill_arrays() in libavutil may be used by custom get_buffer()

-     * functions to find the required data size and to fill data pointers and

-     * linesize. In AVFrame.linesize, only linesize[0] may be set for audio

-     * since all planes must be the same size.

-     *

-     * @see av_samples_get_buffer_size(), av_samples_fill_arrays()

-     *

-     * - encoding: unused

-     * - decoding: Set by libavcodec, user can override.

-     */

-    int (*get_buffer)(struct AVCodecContext *c, AVFrame *pic);

-

-    /**

-     * Called to release buffers which were allocated with get_buffer.

-     * A released buffer can be reused in get_buffer().

-     * pic.data[*] must be set to NULL.

-     * May be called from a different thread if frame multithreading is used,

-     * but not by more than one thread at once, so does not need to be reentrant.

-     * - encoding: unused

-     * - decoding: Set by libavcodec, user can override.

-     */

-    void (*release_buffer)(struct AVCodecContext *c, AVFrame *pic);

-

-    /**

      * Size of the frame reordering buffer in the decoder.

      * For MPEG-2 it is 1 IPB or 0 low delay IP.

      * - encoding: Set by libavcodec.

@@ -1641,12 +1522,6 @@ typedef struct AVCodecContext {

     int has_b_frames;

     /**

-     * number of bytes per packet if constant and known or 0

-     * Used by some WAV based audio codecs.

-     */

-    int block_align;

-

-    /**

      * 0-> h263 quant 1-> mpeg quant

      * - encoding: Set by user.

      * - decoding: unused

@@ -1654,69 +1529,6 @@ typedef struct AVCodecContext {

     int mpeg_quant;

     /**

-     * pass1 encoding statistics output buffer

-     * - encoding: Set by libavcodec.

-     * - decoding: unused

-     */

-    char *stats_out;

-

-    /**

-     * pass2 encoding statistics input buffer

-     * Concatenated stuff from stats_out of pass1 should be placed here.

-     * - encoding: Allocated/set/freed by user.

-     * - decoding: unused

-     */

-    char *stats_in;

-

-    /**

-     * ratecontrol qmin qmax limiting method

-     * 0-> clipping, 1-> use a nice continous function to limit qscale wthin qmin/qmax.

-     * - encoding: Set by user.

-     * - decoding: unused

-     */

-    float rc_qsquish;

-

-    float rc_qmod_amp;

-    int rc_qmod_freq;

-

-    /**

-     * ratecontrol override, see RcOverride

-     * - encoding: Allocated/set/freed by user.

-     * - decoding: unused

-     */

-    RcOverride *rc_override;

-    int rc_override_count;

-

-    /**

-     * rate control equation

-     * - encoding: Set by user

-     * - decoding: unused

-     */

-    const char *rc_eq;

-

-    /**

-     * maximum bitrate

-     * - encoding: Set by user.

-     * - decoding: unused

-     */

-    int rc_max_rate;

-

-    /**

-     * minimum bitrate

-     * - encoding: Set by user.

-     * - decoding: unused

-     */

-    int rc_min_rate;

-

-    /**

-     * decoder bitstream buffer size

-     * - encoding: Set by user.

-     * - decoding: unused

-     */

-    int rc_buffer_size;

-    float rc_buffer_aggressivity;

-

-    /**

      * qscale factor between P and I-frames

      * If > 0 then the last p frame quantizer will be used (q= lastp_q*factor+offset).

      * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).

@@ -1733,26 +1545,6 @@ typedef struct AVCodecContext {

     float i_quant_offset;

     /**

-     * initial complexity for pass1 ratecontrol

-     * - encoding: Set by user.

-     * - decoding: unused

-     */

-    float rc_initial_cplx;

-

-    /**

-     * DCT algorithm, see FF_DCT_* below

-     * - encoding: Set by user.

-     * - decoding: unused

-     */

-    int dct_algo;

-#define FF_DCT_AUTO    0

-#define FF_DCT_FASTINT 1

-#define FF_DCT_INT     2

-#define FF_DCT_MMX     3

-#define FF_DCT_ALTIVEC 5

-#define FF_DCT_FAAN    6

-

-    /**

      * luminance masking (0-> disabled)

      * - encoding: Set by user.

      * - decoding: unused

@@ -1788,76 +1580,12 @@ typedef struct AVCodecContext {

     float dark_masking;

     /**

-     * IDCT algorithm, see FF_IDCT_* below.

-     * - encoding: Set by user.

-     * - decoding: Set by user.

-     */

-    int idct_algo;

-#define FF_IDCT_AUTO          0

-#define FF_IDCT_INT           1

-#define FF_IDCT_SIMPLE        2

-#define FF_IDCT_SIMPLEMMX     3

-#define FF_IDCT_LIBMPEG2MMX   4

-#define FF_IDCT_MMI           5

-#define FF_IDCT_ARM           7

-#define FF_IDCT_ALTIVEC       8

-#define FF_IDCT_SH4           9

-#define FF_IDCT_SIMPLEARM     10

-#define FF_IDCT_H264          11

-#define FF_IDCT_VP3           12

-#define FF_IDCT_IPP           13

-#define FF_IDCT_XVIDMMX       14

-#define FF_IDCT_CAVS          15

-#define FF_IDCT_SIMPLEARMV5TE 16

-#define FF_IDCT_SIMPLEARMV6   17