On Tue, Jun 07, 2011 at 02:31:24PM +0200, Diego Biurrun wrote:
>
> --- a/libavformat/avidec.c
> +++ b/libavformat/avidec.c
> --- a/libavformat/utils.c
> +++ b/libavformat/utils.c
> @@ -1420,8 +1420,6 @@ int av_index_search_timestamp(AVStream *st, int64_t
> wanted_timestamp,
>
> -#define DEBUG_SEEK
> -
> int av_seek_frame_binary(AVFormatContext *s, int stream_index, int64_t
> target_ts, int flags){
> @@ -1591,13 +1576,13 @@ int64_t av_gen_search(AVFormatContext *s, int
> stream_index, int64_t target_ts, i
>
> pos = (flags & AVSEEK_FLAG_BACKWARD) ? pos_min : pos_max;
> ts = (flags & AVSEEK_FLAG_BACKWARD) ? ts_min : ts_max;
> -#ifdef DEBUG_SEEK
> +#ifdef DEBUG
> pos_min = pos;
> ts_min = read_timestamp(s, stream_index, &pos_min, INT64_MAX);
> pos_min++;
> ts_max = read_timestamp(s, stream_index, &pos_min, INT64_MAX);
> - av_log(s, AV_LOG_DEBUG, "pos=0x%"PRIx64"
> %"PRId64"<=%"PRId64"<=%"PRId64"\n",
> - pos, ts_min, target_ts, ts_max);
> + av_dlog(s, "pos=0x%"PRIx64" %"PRId64"<=%"PRId64"<=%"PRId64"\n",
> + pos, ts_min, target_ts, ts_max);
> #endif
> *ts_ret= ts;
> return pos;
This hunk breaks FATE in seek-lavf_asf if I (effectively) disable it by
changing it to a disabled condition, so I replaced it by #1 in the patch
I pushed.
This, however, raises the question of what to do with that hunk -
just drop the '#if 1'?
Diego
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
