Summary: | media-libs/libdlna-0.2.4 - image_jpeg.c: In function ‘probe_jpeg’: image_jpeg.c:95:31: error: ‘CODEC_ID_MJPEG’ undeclared (first use in this function) if (codecs->vc->codec_id != CODEC_ID_MJPEG && | ||
---|---|---|---|
Product: | Gentoo Linux | Reporter: | Toralf Förster <toralf> |
Component: | [OLD] Library | Assignee: | No maintainer - Look at https://wiki.gentoo.org/wiki/Project:Proxy_Maintainers if you want to take care of it <maintainer-needed> |
Status: | RESOLVED WONTFIX | ||
Severity: | normal | CC: | treecleaner |
Priority: | Normal | Keywords: | NeedPatch, PMASKED |
Version: | unspecified | ||
Hardware: | All | ||
OS: | Linux | ||
Whiteboard: | Pending removal: 2016-09-21 | ||
Package list: | Runtime testing required: | --- | |
Bug Depends on: | 571078 | ||
Bug Blocks: | 509294 | ||
Attachments: |
Replaced deprecated CODEC_ID_*
r_frame_rate -> avg_frame_rate |
Description
Toralf Förster
2015-02-15 21:23:59 UTC
What libav/ffmpeg version are you running? (In reply to Pacho Ramos from comment #1) > What libav/ffmpeg version are you running? $ sudo chroot /mnt/qa/tinderbox/amd64-unstable-hardened/ tor-relay / # eix -I libav -- Invalid line 545 in /etc/portage/package.mask: '<=sci-misc/gt-itm' Operator without a version part. [I] media-video/libav Available versions: 9.14(0/9) 9.17(0/9) (~)10.5(0/10)^t **10.9999(0/10)^t (~)11(0/10)^t (~)11.1(0/10)^t (~)11.2(0/10)^t **11.9999(0/10)^t **9999(0/10)^t {X aac alsa altivec amr bindist +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk fontconfig frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3 neon +network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl static-libs test theora threads tools truetype v4l vaapi vdpau vis vorbis vpx wavpack webp x264 x265 xvid +zlib ABI_MIPS="n32 n64 o32" ABI_PPC="32 64" ABI_S390="32 64" ABI_X86="32 64 x32" CPU_FLAGS_X86="3dnow 3dnowext avx avx2 mmx mmxext ssse3"} Installed versions: 11.2^t(09:15:35 AM 02/15/2015)(X alsa bzip2 encode fontconfig gpl hardcoded-tables network pic ssl theora threads truetype v4l vaapi vorbis zlib -aac -altivec -amr -bindist -cdio -cpudetection -custom-cflags -debug -doc -faac -fdk -frei0r -gsm -ieee1394 -jack -jpeg2k -mp3 -neon -openssl -opus -oss -pulseaudio -rtmp -schroedinger -sdl -speex -static-libs -test -tools -vdpau -vis -vpx -wavpack -webp -x264 -x265 -xvid ABI_MIPS="-n32 -n64 -o32" ABI_PPC="-32 -64" ABI_S390="-32 -64" ABI_X86="64 -32 -x32" CPU_FLAGS_X86="avx mmx mmxext ssse3 -3dnow -3dnowext -avx2") Homepage: http://libav.org/ Description: Complete solution to record, convert and stream audio and video tor-relay / # eix -I ffmpeg -- Invalid line 545 in /etc/portage/package.mask: '<=sci-misc/gt-itm' Operator without a version part. [I] media-plugins/gst-plugins-ffmpeg Available versions: (0.10) 0.10.13_p201211-r2 (~)0.10.13_p201211-r3 {libav +orc ABI_MIPS="n32 n64 o32" ABI_PPC="32 64" ABI_S390="32 64" ABI_X86="32 64 x32"} Installed versions: 0.10.13_p201211-r3(0.10)(06:47:09 AM 02/15/2015)(libav -orc ABI_MIPS="-n32 -n64 -o32" ABI_PPC="-32 -64" ABI_S390="-32 -64" ABI_X86="64 -32 -x32") Homepage: http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html Description: FFmpeg based gstreamer plugin [I] media-video/ffmpegthumbnailer Available versions: 2.0.8 {gnome gtk jpeg png} Installed versions: 2.0.8(04:58:41 PM 02/15/2015)(gtk jpeg png -gnome) Homepage: http://code.google.com/p/ffmpegthumbnailer/ Description: Lightweight video thumbnailer that can be used by file managers [I] virtual/ffmpeg Available versions: 0.10.3 (~)0.10.3-r1 9 9-r1 (~)9-r2 {X +encode gsm jpeg2k libav mp3 opus sdl speex theora threads truetype vaapi vdpau x264 ABI_MIPS="n32 n64 o32" ABI_PPC="32 64" ABI_S390="32 64" ABI_X86="32 64 x32"} Installed versions: 9-r2(04:47:44 PM 02/14/2015)(X encode libav theora threads truetype vaapi -gsm -jpeg2k -mp3 -opus -sdl -speex -vdpau -x264 ABI_MIPS="-n32 -n64 -o32" ABI_PPC="-32 -64" ABI_S390="-32 -64" ABI_X86="64 -32 -x32") Description: Virtual package for FFmpeg executable implementation Found 3 matches. Created attachment 403920 [details, diff]
Replaced deprecated CODEC_ID_*
Looks like libdlna is using more or less deprecated CODEC_ID_ enumerations, which libav removed somewhere between 9.x and 11.x. That is not the only problem with building, though, as libav removed r_frame_rate field from AVStream structure.
First of these is simple and seems like there isn't any gotchas involved. To resolve second problem I replaced r_frame_rate with avg_frame_rate, but the meaning of these two fields seems to be not exactly the same. The r_frame_rate field is used to filter in supported videos, and I guess with avg_frame_rate there may be false negatives then (-> better solutions would be better). Haven't tested with any actual dlna-client, but at least the library now builds with ffmpeg-2.6.1 and libav-11.3 ...
# Deprecated CODEC_ID
sed -i -e 's/\(\W\)CODEC_ID_/\1AV_CODEC_ID_/g;' src/*
# r_frame_rate -> avg_frame_rate
sed -i -e 's/>r_frame_rate/>avg_frame_rate/g;' src/*
I'll post result of both sed's as attachments also, so fixes can be done either way. (Previous sed-lines "may" need some adjustments of the file globs if put into ebuild. The patches are epatch ready, however.)
Created attachment 403922 [details, diff]
r_frame_rate -> avg_frame_rate
(2/2, the 'not totally optimal' -patch)
removed |