September 2010 - ffmpeg-cvslog

r25277 - in trunk/libavcodec: avcodec.h options.c
by subversion＠mplayerhq.hu 30 Sep '10

30 Sep '10

Author: aurel Date: Thu Sep 30 22:40:10 2010 New Revision: 25277 Log: add FF_API_INOFFICIAL define to disable the deprecated 'inofficial' flag Modified: trunk/libavcodec/avcodec.h trunk/libavcodec/options.c Modified: trunk/libavcodec/avcodec.h ============================================================================== --- trunk/libavcodec/avcodec.h Thu Sep 30 22:34:35 2010 (r25276) +++ trunk/libavcodec/avcodec.h Thu Sep 30 22:40:10 2010 (r25277) @@ -72,6 +72,9 @@ #ifndef FF_API_SET_STRING_OLD #define FF_API_SET_STRING_OLD (LIBAVCODEC_VERSION_MAJOR < 53) #endif +#ifndef FF_API_INOFFICIAL +#define FF_API_INOFFICIAL (LIBAVCODEC_VERSION_MAJOR < 53) +#endif #define AV_NOPTS_VALUE INT64_C(0x8000000000000000) #define AV_TIME_BASE 1000000 @@ -1411,7 +1414,7 @@ typedef struct AVCodecContext { #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 -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_INOFFICIAL #define FF_COMPLIANCE_INOFFICIAL -1 ///< Allow inofficial extensions (deprecated - use FF_COMPLIANCE_UNOFFICIAL instead). #endif #define FF_COMPLIANCE_UNOFFICIAL -1 ///< Allow unofficial extensions Modified: trunk/libavcodec/options.c ============================================================================== --- trunk/libavcodec/options.c Thu Sep 30 22:34:35 2010 (r25276) +++ trunk/libavcodec/options.c Thu Sep 30 22:40:10 2010 (r25277) @@ -160,7 +160,7 @@ static const AVOption options[]={ {"very", "strictly conform to a older more strict version of the spec or reference software", 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_VERY_STRICT, INT_MIN, INT_MAX, V|D|E, "strict"}, {"strict", "strictly conform to all the things in the spec no matter what consequences", 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_STRICT, INT_MIN, INT_MAX, V|D|E, "strict"}, {"normal", NULL, 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_NORMAL, INT_MIN, INT_MAX, V|D|E, "strict"}, -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_INOFFICIAL {"inofficial", "allow unofficial extensions (deprecated - use unofficial)", 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_UNOFFICIAL, INT_MIN, INT_MAX, V|D|E, "strict"}, #endif {"unofficial", "allow unofficial extensions", 0, FF_OPT_TYPE_CONST, FF_COMPLIANCE_UNOFFICIAL, INT_MIN, INT_MAX, V|D|E, "strict"},

1 0

r25276 - in trunk/libavcodec: avcodec.h opt.c opt.h
by subversion＠mplayerhq.hu 30 Sep '10

30 Sep '10

Author: aurel Date: Thu Sep 30 22:34:35 2010 New Revision: 25276 Log: add FF_API_SET_STRING_OLD define to disable the deprecated av_set_string API Modified: trunk/libavcodec/avcodec.h trunk/libavcodec/opt.c trunk/libavcodec/opt.h Modified: trunk/libavcodec/avcodec.h ============================================================================== --- trunk/libavcodec/avcodec.h Thu Sep 30 22:31:42 2010 (r25275) +++ trunk/libavcodec/avcodec.h Thu Sep 30 22:34:35 2010 (r25276) @@ -69,6 +69,9 @@ #ifndef FF_API_USE_LPC #define FF_API_USE_LPC (LIBAVCODEC_VERSION_MAJOR < 53) #endif +#ifndef FF_API_SET_STRING_OLD +#define FF_API_SET_STRING_OLD (LIBAVCODEC_VERSION_MAJOR < 53) +#endif #define AV_NOPTS_VALUE INT64_C(0x8000000000000000) #define AV_TIME_BASE 1000000 Modified: trunk/libavcodec/opt.c ============================================================================== --- trunk/libavcodec/opt.c Thu Sep 30 22:31:42 2010 (r25275) +++ trunk/libavcodec/opt.c Thu Sep 30 22:34:35 2010 (r25276) @@ -65,7 +65,7 @@ FF_SYMVER(void, av_opt_set_defaults2, (v } #endif -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_SET_STRING_OLD const AVOption *av_set_string2(void *obj, const char *name, const char *val, int alloc){ const AVOption *o; if (av_set_string3(obj, name, val, alloc, &o) < 0) Modified: trunk/libavcodec/opt.h ============================================================================== --- trunk/libavcodec/opt.h Thu Sep 30 22:31:42 2010 (r25275) +++ trunk/libavcodec/opt.h Thu Sep 30 22:34:35 2010 (r25276) @@ -31,7 +31,7 @@ #include "avcodec.h" #include "libavutil/opt.h" -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_SET_STRING_OLD /** * @see av_set_string2() */

1 0

r25275 - in trunk/libavcodec: avcodec.h flacenc.c options.c
by subversion＠mplayerhq.hu 30 Sep '10

30 Sep '10

Author: aurel Date: Thu Sep 30 22:31:42 2010 New Revision: 25275 Log: add FF_API_USE_LPC define to disable the deprecated AVCodecContext.use_lpc field Modified: trunk/libavcodec/avcodec.h trunk/libavcodec/flacenc.c trunk/libavcodec/options.c Modified: trunk/libavcodec/avcodec.h ============================================================================== --- trunk/libavcodec/avcodec.h Thu Sep 30 22:24:49 2010 (r25274) +++ trunk/libavcodec/avcodec.h Thu Sep 30 22:31:42 2010 (r25275) @@ -66,6 +66,9 @@ #ifndef FF_API_SUBTITLE_OLD #define FF_API_SUBTITLE_OLD (LIBAVCODEC_VERSION_MAJOR < 53) #endif +#ifndef FF_API_USE_LPC +#define FF_API_USE_LPC (LIBAVCODEC_VERSION_MAJOR < 53) +#endif #define AV_NOPTS_VALUE INT64_C(0x8000000000000000) #define AV_TIME_BASE 1000000 @@ -2453,7 +2456,7 @@ typedef struct AVCodecContext { int compression_level; #define FF_COMPRESSION_DEFAULT -1 -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_USE_LPC /** * Sets whether to use LPC mode - used by FLAC encoder. * - encoding: Set by user. Modified: trunk/libavcodec/flacenc.c ============================================================================== --- trunk/libavcodec/flacenc.c Thu Sep 30 22:24:49 2010 (r25274) +++ trunk/libavcodec/flacenc.c Thu Sep 30 22:31:42 2010 (r25275) @@ -288,7 +288,7 @@ static av_cold int flac_encode_init(AVCo s->options.max_partition_order = ((int[]){ 2, 2, 3, 3, 3, 8, 8, 8, 8, 8, 8, 8, 8})[level]; /* set compression option overrides from AVCodecContext */ -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_USE_LPC /* for compatibility with deprecated AVCodecContext.use_lpc */ if (avctx->use_lpc == 0) { s->options.lpc_type = AV_LPC_TYPE_FIXED; Modified: trunk/libavcodec/options.c ============================================================================== --- trunk/libavcodec/options.c Thu Sep 30 22:24:49 2010 (r25274) +++ trunk/libavcodec/options.c Thu Sep 30 22:31:42 2010 (r25275) @@ -382,7 +382,7 @@ static const AVOption options[]={ {"ivlc", "intra vlc table", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_INTRA_VLC, INT_MIN, INT_MAX, V|E, "flags2"}, {"b_sensitivity", "adjusts sensitivity of b_frame_strategy 1", OFFSET(b_sensitivity), FF_OPT_TYPE_INT, 40, 1, INT_MAX, V|E}, {"compression_level", NULL, OFFSET(compression_level), FF_OPT_TYPE_INT, FF_COMPRESSION_DEFAULT, INT_MIN, INT_MAX, V|A|E}, -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_USE_LPC {"use_lpc", "sets whether to use LPC mode (FLAC)", OFFSET(use_lpc), FF_OPT_TYPE_INT, -1, INT_MIN, INT_MAX, A|E}, #endif {"lpc_coeff_precision", "LPC coefficient precision (FLAC)", OFFSET(lpc_coeff_precision), FF_OPT_TYPE_INT, DEFAULT, 0, INT_MAX, A|E},

1 0

r25274 - trunk/libavfilter/vsrc_nullsrc.c
by subversion＠mplayerhq.hu 30 Sep '10

30 Sep '10

Author: stefano Date: Thu Sep 30 22:24:49 2010 New Revision: 25274 Log: Return AVERROR(EINVAL) rather than -1 in case of invalid values. Modified: trunk/libavfilter/vsrc_nullsrc.c Modified: trunk/libavfilter/vsrc_nullsrc.c ============================================================================== --- trunk/libavfilter/vsrc_nullsrc.c Thu Sep 30 22:12:46 2010 (r25273) +++ trunk/libavfilter/vsrc_nullsrc.c Thu Sep 30 22:24:49 2010 (r25274) @@ -39,7 +39,7 @@ static int init(AVFilterContext *ctx, co if (priv->w <= 0 || priv->h <= 0) { av_log(ctx, AV_LOG_ERROR, "Non-positive size values are not acceptable.\n"); - return -1; + return AVERROR(EINVAL); } return 0;

1 0

r25273 - in trunk/libavcodec: avcodec.h utils.c
by subversion＠mplayerhq.hu 30 Sep '10

30 Sep '10

Author: aurel Date: Thu Sep 30 22:12:46 2010 New Revision: 25273 Log: add FF_API_SUBTITLE_OLD define to disable the deprecated decode_subtitle API Modified: trunk/libavcodec/avcodec.h trunk/libavcodec/utils.c Modified: trunk/libavcodec/avcodec.h ============================================================================== --- trunk/libavcodec/avcodec.h Thu Sep 30 21:51:22 2010 (r25272) +++ trunk/libavcodec/avcodec.h Thu Sep 30 22:12:46 2010 (r25273) @@ -63,6 +63,9 @@ #ifndef FF_API_VIDEO_OLD #define FF_API_VIDEO_OLD (LIBAVCODEC_VERSION_MAJOR < 53) #endif +#ifndef FF_API_SUBTITLE_OLD +#define FF_API_SUBTITLE_OLD (LIBAVCODEC_VERSION_MAJOR < 53) +#endif #define AV_NOPTS_VALUE INT64_C(0x8000000000000000) #define AV_TIME_BASE 1000000 @@ -3590,7 +3593,7 @@ int avcodec_decode_video2(AVCodecContext int *got_picture_ptr, AVPacket *avpkt); -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_SUBTITLE_OLD /* Decode a subtitle message. Return -1 if error, otherwise return the * number of bytes used. If no subtitle could be decompressed, * got_sub_ptr is zero. Otherwise, the subtitle is stored in *sub. */ Modified: trunk/libavcodec/utils.c ============================================================================== --- trunk/libavcodec/utils.c Thu Sep 30 21:51:22 2010 (r25272) +++ trunk/libavcodec/utils.c Thu Sep 30 22:12:46 2010 (r25273) @@ -671,7 +671,7 @@ int attribute_align_arg avcodec_decode_a return ret; } -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_SUBTITLE_OLD int avcodec_decode_subtitle(AVCodecContext *avctx, AVSubtitle *sub, int *got_sub_ptr, const uint8_t *buf, int buf_size)

1 0

r25272 - in trunk/libavcodec: avcodec.h utils.c
by subversion＠mplayerhq.hu 30 Sep '10

30 Sep '10

Author: aurel Date: Thu Sep 30 21:51:22 2010 New Revision: 25272 Log: add FF_API_VIDEO_OLD define to disable the deprecated decode_video API Modified: trunk/libavcodec/avcodec.h trunk/libavcodec/utils.c Modified: trunk/libavcodec/avcodec.h ============================================================================== --- trunk/libavcodec/avcodec.h Thu Sep 30 20:12:27 2010 (r25271) +++ trunk/libavcodec/avcodec.h Thu Sep 30 21:51:22 2010 (r25272) @@ -60,6 +60,9 @@ #ifndef FF_API_AUDIO_OLD #define FF_API_AUDIO_OLD (LIBAVCODEC_VERSION_MAJOR < 53) #endif +#ifndef FF_API_VIDEO_OLD +#define FF_API_VIDEO_OLD (LIBAVCODEC_VERSION_MAJOR < 53) +#endif #define AV_NOPTS_VALUE INT64_C(0x8000000000000000) #define AV_TIME_BASE 1000000 @@ -3524,7 +3527,7 @@ int avcodec_decode_audio3(AVCodecContext int *frame_size_ptr, AVPacket *avpkt); -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_VIDEO_OLD /** * Decode a video frame from buf into picture. * Wrapper function which calls avcodec_decode_video2. Modified: trunk/libavcodec/utils.c ============================================================================== --- trunk/libavcodec/utils.c Thu Sep 30 20:12:27 2010 (r25271) +++ trunk/libavcodec/utils.c Thu Sep 30 21:51:22 2010 (r25272) @@ -591,7 +591,7 @@ int avcodec_encode_subtitle(AVCodecConte return ret; } -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_VIDEO_OLD int attribute_align_arg avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture, int *got_picture_ptr, const uint8_t *buf, int buf_size)

1 0

r25264 - trunk/libavformat/isom.c
by subversion＠mplayerhq.hu 30 Sep '10

30 Sep '10

Author: bcoudurier Date: Wed Sep 29 23:35:52 2010 New Revision: 25264 Log: Remove duplicate entries Modified: trunk/libavformat/isom.c Modified: trunk/libavformat/isom.c ============================================================================== --- trunk/libavformat/isom.c Wed Sep 29 23:34:31 2010 (r25263) +++ trunk/libavformat/isom.c Wed Sep 29 23:35:52 2010 (r25264) @@ -132,7 +132,6 @@ const AVCodecTag codec_movvideo_tags[] = { CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, /* Apple MPEG-1 Camcorder */ { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */ - { CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, { CODEC_ID_MPEG2VIDEO, MKTAG('m', '2', 'v', '2') }, /* Apple MPEG-2 Camcorder */ { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '1') }, /* MPEG2 HDV 720p30 */ { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '2') }, /* MPEG2 HDV 1080i60 */ @@ -170,7 +169,6 @@ const AVCodecTag codec_movvideo_tags[] = { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'e') }, /* XDCAM EX 1080p25 VBR */ { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'f') }, /* XDCAM EX 1080p30 VBR */ { CODEC_ID_MPEG2VIDEO, MKTAG('A', 'V', 'm', 'p') }, /* AVID IMX PAL */ - { CODEC_ID_MPEG2VIDEO, MKTAG('m', '2', 'v', '1') }, { CODEC_ID_JPEG2000, MKTAG('m', 'j', 'p', '2') }, /* JPEG 2000 produced by FCP */

3 2

r25271 - trunk/libavformat/isom.c
by subversion＠mplayerhq.hu 30 Sep '10

30 Sep '10

Author: bcoudurier Date: Thu Sep 30 20:12:27 2010 New Revision: 25271 Log: Correct tag is m2v1 Modified: trunk/libavformat/isom.c Modified: trunk/libavformat/isom.c ============================================================================== --- trunk/libavformat/isom.c Thu Sep 30 17:37:01 2010 (r25270) +++ trunk/libavformat/isom.c Thu Sep 30 20:12:27 2010 (r25271) @@ -132,7 +132,7 @@ const AVCodecTag codec_movvideo_tags[] = { CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, /* Apple MPEG-1 Camcorder */ { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */ - { CODEC_ID_MPEG2VIDEO, MKTAG('m', '2', 'v', '2') }, /* Apple MPEG-2 Camcorder */ + { CODEC_ID_MPEG2VIDEO, MKTAG('m', '2', 'v', '1') }, /* Apple MPEG-2 Camcorder */ { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '1') }, /* MPEG2 HDV 720p30 */ { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '2') }, /* MPEG2 HDV 1080i60 */ { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '3') }, /* MPEG2 HDV 1080i50 */

1 0

r25270 - in trunk/libavcodec: avcodec.h resample.c utils.c
by subversion＠mplayerhq.hu 30 Sep '10

30 Sep '10

Author: aurel Date: Thu Sep 30 17:37:01 2010 New Revision: 25270 Log: add FF_API_AUDIO_OLD define to disable the deprecated decode_audio API Modified: trunk/libavcodec/avcodec.h trunk/libavcodec/resample.c trunk/libavcodec/utils.c Modified: trunk/libavcodec/avcodec.h ============================================================================== --- trunk/libavcodec/avcodec.h Thu Sep 30 14:26:42 2010 (r25269) +++ trunk/libavcodec/avcodec.h Thu Sep 30 17:37:01 2010 (r25270) @@ -57,6 +57,9 @@ #ifndef FF_API_OPT_SHOW #define FF_API_OPT_SHOW (LIBAVCODEC_VERSION_MAJOR < 53) #endif +#ifndef FF_API_AUDIO_OLD +#define FF_API_AUDIO_OLD (LIBAVCODEC_VERSION_MAJOR < 53) +#endif #define AV_NOPTS_VALUE INT64_C(0x8000000000000000) #define AV_TIME_BASE 1000000 @@ -2998,7 +3001,7 @@ struct AVResampleContext; typedef struct ReSampleContext ReSampleContext; -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_AUDIO_OLD /** * @deprecated Use av_audio_resample_init() instead. */ @@ -3459,7 +3462,7 @@ int avcodec_default_execute2(AVCodecCont */ int avcodec_open(AVCodecContext *avctx, AVCodec *codec); -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_AUDIO_OLD /** * Decode an audio frame from buf into samples. * Wrapper function which calls avcodec_decode_audio3. Modified: trunk/libavcodec/resample.c ============================================================================== --- trunk/libavcodec/resample.c Thu Sep 30 14:26:42 2010 (r25269) +++ trunk/libavcodec/resample.c Thu Sep 30 17:37:01 2010 (r25270) @@ -217,7 +217,7 @@ ReSampleContext *av_audio_resample_init( return s; } -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_AUDIO_OLD ReSampleContext *audio_resample_init(int output_channels, int input_channels, int output_rate, int input_rate) { Modified: trunk/libavcodec/utils.c ============================================================================== --- trunk/libavcodec/utils.c Thu Sep 30 14:26:42 2010 (r25269) +++ trunk/libavcodec/utils.c Thu Sep 30 17:37:01 2010 (r25270) @@ -630,7 +630,7 @@ int attribute_align_arg avcodec_decode_v return ret; } -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_AUDIO_OLD int attribute_align_arg avcodec_decode_audio2(AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, const uint8_t *buf, int buf_size)

1 0

r25269 - trunk/libavcodec/dvdata.c
by subversion＠mplayerhq.hu 30 Sep '10

30 Sep '10

Author: cehoyos Date: Thu Sep 30 14:26:42 2010 New Revision: 25269 Log: Fix a yuv420p sample that was incorrectly detected as yuv411p (576i50 25Mbps 4:1:1 special case was wrong). Fixes issue2211 Patch by Niobos, niobos dest-unreach be Modified: trunk/libavcodec/dvdata.c Modified: trunk/libavcodec/dvdata.c ============================================================================== --- trunk/libavcodec/dvdata.c Thu Sep 30 12:55:08 2010 (r25268) +++ trunk/libavcodec/dvdata.c Thu Sep 30 14:26:42 2010 (r25269) @@ -255,7 +255,7 @@ const DVprofile* ff_dv_frame_profile(con int stype = frame[80*5 + 48 + 3] & 0x1f; /* 576i50 25Mbps 4:1:1 is a special case */ - if (dsf == 1 && stype == 0 && frame[5] & 0x07) { + if (dsf == 1 && stype == 0 && frame[4] & 0x07 /* the APT field */) { return &dv_profiles[2]; }

1 0