[FFmpeg-devel] [PATCH] fate: Add EXIF test.
Thilo Borgmann
thilo.borgmann at mail.de
Wed Aug 21 10:21:02 CEST 2013
Am 21.08.13 00:08, schrieb Paul B Mahol:
> On 8/20/13, Thilo Borgmann <thilo.borgmann at mail.de> wrote:
>> Am 20.08.13 22:44, schrieb Michael Niedermayer:
>>> On Tue, Aug 20, 2013 at 06:57:12PM +0200, Michael Niedermayer wrote:
>>>> On Tue, Aug 20, 2013 at 04:00:19PM +0200, Thilo Borgmann wrote:
>>>>> Rev 2 attached.
>>>>>
>>>>> Please check if the dependencies for the checks on TIFF, JPEG & MP3 make
>>>>> sense
>>>>> now...
>>>>
>>>> applied
>>>>
>>>> thanks
>>>
>>> seems this breaks
>>> http://fate.ffmpeg.org/report.cgi?time=20130820145035&slot=x86_64-archlinux-gcc-random
>>
>> from there:
>>> LD ffprobe_g
>>> libavcodec/libavcodec.a(mjpegdec.o): In function `mjpeg_decode_app':
>>> /home/ux/fate/ffmpeg/libavcodec/mjpegdec.c:1523: undefined reference to
>>> `ff_exif_decode_ifd'
>>> collect2: error: ld returned 1 exit status
>>> make: *** [ffserver_g] Error 1
>>
>> this should have been broken since commit
>> bb4e1b4cf910af0de2bc884c75544603c40010cc
>>
>> Since it works for me on my machines, I can only guess what is wrong :(
>
> Makefile needs updating.
So my guess is that this will fix it because exif.o has not been build according
to the log file.
-Thilo
-------------- next part --------------
The following changes since commit 97e165cdae9be6c4255cf004b2785f5c7c23ab3a:
avformat/unix: include sys/socket.h (2013-08-21 00:25:51 +0200)
are available in the git repository at:
git at github.com:thiloborgmann/FFmpeg.git exif_fate
for you to fetch changes up to 2953906656f790a40e1a69a356aeafe65c4c92c8:
lavc/Makefile: Add exif dependencies for every mjpegdec.o. (2013-08-21 10:06:33 +0200)
----------------------------------------------------------------
Thilo Borgmann (1):
lavc/Makefile: Add exif dependencies for every mjpegdec.o.
libavcodec/Makefile | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index ce3cbf9..610c179 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -106,7 +106,7 @@ OBJS-$(CONFIG_AMRWB_DECODER) += amrwbdec.o celp_filters.o \
celp_math.o acelp_filters.o \
acelp_vectors.o \
acelp_pitch_delay.o
-OBJS-$(CONFIG_AMV_DECODER) += sp5xdec.o mjpegdec.o mjpeg.o
+OBJS-$(CONFIG_AMV_DECODER) += sp5xdec.o mjpegdec.o exif.o tiff_common.o mjpeg.o
OBJS-$(CONFIG_AMV_ENCODER) += mjpegenc.o mjpeg.o \
mpegvideo_enc.o motion_est.o \
ratecontrol.o mpeg12data.o \
@@ -126,7 +126,7 @@ OBJS-$(CONFIG_ATRAC1_DECODER) += atrac1.o atrac.o
OBJS-$(CONFIG_ATRAC3_DECODER) += atrac3.o atrac.o
OBJS-$(CONFIG_AURA_DECODER) += cyuv.o
OBJS-$(CONFIG_AURA2_DECODER) += aura.o
-OBJS-$(CONFIG_AVRN_DECODER) += avrndec.o mjpegdec.o mjpeg.o
+OBJS-$(CONFIG_AVRN_DECODER) += avrndec.o mjpegdec.o exif.o tiff_common.o mjpeg.o
OBJS-$(CONFIG_AVRP_DECODER) += r210dec.o
OBJS-$(CONFIG_AVRP_ENCODER) += r210enc.o
OBJS-$(CONFIG_AVS_DECODER) += avs.o
@@ -252,7 +252,7 @@ OBJS-$(CONFIG_JPEG2000_ENCODER) += j2kenc.o mqcenc.o mqc.o jpeg2000.o \
OBJS-$(CONFIG_JPEG2000_DECODER) += jpeg2000dec.o jpeg2000.o \
jpeg2000dwt.o mqcdec.o mqc.o
OBJS-$(CONFIG_JPEGLS_DECODER) += jpeglsdec.o jpegls.o \
- mjpegdec.o mjpeg.o
+ mjpegdec.o exif.o tiff_common.o mjpeg.o
OBJS-$(CONFIG_JPEGLS_ENCODER) += jpeglsenc.o jpegls.o
OBJS-$(CONFIG_JV_DECODER) += jvdec.o
OBJS-$(CONFIG_KGV1_DECODER) += kgv1dec.o
@@ -267,9 +267,9 @@ OBJS-$(CONFIG_METASOUND_DECODER) += metasound.o metasound_data.o \
twinvq.o
OBJS-$(CONFIG_MICRODVD_DECODER) += microdvddec.o ass.o
OBJS-$(CONFIG_MIMIC_DECODER) += mimic.o
-OBJS-$(CONFIG_MJPEG_DECODER) += mjpegdec.o mjpeg.o exif.o tiff_common.o
+OBJS-$(CONFIG_MJPEG_DECODER) += mjpegdec.o exif.o tiff_common.o mjpeg.o exif.o tiff_common.o
OBJS-$(CONFIG_MJPEG_ENCODER) += mjpegenc.o mjpeg.o
-OBJS-$(CONFIG_MJPEGB_DECODER) += mjpegbdec.o mjpegdec.o mjpeg.o
+OBJS-$(CONFIG_MJPEGB_DECODER) += mjpegbdec.o mjpegdec.o exif.o tiff_common.o mjpeg.o
OBJS-$(CONFIG_MLP_DECODER) += mlpdec.o mlpdsp.o
OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o
OBJS-$(CONFIG_MOTIONPIXELS_DECODER) += motionpixels.o
@@ -319,7 +319,7 @@ OBJS-$(CONFIG_MSZH_DECODER) += lcldec.o
OBJS-$(CONFIG_MTS2_DECODER) += mss4.o mss34dsp.o
OBJS-$(CONFIG_MVC1_DECODER) += mvcdec.o
OBJS-$(CONFIG_MVC2_DECODER) += mvcdec.o
-OBJS-$(CONFIG_MXPEG_DECODER) += mxpegdec.o mjpegdec.o mjpeg.o
+OBJS-$(CONFIG_MXPEG_DECODER) += mxpegdec.o mjpegdec.o exif.o tiff_common.o mjpeg.o
OBJS-$(CONFIG_NELLYMOSER_DECODER) += nellymoserdec.o nellymoser.o
OBJS-$(CONFIG_NELLYMOSER_ENCODER) += nellymoserenc.o nellymoser.o
OBJS-$(CONFIG_NUV_DECODER) += nuv.o rtjpeg.o
@@ -402,7 +402,7 @@ OBJS-$(CONFIG_SOL_DPCM_DECODER) += dpcm.o
OBJS-$(CONFIG_SONIC_DECODER) += sonic.o
OBJS-$(CONFIG_SONIC_ENCODER) += sonic.o
OBJS-$(CONFIG_SONIC_LS_ENCODER) += sonic.o
-OBJS-$(CONFIG_SP5X_DECODER) += sp5xdec.o mjpegdec.o mjpeg.o
+OBJS-$(CONFIG_SP5X_DECODER) += sp5xdec.o mjpegdec.o exif.o tiff_common.o mjpeg.o
OBJS-$(CONFIG_SRT_DECODER) += srtdec.o ass.o
OBJS-$(CONFIG_SRT_ENCODER) += srtenc.o ass_split.o
OBJS-$(CONFIG_SUBRIP_DECODER) += srtdec.o ass.o
@@ -424,7 +424,7 @@ OBJS-$(CONFIG_TARGA_DECODER) += targa.o
OBJS-$(CONFIG_TARGA_ENCODER) += targaenc.o rle.o
OBJS-$(CONFIG_TARGA_Y216_DECODER) += targa_y216dec.o
OBJS-$(CONFIG_THEORA_DECODER) += xiph.o
-OBJS-$(CONFIG_THP_DECODER) += mjpegdec.o mjpeg.o
+OBJS-$(CONFIG_THP_DECODER) += mjpegdec.o exif.o tiff_common.o mjpeg.o
OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.o
OBJS-$(CONFIG_TIFF_DECODER) += tiff.o lzw.o faxcompr.o tiff_data.o tiff_common.o
OBJS-$(CONFIG_TIFF_ENCODER) += tiffenc.o rle.o lzwenc.o tiff_data.o
More information about the ffmpeg-devel
mailing list