[SCM] ffms2/master: Refresh
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Thu Oct 20 18:48:40 UTC 2016
The following commit has been merged in the master branch:
commit 0edf17685427bf6dae905280b1b0d1b805652112
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Thu Oct 20 20:40:01 2016 +0200
Refresh
diff --git a/debian/patches/fix-links.patch b/debian/patches/fix-links.patch
index e39f026..2ebea53 100644
--- a/debian/patches/fix-links.patch
+++ b/debian/patches/fix-links.patch
@@ -2,18 +2,18 @@ Description: Fix links
Author: Sebastian Ramacher <sramacher at debian.org>
Last-Update: 2015-07-13
---- ffms2-2.21.orig/doc/ffms2-api.md
-+++ ffms2-2.21/doc/ffms2-api.md
-@@ -184,7 +184,7 @@ How many characters you want to allocate
+--- a/doc/ffms2-api.md
++++ b/doc/ffms2-api.md
+@@ -184,7 +184,7 @@
### FFMS_Init - initializes the library
-[Init]: #ffms_init---initializes-the-library
+[Init]: #ffms_init-initializes-the-library
```c++
- void FFMS_Init(int Unused, int UseUTF8Paths);
+ void FFMS_Init(int Unused, int Unused2);
```
-@@ -209,7 +209,7 @@ Prior to API version 2.14.0.0 this funct
+@@ -204,7 +204,7 @@
### FFMS_GetLogLevel - gets FFmpeg message level
@@ -22,7 +22,7 @@ Last-Update: 2015-07-13
```c++
int FFMS_GetLogLevel();
```
-@@ -219,7 +219,7 @@ Alternatively, just copy the relevant co
+@@ -214,7 +214,7 @@
### FFMS_SetLogLevel - sets FFmpeg message level
@@ -31,7 +31,7 @@ Last-Update: 2015-07-13
```c++
void FFMS_SetLogLevel(int Level);
```
-@@ -227,7 +227,7 @@ Sets FFmpeg's logging/message level; see
+@@ -222,7 +222,7 @@
### FFMS_CreateVideoSource - creates a video source object
@@ -40,7 +40,7 @@ Last-Update: 2015-07-13
```c++
FFMS_VideoSource *FFMS_CreateVideoSource(const char *SourceFile, int Track, FFMS_Index *Index,
int Threads, int SeekMode, FFMS_ErrorInfo *ErrorInfo);
-@@ -268,7 +268,7 @@ Returns `NULL` and sets `ErrorMsg` on fa
+@@ -263,7 +263,7 @@
### FFMS_CreateAudioSource - creates an audio source object
@@ -49,7 +49,7 @@ Last-Update: 2015-07-13
```c++
FFMS_AudioSource *FFMS_CreateAudioSource(const char *SourceFile, int Track, FFMS_Index *Index, int DelayMode,
FFMS_ErrorInfo *ErrorInfo);
-@@ -291,8 +291,8 @@ Possible arguments are:
+@@ -286,8 +286,8 @@
### FFMS_DestroyVideoSource, FFMS_DestroyAudioSource - deallocates a video or audio source object
@@ -60,7 +60,7 @@ Last-Update: 2015-07-13
```c++
void FFMS_DestroyVideoSource(FFMS_VideoSource *V);
void FFMS_DestroyAudioSource(FFMS_AudioSource *A);
-@@ -301,7 +301,7 @@ Deallocates the given `FFMS_VideoSource`
+@@ -296,7 +296,7 @@
### FFMS_GetVideoProperties - retrieves video properties
@@ -69,7 +69,7 @@ Last-Update: 2015-07-13
```c++
const FFMS_VideoProperties *FFMS_GetVideoProperties(FFMS_VideoSource *V);
```
-@@ -310,7 +310,7 @@ Returns a pointer to said struct.
+@@ -305,7 +305,7 @@
### FFMS_GetAudioProperties - retrieves audio properties
@@ -78,7 +78,7 @@ Last-Update: 2015-07-13
```c++
const FFMS_AudioProperties *FFMS_GetAudioProperties(FFMS_AudioSource *A);
```
-@@ -319,7 +319,7 @@ See [FFMS_AudioProperties][AudioProperti
+@@ -314,7 +314,7 @@
### FFMS_GetFrame - retrieves a given video frame
@@ -87,7 +87,7 @@ Last-Update: 2015-07-13
```c++
const FFMS_Frame *FFMS_GetFrame(FFMS_VideoSource *V, int n, FFMS_ErrorInfo *ErrorInfo);
```
-@@ -347,7 +347,7 @@ Note that while `FFMS_GetFrame` tends to
+@@ -342,7 +342,7 @@
### FFMS_GetFrameByTime - retrieves a video frame at a given timestamp
@@ -96,7 +96,7 @@ Last-Update: 2015-07-13
```c++
const FFMS_Frame *FFMS_GetFrameByTime(FFMS_VideoSource *V, double Time, FFMS_ErrorInfo *ErrorInfo);
```
-@@ -356,7 +356,7 @@ This function exists for the people who
+@@ -351,7 +351,7 @@
### FFMS_GetAudio - decodes a number of audio samples
@@ -105,7 +105,7 @@ Last-Update: 2015-07-13
```c++
int FFMS_GetAudio(FFMS_AudioSource *A, void *Buf, int64_t Start, int64_t Count, FFMS_ErrorInfo *ErrorInfo);
```
-@@ -388,7 +388,7 @@ Returns non-0 and sets `ErrorMsg` on fai
+@@ -383,7 +383,7 @@
### FFMS_SetOutputFormatV2 - sets the output format for video frames
@@ -114,7 +114,7 @@ Last-Update: 2015-07-13
```c++
int FFMS_SetOutputFormatV2(FFMS_VideoSource *V, int *TargetFormats, int Width, int Height, int Resizer,
FFMS_ErrorInfo *ErrorInfo);
-@@ -437,7 +437,7 @@ Returns non-0 and sets `ErrorMsg` on fai
+@@ -432,7 +432,7 @@
### FFMS_ResetOutputFormatV - resets the video output format
@@ -123,7 +123,7 @@ Last-Update: 2015-07-13
```c++
void FFMS_ResetOutputFormatV(FFMS_VideoSource *V);
```
-@@ -447,7 +447,7 @@ If you call it, you'd better call [FFMS_
+@@ -442,7 +442,7 @@
### FFMS_SetInputFormatV - override the source format for video frames
@@ -132,7 +132,7 @@ Last-Update: 2015-07-13
```c++
int FFMS_SetInputFormatV(FFMS_VideoSource *V, int ColorSpace, int ColorRange, int PixelFormat,
FFMS_ErrorInfo *ErrorInfo);
-@@ -484,7 +484,7 @@ Returns non-0 and sets `ErrorMsg` on fai
+@@ -479,7 +479,7 @@
### FFMS_ResetInputFormatV - resets the video input format
@@ -141,7 +141,7 @@ Last-Update: 2015-07-13
```c++
void FFMS_ResetInputFormatV(FFMS_VideoSource *V);
```
-@@ -492,7 +492,7 @@ Resets the input format for the given `F
+@@ -487,7 +487,7 @@
### FFMS_DestroyIndex - deallocates an index object
@@ -150,7 +150,7 @@ Last-Update: 2015-07-13
```c++
void FFMS_DestroyFFMS_Index(FFMS_Index *Index);
```
-@@ -500,7 +500,7 @@ Deallocates the given `FFMS_Index` objec
+@@ -495,7 +495,7 @@
### FFMS_GetSourceType - gets which source module was used to open the given index
@@ -159,7 +159,7 @@ Last-Update: 2015-07-13
```c++
int FFMS_GetSourceType(FFMS_Index *Index);
```
-@@ -508,7 +508,7 @@ Returns `FFMS_SOURCE_LAVF`.
+@@ -503,7 +503,7 @@
### FFMS_GetSourceTypeI - gets which source module was used to open the given indexer
@@ -168,7 +168,7 @@ Last-Update: 2015-07-13
```c++
int FFMS_GetSourceTypeI(FFMS_Index *Indexer);
```
-@@ -516,7 +516,7 @@ Does the same thing as [FFMS_GetSourceTy
+@@ -511,7 +511,7 @@
### FFMS_GetErrorHandling - gets which error handling mode was used when creating the given index
@@ -177,7 +177,7 @@ Last-Update: 2015-07-13
```c++
int FFMS_GetErrorHandling(FFMS_Index *Index);
```
-@@ -524,7 +524,7 @@ Returns the value of the ErrorHandling p
+@@ -519,7 +519,7 @@
### FFMS_GetFirstTrackOfType - gets the track number of the first track of a given type
@@ -186,7 +186,7 @@ Last-Update: 2015-07-13
```c++
int FFMS_GetFirstTrackOfType(FFMS_Index *Index, int TrackType, FFMS_ErrorInfo *ErrorInfo);
```
-@@ -548,7 +548,7 @@ Returns a negative integer and sets Erro
+@@ -543,7 +543,7 @@
### FFMS_GetFirstIndexedTrackOfType - gets the track number of the first track of a given type
@@ -195,7 +195,7 @@ Last-Update: 2015-07-13
```c++
int FFMS_GetFirstIndexedTrackOfType(FFMS_Index *Index, int TrackType, FFMS_ErrorInfo *ErrorInfo);
```
-@@ -556,7 +556,7 @@ Does the exact same thing as [FFMS_GetFi
+@@ -551,7 +551,7 @@
### FFMS_GetNumTracks - gets the number of tracks in a given index
@@ -204,7 +204,7 @@ Last-Update: 2015-07-13
```c++
int FFMS_GetNumTracks(FFMS_Index *Index);
```
-@@ -564,7 +564,7 @@ Returns the total number of tracks in th
+@@ -559,7 +559,7 @@
### FFMS_GetNumTracksI - gets the number of tracks in a given indexer
@@ -213,7 +213,7 @@ Last-Update: 2015-07-13
```c++
int FFMS_GetNumTracksI(FFMS_Indexer *Indexer);
```
-@@ -573,7 +573,7 @@ In other words, does the same thing as [
+@@ -568,7 +568,7 @@
### FFMS_GetTrackType - gets the track type of a given track
@@ -222,7 +222,7 @@ Last-Update: 2015-07-13
```c++
int FFMS_GetTrackType(FFMS_Track *T);
```
-@@ -581,7 +581,7 @@ Returns an integer representing the [FFM
+@@ -576,7 +576,7 @@
### FFMS_GetTrackTypeI - gets the track type of a given track
@@ -231,7 +231,7 @@ Last-Update: 2015-07-13
```c++
int FFMS_GetTrackTypeI(FFMS_Indexer *Indexer, int Track);
```
-@@ -592,7 +592,7 @@ Note that specifying an invalid track nu
+@@ -587,7 +587,7 @@
### FFMS_GetCodecNameI - gets the name of the codec used for a given track
@@ -240,7 +240,7 @@ Last-Update: 2015-07-13
```c++
const char *FFMS_GetCodecNameI(FFMS_Indexer *Indexer, int Track);
```
-@@ -602,7 +602,7 @@ Note that specifying an invalid track nu
+@@ -597,7 +597,7 @@
### FFMS_GetFormatNameI - gets the name of the container format used in the given indexer
@@ -249,7 +249,7 @@ Last-Update: 2015-07-13
```c++
const char *FFMS_GetFormatNameI(FFMS_Indexer *Indexer);
```
-@@ -610,7 +610,7 @@ Returns the human-readable name ("long n
+@@ -605,7 +605,7 @@
### FFMS_GetNumFrames - gets the number of frames in a given track
@@ -258,7 +258,7 @@ Last-Update: 2015-07-13
```c++
int FFMS_GetNumFrames(FFMS_Track *T);
```
-@@ -620,7 +620,7 @@ A return value of 0 indicates the track
+@@ -615,7 +615,7 @@
### FFMS_GetFrameInfo - gets information about a given frame
@@ -267,7 +267,7 @@ Last-Update: 2015-07-13
```c++
const FFMS_FrameInfo *FFMS_GetFrameInfo(FFMS_Track *T, int Frame);
```
-@@ -646,7 +646,7 @@ Returns `NULL` and sets `ErrorMsg` on fa
+@@ -641,7 +641,7 @@
### FFMS_GetTrackFromIndex - retrieves track info from an index
@@ -276,7 +276,7 @@ Last-Update: 2015-07-13
```c+++
FFMS_Track *FFMS_GetTrackFromIndex(FFMS_Index *Index, int Track);
```
-@@ -673,8 +673,8 @@ Note that requesting indexing informatio
+@@ -668,8 +668,8 @@
### FFMS_GetTrackFromVideo, FFMS_GetTrackFromAudio - retrieves track info from audio or video source
@@ -287,7 +287,7 @@ Last-Update: 2015-07-13
```c++
FFMS_Track *FFMS_GetTrackFromVideo(FFMS_VideoSource *V);
FFMS_Track *FFMS_GetTrackFromAudio(FFMS_AudioSource *A);
-@@ -685,7 +685,7 @@ Note that the returned `FFMS_Track` obje
+@@ -680,7 +680,7 @@
### FFMS_GetTimeBase - retrieves the time base for the given track
@@ -296,7 +296,7 @@ Last-Update: 2015-07-13
```c++
const FFMS_TrackTimeBase *FFMS_GetTimeBase(FFMS_Track *T);
```
-@@ -694,7 +694,7 @@ Note that it is only meaningful for vide
+@@ -689,7 +689,7 @@
### FFMS_WriteTimecodes - writes timecodes for the given track to disk
@@ -305,7 +305,7 @@ Last-Update: 2015-07-13
```c++
int FFMS_WriteTimecodes(FFMS_Track *T, const char *TimecodeFile, FFMS_ErrorInfo *ErrorInfo);
```
-@@ -720,14 +720,14 @@ Returns non-0 and sets `ErrorMsg` on fai
+@@ -715,14 +715,14 @@
### FFMS_DefaultAudioFilename - default callback for audio filename generation
@@ -322,7 +322,7 @@ Last-Update: 2015-07-13
```c++
FFMS_Indexer *FFMS_CreateIndexer(const char *SourceFile, FFMS_ErrorInfo *ErrorInfo);
```
-@@ -741,7 +741,7 @@ Returns `NULL` and sets `ErrorMsg` on fa
+@@ -736,7 +736,7 @@
### FFMS_CreateIndexerWithDemuxer - creates an indexer object for the given file, using the given source module
@@ -331,7 +331,7 @@ Last-Update: 2015-07-13
```c++
FFMS_Indexer *FFMS_CreateIndexerWithDemuxer(const char *SourceFile, int Demuxer, FFMS_ErrorInfo *ErrorInfo);
```
-@@ -758,7 +758,7 @@ Returns `NULL` and sets `ErrorMsg` on fa
+@@ -753,7 +753,7 @@
### FFMS_DoIndexing2 - indexes the file represented by an indexer object
@@ -340,7 +340,7 @@ Last-Update: 2015-07-13
```c++
FFMS_Index *FFMS_DoIndexing2(FFMS_Indexer *Indexer, int ErrorHandling, FFMS_ErrorInfo *ErrorInfo);
```
-@@ -788,7 +788,7 @@ Returns `NULL` and sets `ErrorMsg` on fa
+@@ -783,7 +783,7 @@
### FFMS_TrackIndexSettings - enable or disable indexing of a track
@@ -349,7 +349,7 @@ Last-Update: 2015-07-13
```c++
void FFMS_TrackIndexSettings(FFMS_Indexer *Indexer, int Track, int Index, int Dump);
```
-@@ -816,7 +816,7 @@ By default, no tracks are dumped.
+@@ -811,7 +811,7 @@
### FFMS_TrackTypeIndexSettings - enable or disable indexing of a tracks of a given type
@@ -358,7 +358,7 @@ Last-Update: 2015-07-13
```c++
void FFMS_TrackTypeIndexSettings(FFMS_Indexer *Indexer, int TrackType, int Index, int Dump);
```
-@@ -825,7 +825,7 @@ Like [FFMS_TrackIndexSettings][TrackInde
+@@ -820,7 +820,7 @@
### FFMS_SetAudioNameCallback - choose the filename for audio track dumping
@@ -367,7 +367,7 @@ Last-Update: 2015-07-13
```c++
void FFMS_SetAudioNameCallback(FFMS_Indexer *Indexer, TAudioNameCallback ANC, void *ANCPrivate);
```
-@@ -859,7 +859,7 @@ Most of the parameters may seem pointles
+@@ -854,7 +854,7 @@
### FFMS_SetProgressCallback - set callback function for indexing progress updates
@@ -376,7 +376,7 @@ Last-Update: 2015-07-13
```c++
void FFMS_SetProgressCallback(FFMS_Indexer *Indexer, TIndexCallback IC, void *ICPrivate);
```
-@@ -879,7 +879,7 @@ Return 0 from the callback function to c
+@@ -874,7 +874,7 @@
### FFMS_CancelIndexing - destroys the given indexer object
@@ -385,7 +385,7 @@ Last-Update: 2015-07-13
```c++
void FFMS_CancelIndexing(FFMS_Indexer *Indexer);
```
-@@ -887,7 +887,7 @@ Destroys the given `FFMS_Indexer` object
+@@ -882,7 +882,7 @@
### FFMS_ReadIndex - reads an index file from disk
@@ -394,7 +394,7 @@ Last-Update: 2015-07-13
```c++
FFMS_Index *FFMS_ReadIndex(const char *IndexFile, FFMS_ErrorInfo *ErrorInfo);
```
-@@ -896,7 +896,7 @@ Returns the `FFMS_Index` on success; ret
+@@ -901,7 +901,7 @@
### FFMS_IndexBelongsToFile - check if a given index belongs to a given file
@@ -403,7 +403,7 @@ Last-Update: 2015-07-13
```c++
int FFMS_IndexBelongsToFile(FFMS_Index *Index, const char *SourceFile, FFMS_ErrorInfo *ErrorInfo);
```
-@@ -917,7 +917,7 @@ Returns non-0 and sets `ErrorMsg` otherw
+@@ -922,7 +922,7 @@
### FFMS_WriteIndex - writes an index object to disk
@@ -412,7 +412,7 @@ Last-Update: 2015-07-13
```c++
int FFMS_WriteIndex(const char *IndexFile, FFMS_Index *TrackIndices, FFMS_ErrorInfo *ErrorInfo);
```
-@@ -926,7 +926,7 @@ Returns 0 on success; returns non-0 and
+@@ -950,7 +950,7 @@
### FFMS_GetPixFmt - gets a colorspace identifier from a colorspace name
@@ -421,7 +421,7 @@ Last-Update: 2015-07-13
```c++
int FFMS_GetPixFmt(const char *Name);
```
-@@ -948,7 +948,7 @@ Returns the integer constant representin
+@@ -972,7 +972,7 @@
### FFMS_GetPresentSources - checks what source modules the library was compiled with
@@ -430,7 +430,7 @@ Last-Update: 2015-07-13
```c++
int FFMS_GetPresentSources();
```
-@@ -956,7 +956,7 @@ Checks which source modules the library
+@@ -980,7 +980,7 @@
### FFMS_GetEnabledSources - checks what source modules are actually available for use
@@ -439,7 +439,7 @@ Last-Update: 2015-07-13
```c++
int FFMS_GetEnabledSources();
```
-@@ -964,7 +964,7 @@ Does the same thing as [FFMS_GetPresentS
+@@ -988,7 +988,7 @@
### FFMS_GetVersion - returns FFMS_VERSION constant
@@ -448,7 +448,7 @@ Last-Update: 2015-07-13
```c++
int FFMS_GetVersion();
```
-@@ -972,7 +972,7 @@ Returns the FFMS_VERSION constant as def
+@@ -996,7 +996,7 @@
### FFMS_MakeIndex - indexes a given source file [DEPRECATED]
@@ -457,7 +457,7 @@ Last-Update: 2015-07-13
```c++
FFMS_Index *FFMS_MakeIndex(const char *SourceFile, int IndexMask, int DumpMask,
TAudioNameCallback ANC, void *ANCPrivate, int ErrorHandling,
-@@ -1071,7 +1071,7 @@ Returns `NULL` and sets `ErrorMsg` on fa
+@@ -1095,7 +1095,7 @@
### FFMS_DoIndexing - indexes the file represented by an indexer object [DEPRECATED]
--
ffms2 packaging
More information about the pkg-multimedia-commits
mailing list