← Back to branch summary

~ubuntu-branches/ubuntu/raring/libav/raring-security

« back to all changes in this revision

Viewing changes to debian/patches/post-0.7.1/0009-mxfenc-fix-ignored-drop-flag-in-binary-timecode-repr.patch

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2011-09-28 09:18:34 UTC
  • mfrom: (1.3.7 sid)
  • Revision ID: package-import@ubuntu.com-20110928091834-w415mnuh06h4zpvc
Tags: 4:0.7.1-7ubuntu2
Revert "Convert package to include multiarch support."

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/post-0.7.1/0009-mxfenc-fix-ignored-drop-flag-in-binary-timecode-repr.patch
 
1
From 776603b650485f4f2d45f383b772ac5a4f03ebfb Mon Sep 17 00:00:00 2001
 
2
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <clement.boesch@smartjog.com>
 
3
Date: Mon, 4 Jul 2011 10:19:46 +0200
 
4
Subject: [PATCH 09/70] mxfenc: fix ignored drop flag in binary timecode representation.
 
5
 
 
6
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 
7
(cherry picked from commit 4d5e7ab5c48451404038706ef3113c9925a83087)
 
8
 
 
9
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 
10
---
 
11
 libavformat/mxfenc.c |    2 +-
 
12
 1 files changed, 1 insertions(+), 1 deletions(-)
 
13
 
 
14
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
 
15
index c448e14..387263e 100644
 
16
--- a/libavformat/mxfenc.c
 
17
+++ b/libavformat/mxfenc.c
 
18
@@ -1539,7 +1539,7 @@ static const uint8_t system_metadata_package_set_key[] = { 0x06,0x0E,0x2B,0x34,0
 
19
 static uint32_t ff_framenum_to_12m_time_code(unsigned frame, int drop, int fps)
 
20
 {
 
21
     return (0                                    << 31) | // color frame flag
 
22
-           (0                                    << 30) | // drop  frame flag
 
23
+           (drop                                 << 30) | // drop  frame flag
 
24
            ( ((frame % fps) / 10)                << 28) | // tens  of frames
 
25
            ( ((frame % fps) % 10)                << 24) | // units of frames
 
26
            (0                                    << 23) | // field phase (NTSC), b0 (PAL)
 
27
-- 
 
28
1.7.4.1
 
29