--- /dev/null
+#usr/bin/corrupt_mpeg2
+#usr/bin/extract_mpeg2
+#usr/bin/mpeg2dec
+#usr/include/mpeg2dec
+#usr/include/mpeg2dec/mpeg2.h
+#usr/include/mpeg2dec/mpeg2convert.h
+#usr/lib/libmpeg2.a
+#usr/lib/libmpeg2.la
+usr/lib/libmpeg2.so
+usr/lib/libmpeg2.so.0
+usr/lib/libmpeg2.so.0.0.0
+#usr/lib/libmpeg2convert.a
+#usr/lib/libmpeg2convert.la
+usr/lib/libmpeg2convert.so
+usr/lib/libmpeg2convert.so.0
+usr/lib/libmpeg2convert.so.0.0.0
+#usr/lib/pkgconfig/libmpeg2.pc
+#usr/lib/pkgconfig/libmpeg2convert.pc
+#usr/man/man1/extract_mpeg2.1
+#usr/man/man1/mpeg2dec.1
--- /dev/null
+usr/bin/vlc
+#usr/bin/vlc-config
+#usr/include/vlc
+#usr/include/vlc/aout.h
+#usr/include/vlc/decoder.h
+#usr/include/vlc/input.h
+#usr/include/vlc/intf.h
+#usr/include/vlc/libvlc.h
+#usr/include/vlc/mediacontrol.h
+#usr/include/vlc/mediacontrol_structures.h
+#usr/include/vlc/sout.h
+#usr/include/vlc/vlc.h
+#usr/include/vlc/vout.h
+#usr/lib/libvlc.a
+#usr/lib/vlc
+#usr/lib/vlc/access
+usr/lib/vlc/access/libaccess_directory_plugin.so
+usr/lib/vlc/access/libaccess_fake_plugin.so
+usr/lib/vlc/access/libaccess_file_plugin.so
+usr/lib/vlc/access/libaccess_ftp_plugin.so
+usr/lib/vlc/access/libaccess_http_plugin.so
+usr/lib/vlc/access/libaccess_mms_plugin.so
+usr/lib/vlc/access/libaccess_smb_plugin.so
+usr/lib/vlc/access/libaccess_tcp_plugin.so
+usr/lib/vlc/access/libaccess_udp_plugin.so
+usr/lib/vlc/access/libcdda_plugin.so
+usr/lib/vlc/access/libvcd_plugin.so
+#usr/lib/vlc/access_filter
+usr/lib/vlc/access_filter/libaccess_filter_dump_plugin.so
+usr/lib/vlc/access_filter/libaccess_filter_record_plugin.so
+usr/lib/vlc/access_filter/libaccess_filter_timeshift_plugin.so
+#usr/lib/vlc/access_output
+usr/lib/vlc/access_output/libaccess_output_dummy_plugin.so
+usr/lib/vlc/access_output/libaccess_output_file_plugin.so
+usr/lib/vlc/access_output/libaccess_output_http_plugin.so
+usr/lib/vlc/access_output/libaccess_output_shout_plugin.so
+usr/lib/vlc/access_output/libaccess_output_udp_plugin.so
+#usr/lib/vlc/audio_filter
+usr/lib/vlc/audio_filter/liba52tospdif_plugin.so
+usr/lib/vlc/audio_filter/libaudio_format_plugin.so
+usr/lib/vlc/audio_filter/libbandlimited_resampler_plugin.so
+usr/lib/vlc/audio_filter/libdolby_surround_decoder_plugin.so
+usr/lib/vlc/audio_filter/libdtstospdif_plugin.so
+usr/lib/vlc/audio_filter/libequalizer_plugin.so
+usr/lib/vlc/audio_filter/libfixed32tofloat32_plugin.so
+usr/lib/vlc/audio_filter/libfixed32tos16_plugin.so
+usr/lib/vlc/audio_filter/libfloat32tos16_plugin.so
+usr/lib/vlc/audio_filter/libfloat32tos8_plugin.so
+usr/lib/vlc/audio_filter/libfloat32tou16_plugin.so
+usr/lib/vlc/audio_filter/libfloat32tou8_plugin.so
+usr/lib/vlc/audio_filter/libheadphone_channel_mixer_plugin.so
+usr/lib/vlc/audio_filter/liblinear_resampler_plugin.so
+usr/lib/vlc/audio_filter/libmpgatofixed32_plugin.so
+usr/lib/vlc/audio_filter/libnormvol_plugin.so
+usr/lib/vlc/audio_filter/libparam_eq_plugin.so
+usr/lib/vlc/audio_filter/libs16tofixed32_plugin.so
+usr/lib/vlc/audio_filter/libs16tofloat32_plugin.so
+usr/lib/vlc/audio_filter/libs16tofloat32swab_plugin.so
+usr/lib/vlc/audio_filter/libs8tofloat32_plugin.so
+usr/lib/vlc/audio_filter/libsimple_channel_mixer_plugin.so
+usr/lib/vlc/audio_filter/libtrivial_channel_mixer_plugin.so
+usr/lib/vlc/audio_filter/libtrivial_resampler_plugin.so
+usr/lib/vlc/audio_filter/libu8tofixed32_plugin.so
+usr/lib/vlc/audio_filter/libu8tofloat32_plugin.so
+usr/lib/vlc/audio_filter/libugly_resampler_plugin.so
+#usr/lib/vlc/audio_mixer
+usr/lib/vlc/audio_mixer/libfloat32_mixer_plugin.so
+usr/lib/vlc/audio_mixer/libspdif_mixer_plugin.so
+usr/lib/vlc/audio_mixer/libtrivial_mixer_plugin.so
+#usr/lib/vlc/audio_output
+usr/lib/vlc/audio_output/libalsa_plugin.so
+usr/lib/vlc/audio_output/libaout_file_plugin.so
+usr/lib/vlc/audio_output/liboss_plugin.so
+#usr/lib/vlc/codec
+usr/lib/vlc/codec/liba52_plugin.so
+usr/lib/vlc/codec/libadpcm_plugin.so
+usr/lib/vlc/codec/libaraw_plugin.so
+usr/lib/vlc/codec/libcinepak_plugin.so
+usr/lib/vlc/codec/libcmml_plugin.so
+usr/lib/vlc/codec/libcvdsub_plugin.so
+usr/lib/vlc/codec/libdts_plugin.so
+usr/lib/vlc/codec/libdvbsub_plugin.so
+usr/lib/vlc/codec/libfake_plugin.so
+usr/lib/vlc/codec/libflacdec_plugin.so
+usr/lib/vlc/codec/liblibmpeg2_plugin.so
+usr/lib/vlc/codec/liblpcm_plugin.so
+usr/lib/vlc/codec/libmpeg_audio_plugin.so
+usr/lib/vlc/codec/libpng_plugin.so
+usr/lib/vlc/codec/librawvideo_plugin.so
+usr/lib/vlc/codec/libspudec_plugin.so
+usr/lib/vlc/codec/libsubsdec_plugin.so
+usr/lib/vlc/codec/libsvcdsub_plugin.so
+usr/lib/vlc/codec/libtelx_plugin.so
+usr/lib/vlc/codec/libvorbis_plugin.so
+#usr/lib/vlc/control
+usr/lib/vlc/control/libgestures_plugin.so
+usr/lib/vlc/control/libhotkeys_plugin.so
+usr/lib/vlc/control/libhttp_plugin.so
+usr/lib/vlc/control/libnetsync_plugin.so
+usr/lib/vlc/control/librc_plugin.so
+usr/lib/vlc/control/libshowintf_plugin.so
+usr/lib/vlc/control/libtelnet_plugin.so
+#usr/lib/vlc/demux
+usr/lib/vlc/demux/liba52sys_plugin.so
+usr/lib/vlc/demux/libaiff_plugin.so
+usr/lib/vlc/demux/libasf_plugin.so
+usr/lib/vlc/demux/libau_plugin.so
+usr/lib/vlc/demux/libavi_plugin.so
+usr/lib/vlc/demux/libdemuxdump_plugin.so
+usr/lib/vlc/demux/libdtssys_plugin.so
+usr/lib/vlc/demux/libflac_plugin.so
+usr/lib/vlc/demux/libh264_plugin.so
+usr/lib/vlc/demux/libid3tag_plugin.so
+usr/lib/vlc/demux/libm3u_plugin.so
+usr/lib/vlc/demux/libm4a_plugin.so
+usr/lib/vlc/demux/libm4v_plugin.so
+usr/lib/vlc/demux/libmjpeg_plugin.so
+usr/lib/vlc/demux/libmp4_plugin.so
+usr/lib/vlc/demux/libmpga_plugin.so
+usr/lib/vlc/demux/libmpgv_plugin.so
+usr/lib/vlc/demux/libnsc_plugin.so
+usr/lib/vlc/demux/libnsv_plugin.so
+usr/lib/vlc/demux/libnuv_plugin.so
+usr/lib/vlc/demux/libogg_plugin.so
+usr/lib/vlc/demux/libplaylist_plugin.so
+usr/lib/vlc/demux/libps_plugin.so
+usr/lib/vlc/demux/libpva_plugin.so
+usr/lib/vlc/demux/librawdv_plugin.so
+usr/lib/vlc/demux/libreal_plugin.so
+usr/lib/vlc/demux/libsgimb_plugin.so
+usr/lib/vlc/demux/libsubtitle_plugin.so
+usr/lib/vlc/demux/libtta_plugin.so
+usr/lib/vlc/demux/libty_plugin.so
+usr/lib/vlc/demux/libvobsub_plugin.so
+usr/lib/vlc/demux/libvoc_plugin.so
+usr/lib/vlc/demux/libwav_plugin.so
+usr/lib/vlc/demux/libxa_plugin.so
+#usr/lib/vlc/gui
+usr/lib/vlc/gui/libncurses_plugin.so
+usr/lib/vlc/libi420_rgb_mmx.a
+usr/lib/vlc/libi420_ymga_mmx.a
+usr/lib/vlc/libi420_yuy2_mmx.a
+usr/lib/vlc/libi422_yuy2_mmx.a
+usr/lib/vlc/libmemcpy3dn.a
+usr/lib/vlc/libmemcpymmx.a
+usr/lib/vlc/libmemcpymmxext.a
+#usr/lib/vlc/misc
+usr/lib/vlc/misc/libdummy_plugin.so
+usr/lib/vlc/misc/libexport_plugin.so
+usr/lib/vlc/misc/libfreetype_plugin.so
+usr/lib/vlc/misc/libgrowl_plugin.so
+usr/lib/vlc/misc/libipv4_plugin.so
+usr/lib/vlc/misc/libipv6_plugin.so
+usr/lib/vlc/misc/liblogger_plugin.so
+usr/lib/vlc/misc/libmemcpy_plugin.so
+usr/lib/vlc/misc/libscreensaver_plugin.so
+usr/lib/vlc/misc/libvod_rtsp_plugin.so
+usr/lib/vlc/misc/libxml_plugin.so
+usr/lib/vlc/misc/libxtag_plugin.so
+#usr/lib/vlc/mux
+usr/lib/vlc/mux/libmux_asf_plugin.so
+usr/lib/vlc/mux/libmux_avi_plugin.so
+usr/lib/vlc/mux/libmux_dummy_plugin.so
+usr/lib/vlc/mux/libmux_mp4_plugin.so
+usr/lib/vlc/mux/libmux_mpjpeg_plugin.so
+usr/lib/vlc/mux/libmux_ogg_plugin.so
+usr/lib/vlc/mux/libmux_ps_plugin.so
+usr/lib/vlc/mux/libmux_wav_plugin.so
+#usr/lib/vlc/packetizer
+usr/lib/vlc/packetizer/libpacketizer_copy_plugin.so
+usr/lib/vlc/packetizer/libpacketizer_h264_plugin.so
+usr/lib/vlc/packetizer/libpacketizer_mpeg4audio_plugin.so
+usr/lib/vlc/packetizer/libpacketizer_mpeg4video_plugin.so
+usr/lib/vlc/packetizer/libpacketizer_mpegvideo_plugin.so
+#usr/lib/vlc/services_discovery
+usr/lib/vlc/services_discovery/libpodcast_plugin.so
+usr/lib/vlc/services_discovery/libsap_plugin.so
+usr/lib/vlc/services_discovery/libshout_plugin.so
+usr/lib/vlc/services_discovery/libupnp_intel_plugin.so
+#usr/lib/vlc/stream_out
+usr/lib/vlc/stream_out/libstream_out_bridge_plugin.so
+usr/lib/vlc/stream_out/libstream_out_description_plugin.so
+usr/lib/vlc/stream_out/libstream_out_display_plugin.so
+usr/lib/vlc/stream_out/libstream_out_dummy_plugin.so
+usr/lib/vlc/stream_out/libstream_out_duplicate_plugin.so
+usr/lib/vlc/stream_out/libstream_out_es_plugin.so
+usr/lib/vlc/stream_out/libstream_out_gather_plugin.so
+usr/lib/vlc/stream_out/libstream_out_mosaic_bridge_plugin.so
+usr/lib/vlc/stream_out/libstream_out_rtp_plugin.so
+usr/lib/vlc/stream_out/libstream_out_standard_plugin.so
+usr/lib/vlc/stream_out/libstream_out_transcode_plugin.so
+#usr/lib/vlc/video_chroma
+usr/lib/vlc/video_chroma/libi420_rgb_plugin.so
+usr/lib/vlc/video_chroma/libi420_ymga_plugin.so
+usr/lib/vlc/video_chroma/libi420_yuy2_plugin.so
+usr/lib/vlc/video_chroma/libi422_yuy2_plugin.so
+#usr/lib/vlc/video_filter
+usr/lib/vlc/video_filter/libadjust_plugin.so
+usr/lib/vlc/video_filter/libblend_plugin.so
+usr/lib/vlc/video_filter/libclone_plugin.so
+usr/lib/vlc/video_filter/libcrop_plugin.so
+usr/lib/vlc/video_filter/libdeinterlace_plugin.so
+usr/lib/vlc/video_filter/libdistort_plugin.so
+usr/lib/vlc/video_filter/libinvert_plugin.so
+usr/lib/vlc/video_filter/liblogo_plugin.so
+usr/lib/vlc/video_filter/libmagnify_plugin.so
+usr/lib/vlc/video_filter/libmarq_plugin.so
+usr/lib/vlc/video_filter/libmosaic_plugin.so
+usr/lib/vlc/video_filter/libmotionblur_plugin.so
+usr/lib/vlc/video_filter/libmotiondetect_plugin.so
+usr/lib/vlc/video_filter/libosdmenu_plugin.so
+usr/lib/vlc/video_filter/librss_plugin.so
+usr/lib/vlc/video_filter/librv32_plugin.so
+usr/lib/vlc/video_filter/libscale_plugin.so
+usr/lib/vlc/video_filter/libtime_plugin.so
+usr/lib/vlc/video_filter/libtransform_plugin.so
+usr/lib/vlc/video_filter/libwall_plugin.so
+#usr/lib/vlc/video_output
+usr/lib/vlc/video_output/libfb_plugin.so
+usr/lib/vlc/video_output/libimage_plugin.so
+#usr/lib/vlc/visualization
+usr/lib/vlc/visualization/libvisual_plugin.so
+#usr/share/applications/vlc.desktop
+#usr/share/doc/vlc
+#usr/share/doc/vlc/bugreport-howto.txt
+#usr/share/doc/vlc/fortunes.txt
+#usr/share/doc/vlc/intf-cdda.txt
+#usr/share/doc/vlc/intf-vcd.txt
+#usr/share/vlc
+#usr/share/vlc/http
+usr/share/vlc/http/.hosts
+#usr/share/vlc/http/dialogs
+usr/share/vlc/http/dialogs/.hosts
+usr/share/vlc/http/dialogs/browse
+usr/share/vlc/http/dialogs/footer
+usr/share/vlc/http/dialogs/input
+usr/share/vlc/http/dialogs/main
+usr/share/vlc/http/dialogs/mosaic
+usr/share/vlc/http/dialogs/playlist
+usr/share/vlc/http/dialogs/sout
+usr/share/vlc/http/dialogs/vlm
+usr/share/vlc/http/favicon.ico
+usr/share/vlc/http/iehacks.css
+#usr/share/vlc/http/images
+usr/share/vlc/http/images/delete.png
+usr/share/vlc/http/images/delete_small.png
+usr/share/vlc/http/images/eject.png
+usr/share/vlc/http/images/empty.png
+usr/share/vlc/http/images/fullscreen.png
+usr/share/vlc/http/images/help.png
+usr/share/vlc/http/images/info.png
+usr/share/vlc/http/images/loop.png
+usr/share/vlc/http/images/minus.png
+usr/share/vlc/http/images/next.png
+usr/share/vlc/http/images/pause.png
+usr/share/vlc/http/images/play.png
+usr/share/vlc/http/images/playlist.png
+usr/share/vlc/http/images/playlist_small.png
+usr/share/vlc/http/images/plus.png
+usr/share/vlc/http/images/prev.png
+usr/share/vlc/http/images/refresh.png
+usr/share/vlc/http/images/repeat.png
+usr/share/vlc/http/images/sd.png
+usr/share/vlc/http/images/shuffle.png
+usr/share/vlc/http/images/slider_bar.png
+usr/share/vlc/http/images/slider_left.png
+usr/share/vlc/http/images/slider_point.png
+usr/share/vlc/http/images/slider_right.png
+usr/share/vlc/http/images/slow.png
+usr/share/vlc/http/images/sort.png
+usr/share/vlc/http/images/sout.png
+usr/share/vlc/http/images/speaker.png
+usr/share/vlc/http/images/speaker_mute.png
+usr/share/vlc/http/images/stop.png
+usr/share/vlc/http/images/vlc16x16.png
+usr/share/vlc/http/images/volume_down.png
+usr/share/vlc/http/images/volume_up.png
+usr/share/vlc/http/images/white.png
+usr/share/vlc/http/images/white_cross_small.png
+usr/share/vlc/http/index.html
+#usr/share/vlc/http/js
+usr/share/vlc/http/js/functions.js
+usr/share/vlc/http/js/mosaic.js
+usr/share/vlc/http/js/vlm.js
+usr/share/vlc/http/mosaic.html
+#usr/share/vlc/http/old
+usr/share/vlc/http/old/.hosts
+#usr/share/vlc/http/old/admin
+usr/share/vlc/http/old/admin/.access
+usr/share/vlc/http/old/admin/browse.html
+usr/share/vlc/http/old/admin/dboxfiles.html
+usr/share/vlc/http/old/admin/index.html
+usr/share/vlc/http/old/cone_minus.png
+usr/share/vlc/http/old/cone_plus.png
+usr/share/vlc/http/old/index.html
+usr/share/vlc/http/old/info.html
+usr/share/vlc/http/old/style.css
+#usr/share/vlc/http/old/vlm
+usr/share/vlc/http/old/vlm/edit.html
+usr/share/vlc/http/old/vlm/index.html
+usr/share/vlc/http/old/vlm/new.html
+usr/share/vlc/http/old/vlm/show.html
+usr/share/vlc/http/old/webcam.html
+#usr/share/vlc/http/requests
+usr/share/vlc/http/requests/browse.xml
+usr/share/vlc/http/requests/playlist.xml
+usr/share/vlc/http/requests/readme
+usr/share/vlc/http/requests/status.xml
+usr/share/vlc/http/requests/vlm.xml
+usr/share/vlc/http/requests/vlm_cmd.xml
+usr/share/vlc/http/style.css
+usr/share/vlc/http/vlm.html
+usr/share/vlc/http/vlm_export.html
+#usr/share/vlc/osdmenu
+#usr/share/vlc/osdmenu/default
+usr/share/vlc/osdmenu/default.cfg
+#usr/share/vlc/osdmenu/default/selected
+usr/share/vlc/osdmenu/default/selected/bw.png
+usr/share/vlc/osdmenu/default/selected/esc.png
+usr/share/vlc/osdmenu/default/selected/fw.png
+usr/share/vlc/osdmenu/default/selected/next.png
+usr/share/vlc/osdmenu/default/selected/play_pause.png
+usr/share/vlc/osdmenu/default/selected/previous.png
+usr/share/vlc/osdmenu/default/selected/stop.png
+usr/share/vlc/osdmenu/default/selected/volume.png
+#usr/share/vlc/osdmenu/default/selection
+usr/share/vlc/osdmenu/default/selection/bw.png
+usr/share/vlc/osdmenu/default/selection/esc.png
+usr/share/vlc/osdmenu/default/selection/fw.png
+usr/share/vlc/osdmenu/default/selection/next.png
+usr/share/vlc/osdmenu/default/selection/play_pause.png
+usr/share/vlc/osdmenu/default/selection/previous.png
+usr/share/vlc/osdmenu/default/selection/stop.png
+usr/share/vlc/osdmenu/default/selection/volume.png
+usr/share/vlc/osdmenu/default/unselected.png
+#usr/share/vlc/osdmenu/default/volume
+usr/share/vlc/osdmenu/default/volume/volume_00.png
+usr/share/vlc/osdmenu/default/volume/volume_01.png
+usr/share/vlc/osdmenu/default/volume/volume_02.png
+usr/share/vlc/osdmenu/default/volume/volume_03.png
+usr/share/vlc/osdmenu/default/volume/volume_04.png
+usr/share/vlc/osdmenu/default/volume/volume_05.png
+usr/share/vlc/osdmenu/default/volume/volume_06.png
+usr/share/vlc/osdmenu/default/volume/volume_07.png
+usr/share/vlc/osdmenu/default/volume/volume_08.png
+usr/share/vlc/osdmenu/default/volume/volume_09.png
+usr/share/vlc/osdmenu/default/volume/volume_10.png
+#usr/share/vlc/osdmenu/dvd
+usr/share/vlc/osdmenu/dvd.cfg
+#usr/share/vlc/osdmenu/dvd/selected
+usr/share/vlc/osdmenu/dvd/selected/bw.png
+usr/share/vlc/osdmenu/dvd/selected/esc.png
+usr/share/vlc/osdmenu/dvd/selected/fw.png
+usr/share/vlc/osdmenu/dvd/selected/mute.png
+usr/share/vlc/osdmenu/dvd/selected/next.png
+usr/share/vlc/osdmenu/dvd/selected/pause.png
+usr/share/vlc/osdmenu/dvd/selected/play.png
+usr/share/vlc/osdmenu/dvd/selected/previous.png
+usr/share/vlc/osdmenu/dvd/selected/slow.png
+usr/share/vlc/osdmenu/dvd/selected/stop.png
+usr/share/vlc/osdmenu/dvd/selected/volume.png
+#usr/share/vlc/osdmenu/dvd/selection
+usr/share/vlc/osdmenu/dvd/selection/bw.png
+usr/share/vlc/osdmenu/dvd/selection/esc.png
+usr/share/vlc/osdmenu/dvd/selection/fw.png
+usr/share/vlc/osdmenu/dvd/selection/mute.png
+usr/share/vlc/osdmenu/dvd/selection/next.png
+usr/share/vlc/osdmenu/dvd/selection/pause.png
+usr/share/vlc/osdmenu/dvd/selection/play.png
+usr/share/vlc/osdmenu/dvd/selection/previous.png
+usr/share/vlc/osdmenu/dvd/selection/slow.png
+usr/share/vlc/osdmenu/dvd/selection/stop.png
+#usr/share/vlc/osdmenu/dvd/unselect
+usr/share/vlc/osdmenu/dvd/unselect/barroff.png
+#usr/share/vlc/osdmenu/dvd/volume
+usr/share/vlc/osdmenu/dvd/volume/volume00.png
+usr/share/vlc/osdmenu/dvd/volume/volume01.png
+usr/share/vlc/osdmenu/dvd/volume/volume02.png
+usr/share/vlc/osdmenu/dvd/volume/volume03.png
+usr/share/vlc/osdmenu/dvd/volume/volume04.png
+usr/share/vlc/osdmenu/dvd/volume/volume05.png
+usr/share/vlc/pda-forwardb16x16.xpm
+usr/share/vlc/pda-openb16x16.xpm
+usr/share/vlc/pda-pauseb16x16.xpm
+usr/share/vlc/pda-playb16x16.xpm
+usr/share/vlc/pda-playlistb16x16.xpm
+usr/share/vlc/pda-preferencesb16x16.xpm
+usr/share/vlc/pda-rewindb16x16.xpm
+usr/share/vlc/pda-stopb16x16.xpm
+#usr/share/vlc/skins2
+usr/share/vlc/skins2/default.vlt
+#usr/share/vlc/skins2/fonts
+usr/share/vlc/skins2/fonts/FreeSans.ttf
+usr/share/vlc/skins2/fonts/FreeSansBold.ttf
+usr/share/vlc/skins2/skin.catalog
+usr/share/vlc/skins2/skin.dtd
+usr/share/vlc/skins2/winamp2.xml
+usr/share/vlc/vlc128x128.png
+usr/share/vlc/vlc16x16.png
+usr/share/vlc/vlc16x16.xpm
+usr/share/vlc/vlc32x32.png
+usr/share/vlc/vlc32x32.xpm
+usr/share/vlc/vlc48x48.ico
+usr/share/vlc/vlc48x48.png
--- /dev/null
+#usr/include/xvid.h
+#usr/lib/libxvidcore.a
+usr/lib/libxvidcore.so
+usr/lib/libxvidcore.so.4
+usr/lib/libxvidcore.so.4.1
* ez-ipupdate-3.0.11b8
* fcron-3.0.1
* fetchmail-6.3.4
+* ffmpeg-0.4.9-pre1
* file-4.17
* findutils-4.2.27
* flex-2.5.33
* module-init-tools-3.2.2
* mpc-0.12.1
* mpd-0.13.0
+* mpeg2dec-0.4.0b
* mpfire-ipfire
* mpg123-0.59r
* mtd-CVS-20070507
* util-linux-2.12r
* vim-7.0
* vlan.1.9
+* vlc-0.8.6c
* vsftpd-2.0.5
* web-cyradm-0.5.5-CVS-for-ipfire
* wget-1.10.2
* which-2.16
* wireless_tools.28
* xmbmon205
+* xvidcore-1.1.0
* zaptel-1.4.4
* zlib-1.2.3
--- /dev/null
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 0.4.9-pre1
+
+THISAPP = ffmpeg-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = ffmpeg
+PAK_VER = 1
+
+DEPS = "libvorbis lame"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = ea5587e3c66d50b1503b82ac4179c303
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ffmpeg-0.4.9-pre1-gcc4-1.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ffmpeg-0.4.9-pre1-amr_fixes-1.patch
+ cd $(DIR_APP) && sed -i "s/static uint64/const uint64/" libavcodec/liba52/resample_mmx.c
+ cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared --enable-gpl \
+ --enable-pp --enable-pthreads --disable-ffplay \
+ --enable-xvid --disable-mmx
+ cd $(DIR_APP) && make
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
--- /dev/null
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 0.4.0b
+
+THISAPP = mpeg2dec-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/mpeg2dec-0.4.0
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = libmpeg2
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 52d10ea80595ec83d8557ba7ac6dc8e6
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
--- /dev/null
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 0.8.6c
+
+THISAPP = vlc-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = ffmpeg
+PAK_VER = 1
+
+DEPS = "ffmpeg libshout libmpeg2 libmad"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 3e5f3d7973874a36554fb0c8c77fc63e
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared --disable-ffmpeg \
+ --disable-wxwidgets --disable-skins2 --without-x \
+ --enable-httpd --enable-pth --enable-shout \
+ --enable-smb --enable-cddax --enable-ncurses \
+ --disable-nls
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
--- /dev/null
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.1.0
+
+THISAPP = xvidcore-$(VER)
+DL_FILE = $(THISAPP).tar.bz2
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = xvid
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 359eebc5fb496a2bf7b15010059e7897
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP)/build/generic && ./configure --prefix=/usr
+ cd $(DIR_APP)/build/generic && make
+ cd $(DIR_APP)/build/generic && make install
+ chmod -v 755 /usr/lib/libxvidcore.so.4.1
+ ln -v -sf libxvidcore.so.4.1 /usr/lib/libxvidcore.so.4
+ ln -v -sf libxvidcore.so.4 /usr/lib/libxvidcore.so
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
ipfiremake icegenerator
ipfiremake mpd
ipfiremake mpc
+ ipfiremake xvid
+ ipfiremake libmpeg2
+ #ipfiremake ffmpeg
+ ipfiremake videolan
ipfiremake libpri
ipfiremake stund
ipfiremake asterisk
--- /dev/null
+Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date: 2006-01-12
+Initial Package Version: 0.4.9-pre1
+Upstream Status: Applied in upstream CVS
+Origin: MPlayer-1.0pre7try2 version of FFmpeg (upstream CVS)
+Description: Fixes building with AMR code
+
+
+diff -Naur ffmpeg-0.4.9-pre1-orig/libavcodec/Makefile ffmpeg-0.4.9-pre1/libavcodec/Makefile
+--- ffmpeg-0.4.9-pre1-orig/libavcodec/Makefile 2004-06-18 13:11:15.000000000 +0000
++++ ffmpeg-0.4.9-pre1/libavcodec/Makefile 2006-01-12 18:27:33.000000000 +0000
+@@ -7,7 +7,7 @@
+ VPATH=$(SRC_PATH)/libavcodec
+
+ # NOTE: -I.. is needed to include config.h
+-CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
++CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $(AMR_CFLAGS)
+
+ OBJS= common.o utils.o mem.o allcodecs.o \
+ mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
+@@ -22,14 +22,16 @@
+ smc.o parser.o flicvideo.o truemotion1.o vmdav.o lcl.o qtrle.o g726.o \
+ flac.o vp3dsp.o integer.o
+
++AMROBJS=
+ ifeq ($(AMR_NB),yes)
+ ifeq ($(AMR_NB_FIXED),yes)
+-OBJS+= amr.o
++AMROBJS= amr.o
+ AMREXTRALIBS+= amr/*.o
+ AMRLIBS=amrlibs
+ CLEANAMR=cleanamr
+ else
+-OBJS+= amr.o amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
++AMROBJS= amr.o
++OBJS+= amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
+ CLEANAMR=cleanamrfloat
+ endif
+ endif
+@@ -43,13 +45,15 @@
+ endif
+
+ ifeq ($(AMR_WB),yes)
+-OBJS+= amr.o amrwb_float/dec_acelp.o amrwb_float/dec_dtx.o amrwb_float/dec_gain.o \
++AMROBJS= amr.o
++OBJS+= amrwb_float/dec_acelp.o amrwb_float/dec_dtx.o amrwb_float/dec_gain.o \
+ amrwb_float/dec_if.o amrwb_float/dec_lpc.o amrwb_float/dec_main.o \
+ amrwb_float/dec_rom.o amrwb_float/dec_util.o amrwb_float/enc_acelp.o \
+ amrwb_float/enc_dtx.o amrwb_float/enc_gain.o amrwb_float/enc_if.o \
+ amrwb_float/enc_lpc.o amrwb_float/enc_main.o amrwb_float/enc_rom.o \
+ amrwb_float/enc_util.o amrwb_float/if_rom.o
+ endif
++OBJS+= $(AMROBJS)
+ CLEANAMRWB=cleanamrwbfloat
+ ASM_OBJS=
+
+diff -Naur ffmpeg-0.4.9-pre1-orig/libavcodec/amr.c ffmpeg-0.4.9-pre1/libavcodec/amr.c
+--- ffmpeg-0.4.9-pre1-orig/libavcodec/amr.c 2004-05-21 14:37:16.000000000 +0000
++++ ffmpeg-0.4.9-pre1/libavcodec/amr.c 2006-01-12 18:27:33.000000000 +0000
+@@ -411,27 +411,32 @@
+ AMRContext *s = (AMRContext*)avctx->priv_data;
+
+ uint8_t*amrData=buf;
+- int offset=0;
+ static short block_size[16]={ 12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0 };
+ enum Mode dec_mode;
+ int packet_size;
+
+- //printf("amr_decode_frame data_size=%i buf=0x%X buf_size=%d frameCount=%d!!\n",*data_size,buf,buf_size,s->frameCount);
++ /* av_log(NULL,AV_LOG_DEBUG,"amr_decode_frame buf=%p buf_size=%d frameCount=%d!!\n",buf,buf_size,s->frameCount); */
++
++ if(buf_size==0) {
++ /* nothing to do */
++ return 0;
++ }
+
+- while(offset<buf_size)
+- {
+- dec_mode = (amrData[offset] >> 3) & 0x000F;
+- packet_size = block_size[dec_mode];
++ dec_mode = (buf[0] >> 3) & 0x000F;
++ packet_size = block_size[dec_mode]+1;
++
++ if(packet_size > buf_size) {
++ av_log(avctx, AV_LOG_ERROR, "amr frame too short (%u, should be %u)\n", buf_size, packet_size);
++ return -1;
++ }
+
+- s->frameCount++;
+- //printf("offset=%d, packet_size=%d amrData= 0x%X %X %X %X\n",offset,packet_size,amrData[offset],amrData[offset+1],amrData[offset+2],amrData[offset+3]);
+- /* call decoder */
+- Decoder_Interface_Decode(s->decState, &amrData[offset], data+*data_size, 0);
+- *data_size+=160*2;
++ s->frameCount++;
++ /* av_log(NULL,AV_LOG_DEBUG,"packet_size=%d amrData= 0x%X %X %X %X\n",packet_size,amrData[0],amrData[1],amrData[2],amrData[3]); */
++ /* call decoder */
++ Decoder_Interface_Decode(s->decState, amrData, data, 0);
++ *data_size=160*2;
+
+- offset+=packet_size+1;
+- }
+- return buf_size;
++ return packet_size;
+ }
+
+ static int amr_nb_encode_frame(AVCodecContext *avctx,
+@@ -445,6 +450,7 @@
+ data,
+ frame,
+ 0);
++ /* av_log(NULL,AV_LOG_DEBUG,"amr_nb_encode_frame encoded %u bytes, bitrate %u, first byte was %#02x\n",written, s->enc_bitrate, frame[0] ); */
+
+ return written;
+ }
+@@ -598,20 +604,26 @@
+ AMRWBContext *s = (AMRWBContext*)avctx->priv_data;
+
+ uint8_t*amrData=buf;
+- int offset=0;
+ int mode;
+ int packet_size;
+
+- while(offset<buf_size)
+- {
+- s->frameCount++;
+- mode = (Word16)((amrData[offset] >> 3) & 0x0F);
+- packet_size = block_size[mode];
+- D_IF_decode( s->state, &amrData[offset], data+*data_size, _good_frame);
+- *data_size+=320*2;
+- offset+=packet_size;
++ if(buf_size==0) {
++ /* nothing to do */
++ return 0;
+ }
+- return buf_size;
++
++ mode = (amrData[0] >> 3) & 0x000F;
++ packet_size = block_size[mode];
++
++ if(packet_size > buf_size) {
++ av_log(avctx, AV_LOG_ERROR, "amr frame too short (%u, should be %u)\n", buf_size, packet_size+1);
++ return -1;
++ }
++
++ s->frameCount++;
++ D_IF_decode( s->state, amrData, data, _good_frame);
++ *data_size=320*2;
++ return packet_size;
+ }
+
+ static int amr_wb_decode_close(AVCodecContext * avctx)
+
+diff -Naur ffmpeg-0.4.9-pre1-orig/libavcodec/avcodec.h ffmpeg-0.4.9-pre1/libavcodec/avcodec.h
+--- ffmpeg-0.4.9-pre1-orig/libavcodec/avcodec.h 2004-07-09 12:49:55.000000000 +0000
++++ ffmpeg-0.4.9-pre1/libavcodec/avcodec.h 2006-01-12 18:27:33.000000000 +0000
+@@ -124,7 +124,7 @@
+ CODEC_ID_ADPCM_G726,
+
+ /* AMR */
+- CODEC_ID_AMR_NB,
++ CODEC_ID_AMR_NB= 0x12000,
+ CODEC_ID_AMR_WB,
+
+ /* RealAudio codecs*/
+
+diff -Naur ffmpeg-0.4.9-pre1-orig/libavformat/Makefile ffmpeg-0.4.9-pre1/libavformat/Makefile
+--- ffmpeg-0.4.9-pre1-orig/libavformat/Makefile 2004-04-24 15:16:23.000000000 +0000
++++ ffmpeg-0.4.9-pre1/libavformat/Makefile 2006-01-12 18:27:33.000000000 +0000
+@@ -23,15 +23,17 @@
+ OBJS+= asf-enc.o
+ endif
+
++AMROBJS=
+ ifeq ($(AMR_NB),yes)
+-OBJS+= amr.o
++AMROBJS= amr.o
+ endif
+ ifeq ($(AMR_NB_FIXED),yes)
+-OBJS+= amr.o
++AMROBJS= amr.o
+ endif
+ ifeq ($(AMR_WB),yes)
+-OBJS+= amr.o
++AMROBJS= amr.o
+ endif
++OBJS+= $(AMROBJS)
+
+ # image formats
+ OBJS+= pnm.o yuv.o png.o jpeg.o gifdec.o sgi.o
+
--- /dev/null
+Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date: 2005-09-07
+Initial Package Version: 0.4.9-pre1
+Upstream Status: Some fixes unknown, the MMX fix is from upstream CVS
+Origin: Frugalware Linux (frugalware.org)
+ http://frugalware.org/pipermail/frugalware-darcs/2005-August/003296.html
+ Also the MMX fix is from upstream CVS
+ http://www1.mplayerhq.hu/cgi-bin/cvsweb.cgi/ffmpeg/libavcodec/i386/dsputil_mmx.c.diff?r1=1.88&r2=1.89&cvsroot=FFMpeg
+Description: Fixes GCC-4.0.1 build problems
+
+
+diff -Naur ffmpeg-0.4.9-pre1-orig/libavcodec/ac3.h ffmpeg-0.4.9-pre1/libavcodec/ac3.h
+--- ffmpeg-0.4.9-pre1-orig/libavcodec/ac3.h 2003-03-06 11:32:04.000000000 +0000
++++ ffmpeg-0.4.9-pre1/libavcodec/ac3.h 2005-09-07 18:50:35.000000000 +0000
+@@ -43,6 +43,7 @@
+ int cplfleak, cplsleak;
+ } AC3BitAllocParameters;
+
++#if 0
+ extern const uint16_t ac3_freqs[3];
+ extern const uint16_t ac3_bitratetab[19];
+ extern const int16_t ac3_window[256];
+@@ -52,6 +53,7 @@
+ extern const uint16_t dbkneetab[4];
+ extern const uint16_t floortab[8];
+ extern const uint16_t fgaintab[8];
++#endif
+
+ void ac3_common_init(void);
+ void ac3_parametric_bit_allocation(AC3BitAllocParameters *s, uint8_t *bap,
+
+diff -Naur ffmpeg-0.4.9-pre1-orig/libavcodec/avcodec.h ffmpeg-0.4.9-pre1/libavcodec/avcodec.h
+--- ffmpeg-0.4.9-pre1-orig/libavcodec/avcodec.h 2004-07-09 12:49:55.000000000 +0000
++++ ffmpeg-0.4.9-pre1/libavcodec/avcodec.h 2005-09-07 18:49:40.000000000 +0000
+@@ -1657,6 +1657,14 @@
+ #define FF_OPT_MAX_DEPTH 10
+ } AVOption;
+
++struct AVOption;
++#ifdef HAVE_MMX
++extern const struct AVOption avoptions_common[3 + 5];
++#else
++extern const struct AVOption avoptions_common[3];
++#endif
++extern const struct AVOption avoptions_workaround_bug[11];
++
+ /**
+ * Parse option(s) and sets fields in passed structure
+ * @param strct structure where the parsed results will be written
+
+diff -Naur ffmpeg-0.4.9-pre1-orig/libavcodec/common.h ffmpeg-0.4.9-pre1/libavcodec/common.h
+--- ffmpeg-0.4.9-pre1-orig/libavcodec/common.h 2004-07-01 12:33:07.000000000 +0000
++++ ffmpeg-0.4.9-pre1/libavcodec/common.h 2005-09-07 18:49:40.000000000 +0000
+@@ -62,14 +62,6 @@
+ #define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr }
+ #define AVOPTION_END() AVOPTION_SUB(NULL)
+
+-struct AVOption;
+-#ifdef HAVE_MMX
+-extern const struct AVOption avoptions_common[3 + 5];
+-#else
+-extern const struct AVOption avoptions_common[3];
+-#endif
+-extern const struct AVOption avoptions_workaround_bug[11];
+-
+ #endif /* HAVE_AV_CONFIG_H */
+
+ /* Suppress restrict if it was not defined in config.h. */
+
+diff -Naur ffmpeg-0.4.9-pre1-orig/libavcodec/i386/dsputil_mmx.c ffmpeg-0.4.9-pre1/libavcodec/i386/dsputil_mmx.c
+--- ffmpeg-0.4.9-pre1-orig/libavcodec/i386/dsputil_mmx.c 2004-06-08 02:13:44.000000000 +0000
++++ ffmpeg-0.4.9-pre1/libavcodec/i386/dsputil_mmx.c 2005-09-07 18:54:04.000000000 +0000
+@@ -644,26 +644,22 @@
+ "punpcklwd %%mm0, %%mm1 \n\t"
+ "punpckhwd %%mm4, %%mm3 \n\t"
+ "punpckhwd %%mm0, %%mm6 \n\t"
+- "movd %%mm5, %0 \n\t"
+- "punpckhdq %%mm5, %%mm5 \n\t"
+- "movd %%mm5, %1 \n\t"
+- "movd %%mm3, %2 \n\t"
+- "punpckhdq %%mm3, %%mm3 \n\t"
+- "movd %%mm3, %3 \n\t"
+- "movd %%mm1, %4 \n\t"
+- "punpckhdq %%mm1, %%mm1 \n\t"
+- "movd %%mm1, %5 \n\t"
+- "movd %%mm6, %6 \n\t"
+- "punpckhdq %%mm6, %%mm6 \n\t"
+- "movd %%mm6, %7 \n\t"
+- : "=m" (*(uint32_t*)(src + 0*stride)),
+- "=m" (*(uint32_t*)(src + 1*stride)),
+- "=m" (*(uint32_t*)(src + 2*stride)),
+- "=m" (*(uint32_t*)(src + 3*stride)),
+- "=m" (*(uint32_t*)(src + 4*stride)),
+- "=m" (*(uint32_t*)(src + 5*stride)),
+- "=m" (*(uint32_t*)(src + 6*stride)),
+- "=m" (*(uint32_t*)(src + 7*stride))
++ "movd %%mm5, (%0) \n\t"
++ "punpckhdq %%mm5, %%mm5 \n\t"
++ "movd %%mm5, (%0,%2) \n\t"
++ "movd %%mm3, (%0,%2,2) \n\t"
++ "punpckhdq %%mm3, %%mm3 \n\t"
++ "movd %%mm3, (%0,%3) \n\t"
++ "movd %%mm1, (%1) \n\t"
++ "punpckhdq %%mm1, %%mm1 \n\t"
++ "movd %%mm1, (%1,%2) \n\t"
++ "movd %%mm6, (%1,%2,2) \n\t"
++ "punpckhdq %%mm6, %%mm6 \n\t"
++ "movd %%mm6, (%1,%3) \n\t"
++ :: "r" (src),
++ "r" (src + 4*stride),
++ "r" ((long) stride ),
++ "r" ((long)(3*stride))
+ );
+ }
+
--- /dev/null
+--- libavcodec/libpostproc/postprocess_template.orig.c 2005-05-04 00:13:55.809595776 -0400
++++ libavcodec/libpostproc/postprocess_template.c 2005-05-04 00:17:44.090891744 -0400
+@@ -2646,7 +2646,7 @@
+ * accurate deblock filter
+ */
+ static always_inline void RENAME(do_a_deblock)(uint8_t *src, int step, int stride, PPContext *c){
+- int64_t dc_mask, eq_mask;
++ int64_t dc_mask, eq_mask, both_masks;
+ int64_t sums[10*8*2];
+ src+= step*3; // src points to begin of the 8x8 Block
+ //START_TIMER
+@@ -2755,7 +2755,9 @@
+ : "%eax"
+ );
+
+- if(dc_mask & eq_mask){
++ both_masks = dc_mask & eq_mask;
++
++ if (both_masks){
+ int offset= -8*step;
+ int64_t *temp_sums= sums;
+
+@@ -2930,7 +2932,7 @@
+ " js 1b \n\t"
+
+ : "+r"(offset), "+r"(temp_sums)
+- : "r" (step), "r"(src - offset), "m"(dc_mask & eq_mask)
++ : "r" (step), "r"(src - offset), "m"(both_masks)
+ );
+ }else
+ src+= step; // src points to begin of the 8x8 Block
projects / ipfire-2.x.git / commitdiff
