[FFmpeg-devel] Fwd: soc-jpeg2000 patch

[Robert Swain]

2008/7/31 Mathieu Malaterre <mathieu.malaterre at gmail.com>:
> On Thu, Jul 31, 2008 at 2:34 PM, Robert Swain <robert.swain at gmail.com> wrote:
>> 2008/7/31 Mathieu Malaterre <mathieu.malaterre at gmail.com>:
>>> On Thu, Jul 31, 2008 at 12:48 PM, Michael Niedermayer <michaelni at gmx.at> wrote:
>>>> On Thu, Jul 31, 2008 at 10:04:02AM +0200, Mathieu Malaterre wrote:
>>>>> [forwarded from ffmpeg-users]
>>>>
>>>> patches must be sent to the list, not a url with the patch.
>>>> The contents of a url can change or it can even disapear ...
>>>
>>> attached.
>>>
>>>> besides the messages from make are needed for compilation failures
>>>
>>> $ make -j4
>>> gcc -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
>>> -D_ISOC9X_SOURCE -I. -I"/home/mmalaterre/Projects/jpeg2000/ffmpeg"
>>> -Wall -W -fomit-frame-pointer -g -Wdeclaration-after-statement -Wall
>>> -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls
>>> -Wno-pointer-sign -Wcast-qual -Wwrite-strings -O3 -fno-math-errno
>>> -MM -MG libavcodec/j2kenc.c | sed -e "/^#.*/d" -e "1s,^,libavcodec/,"
>>> -e "s,\\([[:space:]]\\)\\(version\\.h\\),\\1\$(BUILD_ROOT_REL)/\\2," >
>>> libavcodec/j2kenc.d
>>> gcc -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
>>> -D_ISOC9X_SOURCE -I. -I"/home/mmalaterre/Projects/jpeg2000/ffmpeg"
>>> -Wall -W -fomit-frame-pointer -g -Wdeclaration-after-statement -Wall
>>> -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls
>>> -Wno-pointer-sign -Wcast-qual -Wwrite-strings -O3 -fno-math-errno
>>> -MM -MG libavcodec/j2kdec.c | sed -e "/^#.*/d" -e "1s,^,libavcodec/,"
>>> -e "s,\\([[:space:]]\\)\\(version\\.h\\),\\1\$(BUILD_ROOT_REL)/\\2," >
>>> libavcodec/j2kdec.d
>>> make: *** No rule to make target `common.h', needed by
>>> `libavcodec/j2kdec.o'.  Stop.
>>
>> Change the #include to "libavutil/common.h".
>
> done. thanks !
>
>>> I do not know what happen to the file 'allcodecs.h', but it's not in
>>> ffmpeg anymore AFAIK. I simply yanked it from the original
>>> soc/jpeg2000/ffmpeg.patch.
>>
>> libavcodec/allcodecs.h functionality was merged with allcodecs.c as I recall.
>
> ok.
>
> while at it, I realized a patch in riff.c was not merged in. New patch included.

I've committed your changes to the SoC repository in some form or
another. It compiles against current svn ffmpeg trunk code now.

Regards,
Rob