[FFmpeg-cvslog] r8985 - in trunk: configure libavcodec/Makefile libavcodec/cabac.h libavcodec/h264.c libavcodec/h264.h libavcodec/h264_parser.c libavcodec/h264_parser.h

Aurelien Jacobs aurel
Fri May 11 11:23:16 CEST 2007


On Fri, 11 May 2007 08:47:52 +0100
M?ns Rullg?rd <mans at mansr.com> wrote:

> Diego Biurrun <diego at biurrun.de> writes:
> 
> > On Fri, May 11, 2007 at 12:26:44AM +0200, aurel wrote:
> >> 
> >> Log:
> >> split h264.c to move parser in its own file
> >
> > I had an identical change in my local tree, oh well ...
> >
> >> Added:
> >>    trunk/libavcodec/h264.h
> >>       - copied, changed from r8983, /trunk/libavcodec/h264.c
> >>    trunk/libavcodec/h264_parser.c
> >>       - copied, changed from r8983, /trunk/libavcodec/h264.c
> >>    trunk/libavcodec/h264_parser.h
> >>       - copied, changed from r8983, /trunk/libavcodec/h264.c
> >
> > Copying h264_parser.h is overkill IMO, they basically just share the
> > license header.
> 
> Git labels that file as copied with 70% similarity from
> mpeg4video_parser.h.

Git autodetection is pretty funny (but not very useful :-( ).
Just compare git blame with svn annotate and see how much more
accurate svn annotate is:

----8<----- git blame -C -C libavcodec/h264_parser.h -------
23265b06 libavcodec/h264_parser.h (aurel   2007-05-10 22:26:44 +0000  1) /*
23265b06 libavcodec/h264_parser.h (aurel   2007-05-10 22:26:44 +0000  2)  * H.26
6319e1c8 libavcodec/rational.h    (michael 2003-10-20 20:23:46 +0000  3)  * Copy
6319e1c8 libavcodec/rational.h    (michael 2003-10-20 20:23:46 +0000  4)  *
35004159 libavutil/rational.h     (diego   2006-10-07 15:30:46 +0000  5)  * This
35004159 libavutil/rational.h     (diego   2006-10-07 15:30:46 +0000  6)  *
35004159 libavutil/rational.h     (diego   2006-10-07 15:30:46 +0000  7)  * FFmp
6319e1c8 libavcodec/rational.h    (michael 2003-10-20 20:23:46 +0000  8)  * modi
6319e1c8 libavcodec/rational.h    (michael 2003-10-20 20:23:46 +0000  9)  * Lice
35004159 libavutil/rational.h     (diego   2006-10-07 15:30:46 +0000 10)  * vers
6319e1c8 libavcodec/rational.h    (michael 2003-10-20 20:23:46 +0000 11)  *
35004159 libavutil/rational.h     (diego   2006-10-07 15:30:46 +0000 12)  * FFmp
add90408 tests/dsptest.c          (kabi    2002-05-23 13:34:22 +0000 13)  * but 
f9ce9018 tests/dsptest.c          (glantau 2002-05-25 22:47:17 +0000 14)  * MERC
f9ce9018 tests/dsptest.c          (glantau 2002-05-25 22:47:17 +0000 15)  * Less
add90408 tests/dsptest.c          (kabi    2002-05-23 13:34:22 +0000 16)  *
f9ce9018 tests/dsptest.c          (glantau 2002-05-25 22:47:17 +0000 17)  * You 
35004159 libavutil/rational.h     (diego   2006-10-07 15:30:46 +0000 18)  * Lice
5e6273d6 libavutil/rational.h     (diego   2006-01-12 22:43:26 +0000 19)  * Foun
6319e1c8 libavcodec/rational.h    (michael 2003-10-20 20:23:46 +0000 20)  *
6319e1c8 libavcodec/rational.h    (michael 2003-10-20 20:23:46 +0000 21)  */
0b33aafe libavutil/rational.h     (diego   2005-12-17 18:14:38 +0000 22) 
6319e1c8 libavcodec/rational.h    (michael 2003-10-20 20:23:46 +0000 23) /**
23265b06 libavcodec/h264_parser.h (aurel   2007-05-10 22:26:44 +0000 24)  * @fil
23265b06 libavcodec/h264_parser.h (aurel   2007-05-10 22:26:44 +0000 25)  * H.26
23265b06 libavcodec/h264_parser.h (aurel   2007-05-10 22:26:44 +0000 26)  * @aut
23265b06 libavcodec/h264_parser.h (aurel   2007-05-10 22:26:44 +0000 27)  */
23265b06 libavcodec/h264_parser.h (aurel   2007-05-10 22:26:44 +0000 28) 
23265b06 libavcodec/h264_parser.h (aurel   2007-05-10 22:26:44 +0000 29) #ifndef
23265b06 libavcodec/h264_parser.h (aurel   2007-05-10 22:26:44 +0000 30) #define
23265b06 libavcodec/h264_parser.h (aurel   2007-05-10 22:26:44 +0000 31) 
23265b06 libavcodec/h264_parser.h (aurel   2007-05-10 22:26:44 +0000 32) #includ
220ef000 libavcodec/vc1_parser.c  (diego   2007-05-04 00:09:33 +0000 33) 
220ef000 libavcodec/vc1_parser.c  (diego   2007-05-04 00:09:33 +0000 34) /**
860c250b libavcodec/vc1.c         (kostya  2007-02-03 06:39:50 +0000 35)  * find
860c250b libavcodec/vc1.c         (kostya  2007-02-03 06:39:50 +0000 36)  * @ret
860c250b libavcodec/vc1.c         (kostya  2007-02-03 06:39:50 +0000 37)  */
23265b06 libavcodec/h264_parser.h (aurel   2007-05-10 22:26:44 +0000 38) int ff_
23265b06 libavcodec/h264_parser.h (aurel   2007-05-10 22:26:44 +0000 39) 
23265b06 libavcodec/h264_parser.h (aurel   2007-05-10 22:26:44 +0000 40) #endif 
----8<------------------------------------------------------

----8<----- svn annotate libavcodec/h264_parser.h ----------
  1732  michaelni /*
  8985      aurel  * H.26L/H.264/AVC/JVT/14496-10/... parser
  1732  michaelni  * Copyright (c) 2003 Michael Niedermayer <michaelni at gmx.at>
  1732  michaelni  *
  6577      diego  * This file is part of FFmpeg.
  6577      diego  *
  6577      diego  * FFmpeg is free software; you can redistribute it and/or
  1732  michaelni  * modify it under the terms of the GNU Lesser General Public
  1732  michaelni  * License as published by the Free Software Foundation; either
  6577      diego  * version 2.1 of the License, or (at your option) any later version.
  1732  michaelni  *
  6577      diego  * FFmpeg is distributed in the hope that it will be useful,
  1732  michaelni  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  1732  michaelni  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  1732  michaelni  * Lesser General Public License for more details.
  1732  michaelni  *
  1732  michaelni  * You should have received a copy of the GNU Lesser General Public
  6577      diego  * License along with FFmpeg; if not, write to the Free Software
  4842      diego  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  1732  michaelni  *
  1732  michaelni  */
  4749      diego 
  1732  michaelni /**
  8985      aurel  * @file h264_parser.h
  8985      aurel  * H.264 / AVC / MPEG4 part10 parser.
  1732  michaelni  * @author Michael Niedermayer <michaelni at gmx.at>
  1732  michaelni  */
  1732  michaelni 
  8985      aurel #ifndef H264_PARSER_H
  8985      aurel #define H264_PARSER_H
  1732  michaelni 
  8985      aurel #include "h264.h"
  2932    michael 
  1732  michaelni /**
  1732  michaelni  * finds the end of the current frame in the bitstream.
  1732  michaelni  * @return the position of the first byte of the next frame, or -1
  1732  michaelni  */
  8985      aurel int ff_h264_find_frame_end(H264Context *h, const uint8_t *buf, int buf_size);
  8120    michael 
  8985      aurel #endif /* H264_PARSER_H */
----8<------------------------------------------------------

I really don't like the fact that git is not able to store
copy informations.

Aurel




More information about the ffmpeg-cvslog mailing list