← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/xvidcap/jaunty-proposed

« back to all changes in this revision

Viewing changes to ffmpeg/libavformat/framehook.c

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc, Andrew Starr-Bochicchio, Lionel Le Folgoc
  • Date: 2008-12-26 00:10:06 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20081226001006-2040ls9680bd1blt
Tags: 1.1.7-0.2ubuntu1
https://launchpad.net/bugs/298547
https://launchpad.net/bugs/311412
[ Andrew Starr-Bochicchio ]
* Merge from debian-multimedia (LP: #298547), Ubuntu Changes:
 - For ffmpeg-related build-deps, fix versionized dependencies
   as the ubuntu versioning is different than debian-multimedia's.

[ Lionel Le Folgoc ]
* LP: #311412 is fixed since the 1.1.7~rc1-0.1 revision.
* debian/patches/03_ffmpeg.diff: updated to fix FTBFS due to libswscale API
  change (cherry-pick from Gentoo #234383).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffmpeg/libavformat/framehook.c
28
28
#endif
29
29
 
30
30
 
31
 
typedef struct _FrameHookEntry {
32
 
    struct _FrameHookEntry *next;
 
31
typedef struct FrameHookEntry {
 
32
    struct FrameHookEntry *next;
33
33
    FrameHookConfigureFn Configure;
34
34
    FrameHookProcessFn Process;
35
35
    FrameHookReleaseFn Release;
93
93
#endif
94
94
}
95
95
 
96
 
void frame_hook_process(AVPicture *pict, enum PixelFormat pix_fmt, int width, int height)
 
96
void frame_hook_process(AVPicture *pict, enum PixelFormat pix_fmt, int width, int height, int64_t pts)
97
97
{
98
98
    if (first_hook) {
99
99
        FrameHookEntry *fhe;
100
 
        int64_t pts = av_gettime();
101
100
 
102
101
        for (fhe = first_hook; fhe; fhe = fhe->next) {
103
102
            fhe->Process(fhe->ctx, pict, pix_fmt, width, height, pts);