[FFmpeg-devel] NC4600 camera code

Reimar Döffinger Reimar.Doeffinger
Sat Dec 13 14:32:21 CET 2008


On Sat, Dec 13, 2008 at 08:10:28AM -0500, nicolas martin wrote:
> @@ -156,7 +156,7 @@
>      bps= av_get_bits_per_sample(s->streams[0]->codec->codec_id);
>      assert(bps); // if false there IS a bug elsewhere (NOT in this function)
>      pkt->dts=
> -    pkt->pts= pkt->pos*8 / (bps * s->streams[0]->codec->channels);
> +	pkt->pts= pkt->pos*8 / (bps * s->streams[0]->codec->channels);
>  
>      return ret;
>  }

Parts where the code is not actually changed should not be included.
In this case your editor replaced spaces by a tab.
This is a bad idea, tabs are forbidden in FFmpeg (and patches containing
them actually can not be committed).
A quick way to get rid of these is to use "diff -duwbBE" or when using
svn diff "svn diff --diff-cmd diff -x '-duwbBE'"




More information about the ffmpeg-devel mailing list