/[debian-med]/trunk/packages/vxl/trunk/debian/patches/libav_trunk.patch
ViewVC logotype

Contents of /trunk/packages/vxl/trunk/debian/patches/libav_trunk.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 13589 - (show annotations) (download)
Wed May 15 15:02:09 2013 UTC (18 months, 2 weeks ago) by malat
File size: 3260 byte(s)
Fix typo in patch
1 Description: FTBFS with libav 0.9 (Debian experimental and Ubuntu raring)
2 Author: Fabrice Coutadeur <fabricesp@ubuntu.com>
3 Bug-Debian: http://bugs.debian.org/693543
4 Forwarded: no
5
6 Index: vxl-1.17.0/core/vidl/vidl_ffmpeg_ostream_v4.txx
7 ===================================================================
8 --- vxl-1.17.0.orig/core/vidl/vidl_ffmpeg_ostream_v4.txx 2013-05-15 16:57:56.171429064 +0200
9 +++ vxl-1.17.0/core/vidl/vidl_ffmpeg_ostream_v4.txx 2013-05-15 16:58:36.183428612 +0200
10 @@ -25,11 +25,21 @@
11 extern "C" {
12 #if FFMPEG_IN_SEVERAL_DIRECTORIES
13 #include <libavformat/avformat.h>
14 +#include <libavutil/mem.h>
15 #else
16 #include <ffmpeg/avformat.h>
17 #endif
18 }
19
20 +// Define deprecated codec flags as private
21 +#define CODEC_FLAG_H263P_UMV 0x02000000 ///< unlimited motion vector
22 +#define CODEC_FLAG_H263P_SLICE_STRUCT 0x10000000
23 +#define CODEC_FLAG_H263P_AIV 0x00000008 ///< H.263 alternative inter VLC
24 +#define CODEC_FLAG_OBMC 0x00000001 ///< OBMC
25 +#define CODEC_FLAG_PART 0x0080 ///< Use data partitioning.
26 +#define CODEC_FLAG_ALT_SCAN 0x00100000 ///< Use alternate scan.
27 +#define CODEC_FLAG_SVCD_SCAN_OFFSET 0x40000000 ///< Will reserve space for SVCD scan offset user data.
28 +
29 //-----------------------------------------------------------------------------
30
31
32 @@ -117,7 +127,7 @@
33 os_->fmt_cxt_->nb_streams = 0;
34
35 // Create stream
36 - AVStream* st = av_new_stream( os_->fmt_cxt_, 0 );
37 + AVStream* st = avformat_new_stream( os_->fmt_cxt_, 0 );
38 if ( !st ) {
39 vcl_cerr << "ffmpeg: could not alloc stream\n";
40 close();
41 @@ -229,7 +239,7 @@
42 if (params_.video_qscale_ || params_.same_quality_)
43 {
44 video_enc->flags |= CODEC_FLAG_QSCALE;
45 - st->quality = FF_QP2LAMBDA * params_.video_qscale_;
46 + video_enc->global_quality = FF_QP2LAMBDA * params_.video_qscale_;
47 }
48 // if (bitexact)
49 // video_enc->flags |= CODEC_FLAG_BITEXACT;
50 @@ -377,7 +387,7 @@
51
52 vcl_strncpy( os_->fmt_cxt_->filename, filename_.c_str(), 1023 );
53
54 - if ( avio_open( &os_->fmt_cxt_->pb, filename_.c_str(), URL_WRONLY) < 0 )
55 + if ( avio_open( &os_->fmt_cxt_->pb, filename_.c_str(), AVIO_FLAG_WRITE) < 0 )
56 {
57 vcl_cerr << "ffmpeg: couldn't open " << filename_ << " for writing\n";
58 close();
59 @@ -387,7 +397,7 @@
60
61 //dump_format( os_->fmt_cxt_, 1, filename_, 1 );
62
63 - if ( avcodec_open( video_enc, codec ) < 0 )
64 + if ( avcodec_open2( video_enc, codec, NULL ) < 0 )
65 {
66 vcl_cerr << "ffmpeg: couldn't open codec\n";
67 close();
68 Index: vxl-1.17.0/core/vidl/vidl_ffmpeg_istream_v3.txx
69 ===================================================================
70 --- vxl-1.17.0.orig/core/vidl/vidl_ffmpeg_istream_v3.txx 2013-05-15 16:57:56.195429062 +0200
71 +++ vxl-1.17.0/core/vidl/vidl_ffmpeg_istream_v3.txx 2013-05-15 16:58:36.183428612 +0200
72 @@ -143,7 +143,7 @@
73 }
74
75 // Get the stream information by reading a bit of the file
76 - if ( av_find_stream_info( is_->fmt_cxt_ ) < 0 ) {
77 + if ( avformat_find_stream_info( is_->fmt_cxt_, NULL ) < 0 ) {
78 return false;
79 }
80
81 @@ -165,7 +165,7 @@
82
83 // Open the stream
84 AVCodec* codec = avcodec_find_decoder(enc->codec_id);
85 - if ( !codec || avcodec_open( enc, codec ) < 0 ) {
86 + if ( !codec || avcodec_open2( enc, codec, NULL ) < 0 ) {
87 return false;
88 }
89

  ViewVC Help
Powered by ViewVC 1.1.5