highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge libavcore into libavutil

Browse Source 
Done to keep ABI compatible. Otherwise this is just silly
This commit is contained in:
Reinhard Tartler
2011-02-07 14:37:08 +01:00
committed by Michael Niedermayer
parent fad8143f5b
commit 7ffe76e540
121 changed files with 167 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/utils.c
View File

@@ -29,10 +29,9 @@
#include "libavutil/integer.h"
#include "libavutil/crc.h"
#include "libavutil/pixdesc.h"
#include "libavcore/audioconvert.h"
#include "libavcore/imgutils.h"
#include "libavcore/internal.h"
#include "libavcore/samplefmt.h"
#include "libavutil/audioconvert.h"
#include "libavutil/imgutils.h"
#include "libavutil/samplefmt.h"
#include "avcodec.h"
#include "dsputil.h"
#include "libavutil/opt.h"
@@ -1211,7 +1210,7 @@ unsigned int av_xiphlacing(unsigned char *s, unsigned int v)
}
#if LIBAVCODEC_VERSION_MAJOR < 53
#include "libavcore/parseutils.h"
#include "libavutil/parseutils.h"
int av_parse_video_frame_size(int *width_ptr, int *height_ptr, const char *str)
{