May 2010 - ffmpeg-cvslog - lists.ffmpeg.org

r23398 - trunk/ffmpeg.c
by subversion＠mplayerhq.hu 31 May '10

31 May '10

Author: janne Date: Tue Jun 1 00:35:14 2010 New Revision: 23398 Log: ffmpeg: offer alternatives for experimental codecs if they exist Modified: trunk/ffmpeg.c Modified: trunk/ffmpeg.c ============================================================================== --- trunk/ffmpeg.c Tue Jun 1 00:31:51 2010 (r23397) +++ trunk/ffmpeg.c Tue Jun 1 00:35:14 2010 (r23398) @@ -3091,6 +3091,12 @@ static enum CodecID find_codec_or_die(co fprintf(stderr, "%s '%s' is experimental and might produce bad " "results.\nAdd '-strict experimental' if you want to use it.\n", codec_string, codec->name); + codec = encoder ? + avcodec_find_encoder(codec->id) : + avcodec_find_decoder(codec->id); + if (!(codec->capabilities & CODEC_CAP_EXPERIMENTAL)) + fprintf(stderr, "Or use the non experimental %s '%s'.\n", + codec_string, codec->name); av_exit(1); } return codec->id;

1 0

r23397 - trunk/ffmpeg.c
by subversion＠mplayerhq.hu 31 May '10

31 May '10

Author: janne Date: Tue Jun 1 00:31:51 2010 New Revision: 23397 Log: ffmpeg: fail if user selected codec is experimental and strict_std_compliance > experimental Modified: trunk/ffmpeg.c Modified: trunk/ffmpeg.c ============================================================================== --- trunk/ffmpeg.c Tue Jun 1 00:01:31 2010 (r23396) +++ trunk/ffmpeg.c Tue Jun 1 00:31:51 2010 (r23397) @@ -3068,7 +3068,7 @@ static int opt_input_ts_offset(const cha return 0; } -static enum CodecID find_codec_or_die(const char *name, int type, int encoder) +static enum CodecID find_codec_or_die(const char *name, int type, int encoder, int strict) { const char *codec_string = encoder ? "encoder" : "decoder"; AVCodec *codec; @@ -3086,6 +3086,13 @@ static enum CodecID find_codec_or_die(co fprintf(stderr, "Invalid %s type '%s'\n", codec_string, name); av_exit(1); } + if(codec->capabilities & CODEC_CAP_EXPERIMENTAL && + strict > FF_COMPLIANCE_EXPERIMENTAL) { + fprintf(stderr, "%s '%s' is experimental and might produce bad " + "results.\nAdd '-strict experimental' if you want to use it.\n", + codec_string, codec->name); + av_exit(1); + } return codec->id; } @@ -3133,9 +3140,15 @@ static void opt_input_file(const char *f set_context_opts(ic, avformat_opts, AV_OPT_FLAG_DECODING_PARAM); - ic->video_codec_id = find_codec_or_die(video_codec_name , AVMEDIA_TYPE_VIDEO , 0); - ic->audio_codec_id = find_codec_or_die(audio_codec_name , AVMEDIA_TYPE_AUDIO , 0); - ic->subtitle_codec_id= find_codec_or_die(subtitle_codec_name, AVMEDIA_TYPE_SUBTITLE, 0); + ic->video_codec_id = + find_codec_or_die(video_codec_name , AVMEDIA_TYPE_VIDEO , 0, + avcodec_opts[AVMEDIA_TYPE_VIDEO ]->strict_std_compliance); + ic->audio_codec_id = + find_codec_or_die(audio_codec_name , AVMEDIA_TYPE_AUDIO , 0, + avcodec_opts[AVMEDIA_TYPE_AUDIO ]->strict_std_compliance); + ic->subtitle_codec_id= + find_codec_or_die(subtitle_codec_name, AVMEDIA_TYPE_SUBTITLE, 0, + avcodec_opts[AVMEDIA_TYPE_SUBTITLE]->strict_std_compliance); ic->flags |= AVFMT_FLAG_NONBLOCK; if(pgmyuv_compatibility_hack) @@ -3364,7 +3377,8 @@ static void new_video_stream(AVFormatCon AVRational fps= frame_rate.num ? frame_rate : (AVRational){25,1}; if (video_codec_name) { - codec_id = find_codec_or_die(video_codec_name, AVMEDIA_TYPE_VIDEO, 1); + codec_id = find_codec_or_die(video_codec_name, AVMEDIA_TYPE_VIDEO, 1, + video_enc->strict_std_compliance); codec = avcodec_find_encoder_by_name(video_codec_name); output_codecs[nb_ocodecs] = codec; } else { @@ -3495,7 +3509,8 @@ static void new_audio_stream(AVFormatCon set_context_opts(audio_enc, avcodec_opts[AVMEDIA_TYPE_AUDIO], AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM); if (audio_codec_name) { - codec_id = find_codec_or_die(audio_codec_name, AVMEDIA_TYPE_AUDIO, 1); + codec_id = find_codec_or_die(audio_codec_name, AVMEDIA_TYPE_AUDIO, 1, + audio_enc->strict_std_compliance); codec = avcodec_find_encoder_by_name(audio_codec_name); output_codecs[nb_ocodecs] = codec; } else { @@ -3555,7 +3570,8 @@ static void new_subtitle_stream(AVFormat st->stream_copy = 1; } else { set_context_opts(avcodec_opts[AVMEDIA_TYPE_SUBTITLE], subtitle_enc, AV_OPT_FLAG_SUBTITLE_PARAM | AV_OPT_FLAG_ENCODING_PARAM); - subtitle_enc->codec_id = find_codec_or_die(subtitle_codec_name, AVMEDIA_TYPE_SUBTITLE, 1); + subtitle_enc->codec_id = find_codec_or_die(subtitle_codec_name, AVMEDIA_TYPE_SUBTITLE, 1, + subtitle_enc->strict_std_compliance); output_codecs[nb_ocodecs] = avcodec_find_encoder_by_name(subtitle_codec_name); } nb_ocodecs++;

1 0

r23396 - trunk/libavcodec/h264.c
by subversion＠mplayerhq.hu 31 May '10

31 May '10

Author: bcoudurier Date: Tue Jun 1 00:01:31 2010 New Revision: 23396 Log: Pass codec pixel format list to get_format, if present, fix vdpau decoding Modified: trunk/libavcodec/h264.c Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c Mon May 31 23:49:53 2010 (r23395) +++ trunk/libavcodec/h264.c Tue Jun 1 00:01:31 2010 (r23396) @@ -1850,6 +1850,8 @@ static int decode_slice_header(H264Conte h->sps.num_units_in_tick, den, 1<<30); } s->avctx->pix_fmt = s->avctx->get_format(s->avctx, + s->avctx->codec->pix_fmts ? + s->avctx->codec->pix_fmts : s->avctx->color_range == AVCOL_RANGE_JPEG ? hwaccel_pixfmt_list_h264_jpeg_420 : ff_hwaccel_pixfmt_list_420);

1 0

r23395 - in branches/0.6: . LICENSE
by subversion＠mplayerhq.hu 31 May '10

31 May '10

Author: siretart Date: Mon May 31 23:49:53 2010 New Revision: 23395 Log: Add a short note about libvpx. backport r23394 by diego Modified: branches/0.6/ (props changed) branches/0.6/LICENSE Modified: branches/0.6/LICENSE ============================================================================== --- branches/0.6/LICENSE Mon May 31 23:41:53 2010 (r23394) +++ branches/0.6/LICENSE Mon May 31 23:49:53 2010 (r23395) @@ -48,3 +48,7 @@ version needs to be upgraded by passing The nonfree external library libfaac can be hooked up in FFmpeg. You need to pass --enable-nonfree to configure to enable it. Employ this option with care as FFmpeg then becomes nonfree and unredistributable. + +The libvpx external library has a license that is (L)GPL incompatible. If you +combine it with FFmpeg the resulting binaries are unredistributable. Thus you +need to pass --enable-nonfree to configure to enable it.

1 0

r23394 - trunk/LICENSE
by subversion＠mplayerhq.hu 31 May '10

31 May '10

Author: diego Date: Mon May 31 23:41:53 2010 New Revision: 23394 Log: Add a short note about libvpx. Modified: trunk/LICENSE Modified: trunk/LICENSE ============================================================================== --- trunk/LICENSE Mon May 31 15:06:51 2010 (r23393) +++ trunk/LICENSE Mon May 31 23:41:53 2010 (r23394) @@ -46,3 +46,7 @@ version needs to be upgraded by passing The nonfree external library libfaac can be hooked up in FFmpeg. You need to pass --enable-nonfree to configure to enable it. Employ this option with care as FFmpeg then becomes nonfree and unredistributable. + +The libvpx external library has a license that is (L)GPL incompatible. If you +combine it with FFmpeg the resulting binaries are unredistributable. Thus you +need to pass --enable-nonfree to configure to enable it.

1 0

r23393 - in branches/0.5: . configure
by subversion＠mplayerhq.hu 31 May '10

31 May '10

Author: siretart Date: Mon May 31 15:06:51 2010 New Revision: 23393 Log: configure: improve temp file creation and cleanup backport r17752 by mru Modified: branches/0.5/ (props changed) branches/0.5/configure Modified: branches/0.5/configure ============================================================================== --- branches/0.5/configure Mon May 31 12:47:36 2010 (r23392) +++ branches/0.5/configure Mon May 31 15:06:51 2010 (r23393) @@ -261,7 +261,6 @@ Include the log file "$logfile" produced solving the problem. EOF fi - rm -f $TMPC $TMPE $TMPH $TMPO $TMPS $TMPSH exit 1 } @@ -1358,13 +1357,36 @@ esac : ${TMPDIR:=$TMP} : ${TMPDIR:=/tmp} -TMPC="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.c" -TMPE="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}${EXESUF}" -TMPH="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h" -TMPO="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.o" -TMPS="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S" -TMPV="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.ver" -TMPSH="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.sh" + +if ! check_cmd type mktemp; then + # simple replacement for missing mktemp + # NOT SAFE FOR GENERAL USE + mktemp(){ + echo "${2%XXX*}.${HOSTNAME}.${UID}.$$" + } +fi + + +tmpfile(){ + tmp=$(mktemp -u "${TMPDIR}/ffconf.XXXXXXXX")$2 && + (set -C; exec > $tmp) 2>/dev/null || + die "Unable to create temoporary file in $TMPDIR." + append TMPFILES $tmp + eval $1=$tmp +} + +trap 'rm -f -- $TMPFILES' EXIT +trap exit HUP INT TERM + +tmpfile TMPC .c +tmpfile TMPE $EXESUF +tmpfile TMPH .h +tmpfile TMPO .o +tmpfile TMPS .S +tmpfile TMPV .ver +tmpfile TMPSH .sh + +unset -f mktemp # make sure we can execute files in $TMPDIR cat > $TMPSH 2>> $logfile <<EOF @@ -1378,7 +1400,6 @@ variable to another directory and make s EOF die "Sanity test failed." fi -rm $TMPSH if $cc --version 2>/dev/null | grep -qi gcc; then cc_type=gcc @@ -2522,8 +2543,6 @@ cmp -s $TMPH config.h && echo "config.h is unchanged" || mv -f $TMPH config.h -rm -f $TMPC $TMPE $TMPH $TMPO $TMPS $TMPSH - # build tree in object directory if source path is different from current one if enabled source_path_used; then DIRS="\

1 0

r23392 - trunk/libavformat/au.c
by subversion＠mplayerhq.hu 31 May '10

31 May '10

Author: pross Date: Mon May 31 12:47:36 2010 New Revision: 23392 Log: Prevent au_read_packet() looping endlessly when .au file contains unsupported codec type. Modified: trunk/libavformat/au.c Modified: trunk/libavformat/au.c ============================================================================== --- trunk/libavformat/au.c Mon May 31 01:57:51 2010 (r23391) +++ trunk/libavformat/au.c Mon May 31 12:47:36 2010 (r23392) @@ -139,6 +139,11 @@ static int au_read_header(AVFormatContex codec = ff_codec_get_id(codec_au_tags, id); + if (!av_get_bits_per_sample(codec)) { + av_log_ask_for_sample(s, "could not determine bits per sample\n"); + return AVERROR_INVALIDDATA; + } + if (size >= 24) { /* skip unused data */ url_fseek(pb, size - 24, SEEK_CUR);

1 0

r23390 - in branches/0.6: . configure
by subversion＠mplayerhq.hu 30 May '10

30 May '10

Author: diego Date: Mon May 31 00:25:40 2010 New Revision: 23390 Log: Require --enable-nonfree flag for libvpx. The license of libvpx is incompatible with the (L)GPL. As long as this is the case, the only way to use it is by marking the result as nonfree. backport r23371 by diego Modified: branches/0.6/ (props changed) branches/0.6/configure Modified: branches/0.6/configure ============================================================================== --- branches/0.6/configure Sun May 30 19:12:50 2010 (r23389) +++ branches/0.6/configure Mon May 31 00:25:40 2010 (r23390) @@ -2335,6 +2335,7 @@ die_license_disabled gpl postproc die_license_disabled gpl x11grab die_license_disabled nonfree libfaac +die_license_disabled nonfree libvpx die_license_disabled version3 libopencore_amrnb die_license_disabled version3 libopencore_amrwb

1 0

r23389 - trunk/libavcodec/ivi_common.h
by subversion＠mplayerhq.hu 30 May '10

30 May '10

Author: maxim Date: Sun May 30 19:12:50 2010 New Revision: 23389 Log: Remove unused variables. Modified: trunk/libavcodec/ivi_common.h Modified: trunk/libavcodec/ivi_common.h ============================================================================== --- trunk/libavcodec/ivi_common.h Sun May 30 14:19:26 2010 (r23388) +++ trunk/libavcodec/ivi_common.h Sun May 30 19:12:50 2010 (r23389) @@ -146,8 +146,6 @@ typedef struct { IVIHuffTab blk_vlc; ///< vlc table for decoding block data - uint16_t *dequant_intra; ///< ptr to dequant tables for intra blocks - uint16_t *dequant_inter; ///< ptr dequant tables for inter blocks int num_corr; ///< number of correction entries uint8_t corr[61*2]; ///< rvmap correction pairs int rvmap_sel; ///< rvmap table selector

1 0

r23388 - trunk/configure
by subversion＠mplayerhq.hu 30 May '10

30 May '10

Author: pross Date: Sun May 30 14:19:26 2010 New Revision: 23388 Log: automatically enable buffer_filter when compiling ffmpeg Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun May 30 10:31:50 2010 (r23387) +++ trunk/configure Sun May 30 14:19:26 2010 (r23388) @@ -1426,6 +1426,7 @@ avformat_deps="avcodec" # programs ffmpeg_deps="avcodec avformat swscale" +ffmpeg_select="buffer_filter" ffplay_deps="avcodec avformat swscale sdl" ffplay_select="rdft" ffprobe_deps="avcodec avformat"

1 0