Changeset 26449 for packages


Ignore:
Timestamp:
2011-04-03T20:29:39+02:00 (5 years ago)
Author:
florian
Message:

[package] ffmpeg: expose additionnal configuration options (#7837, #8831)

This series, along with previous applied patches, should close tickets #7837 and #8831.

This patch exposes additional decoders and demuxers for FFmpeg in menuconfig, along with other minor changes.

Additional decoders:
flac (Free Lossless Audio Codec)

Additional demuxers:
aac
avi
flac
matroska
mov (mov/mp4/m4a/3gp/3g2/mj2)

zlib is required on matroska/mov to handle compressed headers.

Minor changes:
mp3 demuxer to require the mpegaudio parser. Doesn't do much without it. Matches current ffmpeg behavior.

--target-os=linux as a compile flag. This will be required when cross-compiling in the 0.6 branch, and does no harm here.

Signed-off-by: Ian Leonard <antonlacon_at_gmail.com>

Location:
packages/multimedia/ffmpeg
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • packages/multimedia/ffmpeg/Config.in

    r22071 r26449  
    9191        depends FFMPEG_PATENTED 
    9292 
     93config FFMPEG_DECODER_flac 
     94        bool "FLAC" 
     95 
    9396config FFMPEG_DECODER_gif 
    9497        bool "GIF" 
     
    190193comment "Demuxers ---" 
    191194 
     195config FFMPEG_DEMUXER_aac 
     196        bool "AAC" 
     197 
     198config FFMPEG_DEMUXER_avi 
     199        bool "AVI (Audio Video Interleave)" 
     200 
    192201config FFMPEG_DEMUXER_ac3 
    193202        bool "AC3" 
     203 
     204config FFMPEG_DEMUXER_flac 
     205        bool "FLAC" 
    194206 
    195207config FFMPEG_DEMUXER_ffm 
     
    200212        depends FFMPEG_PATENTED 
    201213 
     214config FFMPEG_DEMUXER_matroska 
     215        bool "Matroska (MKA,MKV)" 
     216        select FFMPEG_DECODER_zlib 
     217 
     218config FFMPEG_DEMUXER_mov 
     219        bool "MOV/MP4/M4A/3GP/3G2/MJ2" 
     220        select FFMPEG_DECODER_zlib 
     221 
    202222config FFMPEG_DEMUXER_mp3 
    203223        bool "MP3 (MPEG Audio Layer 3)" 
     224        select FFMPEG_PARSER_mpegaudio 
    204225 
    205226config FFMPEG_DEMUXER_mpegvideo 
  • packages/multimedia/ffmpeg/Makefile

    r26334 r26449  
    1010PKG_NAME:=ffmpeg 
    1111PKG_VERSION:=0.5.4 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
     
    3232        ac3 \ 
    3333        atrac3 \ 
     34        flac \ 
    3435        gif \ 
    3536        h264 \ 
     
    6465 
    6566FFMPEG_DEMUXERS:= \ 
    66         ac3 \ 
     67        aac \ 
     68        ac3 \ 
     69        avi \ 
     70        flac \ 
    6771        ffm \ 
    6872        h264 \ 
     73        matroska \ 
     74        mov \ 
    6975        mp3 \ 
    7076        mpegps \ 
     
    8288        h264 \ 
    8389        mpegaudio \ 
     90        mpeg4video \ 
    8491        mpegvideo \ 
    85         mpeg4video \ 
    8692 
    8793FFMPEG_PROTOCOLS:= \ 
     
    201207                --cross-prefix="$(TARGET_CROSS)" \ 
    202208                --arch="$(ARCH)" \ 
     209                --target-os=linux \ 
    203210                --prefix="/usr" \ 
    204211                --enable-shared \ 
Note: See TracChangeset for help on using the changeset viewer.