diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 12:45:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 12:46:10 +0200 |
| commit | 77aafadc5655401e5806daed58300a2cccb19fb8 (patch) | |
| tree | 5784ddb1ecdc62045e2db225279365e19f4358a1 /libavcodec/startcode.h | |
| parent | de417982e8977a1dbf05b48c9d0400c500bb5268 (diff) | |
| parent | db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8 (diff) | |
Merge commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8'
* commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8':
h264: Move start code search functions into separate source files.
Conflicts:
libavcodec/arm/Makefile
libavcodec/arm/h264dsp_init_arm.c
libavcodec/h264_parser.c
libavcodec/h264dsp.c
libavcodec/startcode.c
libavcodec/startcode.h
See: 270cede3f3772117454a14b620803d731036942d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/startcode.h')
| -rw-r--r-- | libavcodec/startcode.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/startcode.h b/libavcodec/startcode.h index cc55d5f642..cfa02b0860 100644 --- a/libavcodec/startcode.h +++ b/libavcodec/startcode.h @@ -1,6 +1,4 @@ /* - * Copyright (c) 2003-2010 Michael Niedermayer <michaelni@gmx.at> - * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -22,7 +20,6 @@ * @file * Accelerated start code search function for start codes common to * MPEG-1/2/4 video, VC-1, H.264/5 - * @author Michael Niedermayer <michaelni@gmx.at> */ #ifndef AVCODEC_STARTCODE_H |