[FFmpeg-cvslog] r12838 - in trunk/libavcodec: cabac.h h264.c i386/h264_i386.h

[Jeff Downs]

On Wed, 16 Apr 2008, M?ns Rullg?rd wrote:
> [...]
> That's because you re-added the lines in r12845, and this was the
> revision you used for the copy.

Thanks.  I used svn merge -r currentrev:lastrev to back out the changes 
and I thought that svn merge restored back the edit history (apparently 
not).

Everything looks correct now.  Sorry for the confusion and thanks for the 
help.

	-Jeff