summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2008-03-01 02:52:41 +0100
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2008-03-01 02:52:41 +0100
commitced1af6e9fc07b305c00ec76fd584c3654421ea7 (patch)
tree7dd9043b379294baa8b19bef70456aa02a750643 /m4
parentfc9ff87cf9b7753a1622339b4dd3e4ea286f05e7 (diff)
parentfb54f247855376800b65585e5868cd4d2062c0a2 (diff)
downloadxine-lib-ced1af6e9fc07b305c00ec76fd584c3654421ea7.tar.gz
xine-lib-ced1af6e9fc07b305c00ec76fd584c3654421ea7.tar.bz2
Merge from 1.1.
--HG-- rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am rename : src/libffmpeg/ff_dvaudio_decoder.c => src/combined/ffmpeg/ff_dvaudio_decoder.c rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c rename : src/libffmpeg/ffmpeg_decoder.h => src/combined/ffmpeg/ffmpeg_decoder.h
Diffstat (limited to 'm4')
0 files changed, 0 insertions, 0 deletions