Merge libavcore into libavutil

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

View File

@ -3341,7 +3341,7 @@ void dump_format(AVFormatContext *ic,
}
#if FF_API_PARSE_FRAME_PARAM
#include "libavcore/parseutils.h"
#include "libavutil/parseutils.h"
int parse_image_size(int *width_ptr, int *height_ptr, const char *str)
{