← Back to branch summary

~noskcaj/ubuntu/trusty/libextractor/merge

« back to all changes in this revision

Viewing changes to src/plugins/thumbnailffmpeg/README

  • Committer: Bazaar Package Importer
  • Author(s): Luca Falavigna
  • Date: 2008-11-10 22:21:49 UTC
  • mfrom: (1.10.3 upstream) (5.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20081110222149-pr35f3nmqy5cf52i
Tags: 0.5.21+dfsg-1ubuntu1
* Merge from Debian unstable, remaining Ubuntu changes:
  - (Build-)depend on libltdl7-dev (Ubuntu-specific change).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/thumbnailffmpeg/README
7
7
(2) mainline ffmpeg is not reentrant,
8
8
(3) security issues can be handled locally.
9
9
 
10
 
Current base version fetch:
 
10
Originally:
11
11
svn export -r 13836 --ignore-externals svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
12
12
svn export -r 27100 svn://svn.mplayerhq.hu/mplayer/trunk/libswscale ffmpeg/libswscale
 
13
sync with ffmpeg:
 
14
FFREV=14311
 
15
SWSREV=27332
 
16
cd /tmp
 
17
svn co -r $FFREV --ignore-externals svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
 
18
svn co -r $SWSREV svn://svn.mplayerhq.hu/mplayer/trunk/libswscale ffmpeg/libswscale
 
19
cd Extractor/src/plugins/thumbnailffmpeg
 
20
# copy, rsync skips .svn dirs
 
21
rsync -aC ffmpeg /tmp/
 
22
cd /tmp/ffmpeg
 
23
svn update
 
24
<resolve conflicts>
 
25
cd Extractor/src/plugins/thumbnailffmpeg
 
26
rsync -aC /tmp/ffmpeg .
 
27
# check for deletions
 
28
diff -qr . /tmp/ffmpeg -x .svn
 
29
<svn delete ...>
 
30
# check for additions
 
31
<svn status, svn add>
13
32
 
14
33
Plan: test & enable ffmpeg decoders one by one
15
34
tests: