comparison avcodec.h @ 880:1c32039e7215 libavcodec

aspect ratio cleanup

879:af969e91f422

#include "common.h"

#define LIBAVCODEC_VERSION_INT 0x000406
#define LIBAVCODEC_VERSION     "0.4.6"
#define LIBAVCODEC_BUILD       4639
#define LIBAVCODEC_BUILD_STR   "4639"

enum CodecID {
    CODEC_ID_NONE, 
    CODEC_ID_MPEG1VIDEO,
    CODEC_ID_H263,

#define CODEC_FLAG_TRUNCATED  0x00010000 /* input bitstream might be truncated at a random location instead 
                                            of only at frame boundaries */
#define CODEC_FLAG_NORMALIZE_AQP  0x00020000 /* normalize adaptive quantization */
#define CODEC_FLAG_INTERLACED_DCT 0x00040000 /* use interlaced dct */
#define CODEC_FLAG_LOW_DELAY      0x00080000 /* force low delay / will fail on b frames */

/* codec capabilities */

#define CODEC_CAP_DRAW_HORIZ_BAND 0x0001 /* decoder can use draw_horiz_band callback */
#define CODEC_CAP_DR1             0x0002 /* direct rendering method 1 */

     * decoding: set by user, some codecs might override / change it during playback
     */
    int width, height;
    
    /**
     * encoding: set by user. 0 if not known
     * decoding: set by lavc. 0 if not known
     */
    int aspect_ratio_info;
#define FF_ASPECT_SQUARE 1
#define FF_ASPECT_4_3_625 2
#define FF_ASPECT_4_3_525 3

     * decoding: unused
     */
    float rc_initial_cplx;

    /**
     * custom aspect ratio, used if aspect_info==FF_ASPECT_EXTENDED
     * encoding: set by user.
     * decoding: set by lavc.
     */
    int aspected_width;
    int aspected_height;

    /**

     */
     int prediction_method;
#define FF_PRED_LEFT   0
#define FF_PRED_PLANE  1
#define FF_PRED_MEDIAN 2
} AVCodecContext;

typedef struct AVCodec {
    const char *name;
    int type;

880:1c32039e7215

#include "common.h"

#define LIBAVCODEC_VERSION_INT 0x000406
#define LIBAVCODEC_VERSION     "0.4.6"
#define LIBAVCODEC_BUILD       4640
#define LIBAVCODEC_BUILD_STR   "4640"

enum CodecID {
    CODEC_ID_NONE, 
    CODEC_ID_MPEG1VIDEO,
    CODEC_ID_H263,

#define CODEC_FLAG_TRUNCATED  0x00010000 /* input bitstream might be truncated at a random location instead 
                                            of only at frame boundaries */
#define CODEC_FLAG_NORMALIZE_AQP  0x00020000 /* normalize adaptive quantization */
#define CODEC_FLAG_INTERLACED_DCT 0x00040000 /* use interlaced dct */
#define CODEC_FLAG_LOW_DELAY      0x00080000 /* force low delay / will fail on b frames */
#define CODEC_FLAG_ALT_SCAN       0x00100000 /* use alternate scan */

/* codec capabilities */

#define CODEC_CAP_DRAW_HORIZ_BAND 0x0001 /* decoder can use draw_horiz_band callback */
#define CODEC_CAP_DR1             0x0002 /* direct rendering method 1 */

     * decoding: set by user, some codecs might override / change it during playback
     */
    int width, height;
    
    /**
     * Obsolete, will be removed
     */
    int aspect_ratio_info;
#define FF_ASPECT_SQUARE 1
#define FF_ASPECT_4_3_625 2
#define FF_ASPECT_4_3_525 3

     * decoding: unused
     */
    float rc_initial_cplx;

    /**
     * Obsolete, will be removed
     */
    int aspected_width;
    int aspected_height;

    /**

     */
     int prediction_method;
#define FF_PRED_LEFT   0
#define FF_PRED_PLANE  1
#define FF_PRED_MEDIAN 2
    
    /**
     * aspect ratio. (0 if unknown)
     * encoding: set by user.
     * decoding: set by lavc.
     */
    float aspect_ratio;
} AVCodecContext;

typedef struct AVCodec {
    const char *name;
    int type;