Author: malat Date: 2012-05-05 14:26:12 +0000 (Sat, 05 May 2012) New Revision: 10708
Removed: trunk/packages/vxl/trunk/debian/patches/fix_libav07.patch Log: remove old patch Deleted: trunk/packages/vxl/trunk/debian/patches/fix_libav07.patch =================================================================== --- trunk/packages/vxl/trunk/debian/patches/fix_libav07.patch 2012-05-05 14:25:23 UTC (rev 10707) +++ trunk/packages/vxl/trunk/debian/patches/fix_libav07.patch 2012-05-05 14:26:12 UTC (rev 10708) @@ -1,127 +0,0 @@ -Description: debian transition to libav from ffmpeg -Author: Mathieu Malaterre <[email protected]> -Last-Update: 2011-07-24 - -Index: vxl-1.14.0/core/vidl/vidl_ffmpeg_istream_v2.txx -=================================================================== ---- vxl-1.14.0.orig/core/vidl/vidl_ffmpeg_istream_v2.txx 2009-07-07 23:13:03.000000000 +0200 -+++ vxl-1.14.0/core/vidl/vidl_ffmpeg_istream_v2.txx 2011-10-13 18:02:59.000000000 +0200 -@@ -145,7 +145,7 @@ - is_->vid_index_ = -1; - for ( unsigned i = 0; i < is_->fmt_cxt_->nb_streams; ++i ) { - AVCodecContext *enc = is_->fmt_cxt_->streams[i]->codec; -- if ( enc->codec_type == CODEC_TYPE_VIDEO ) { -+ if ( enc->codec_type == AVMEDIA_TYPE_VIDEO ) { - is_->vid_index_ = i; - break; - } -@@ -376,6 +376,9 @@ - AVPacket pkt; - int got_picture = 0; - -+ AVPacket avpkt; -+ av_init_packet(&avpkt); -+ - while ( got_picture == 0 ) { - if ( av_read_frame( is_->fmt_cxt_, &pkt ) < 0 ) { - break; -@@ -385,9 +388,12 @@ - // Make sure that the packet is from the actual video stream. - if (pkt.stream_index==is_->vid_index_) - { -- if ( avcodec_decode_video( codec, -+ avpkt.data = pkt.data; -+ avpkt.size = pkt.size; -+ avpkt.flags = AV_PKT_FLAG_KEY; -+ if ( avcodec_decode_video2( codec, - is_->frame_, &got_picture, -- pkt.data, pkt.size ) < 0 ) { -+ &avpkt ) < 0 ) { - vcl_cerr << "vidl_ffmpeg_istream: Error decoding packet!\n"; - return false; - } -@@ -399,9 +405,11 @@ - // I and P frame with a latency of one frame. You must do the - // following to have a chance to get the last frame of the video. - if ( !got_picture ) { -- if ( avcodec_decode_video( codec, -+ avpkt.data = NULL; -+ avpkt.size = 0; -+ if ( avcodec_decode_video2( codec, - is_->frame_, &got_picture, -- NULL, 0 ) >= 0 ) { -+ &avpkt ) >= 0 ) { - is_->last_dts += int64_t(is_->vid_str_->time_base.den) * is_->vid_str_->r_frame_rate.den - / is_->vid_str_->time_base.num / is_->vid_str_->r_frame_rate.num; - } -Index: vxl-1.14.0/core/vidl/vidl_ffmpeg_ostream_v3.txx -=================================================================== ---- vxl-1.14.0.orig/core/vidl/vidl_ffmpeg_ostream_v3.txx 2009-05-17 21:02:39.000000000 +0200 -+++ vxl-1.14.0/core/vidl/vidl_ffmpeg_ostream_v3.txx 2011-10-13 18:50:50.000000000 +0200 -@@ -31,6 +31,15 @@ - - //----------------------------------------------------------------------------- - -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 30, 2) -+#define AV_PKT_FLAG_KEY PKT_FLAG_KEY -+#endif -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 64, 0) -+#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO -+#endif -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 45, 0) -+#define av_guess_format(...) guess_format(__VA_ARGS__) -+#endif - - struct vidl_ffmpeg_ostream::pimpl - { -@@ -100,7 +109,7 @@ - - AVOutputFormat* file_oformat = 0; - if ( params_.file_format_ == vidl_ffmpeg_ostream_params::GUESS ) { -- file_oformat = guess_format(NULL, filename_.c_str(), NULL); -+ file_oformat = av_guess_format(NULL, filename_.c_str(), NULL); - if (!file_oformat) { - vcl_cerr << "ffmpeg: Unable for find a suitable output format for " - << filename_ << '\n'; -@@ -132,7 +141,7 @@ - vcl_strcmp(file_oformat->name, "3gp") != 0 ) - video_enc->flags |= CODEC_FLAG_GLOBAL_HEADER; - -- video_enc->codec_type = CODEC_TYPE_VIDEO; -+ video_enc->codec_type = AVMEDIA_TYPE_VIDEO; - - switch ( params_.encoder_ ) - { -@@ -318,8 +327,8 @@ - video_enc->qmax = params_.video_qmax_; - video_enc->lmin = params_.video_lmin_; - video_enc->lmax = params_.video_lmax_; -- video_enc->mb_qmin = params_.video_mb_qmin_; -- video_enc->mb_qmax = params_.video_mb_qmax_; -+ //video_enc->mb_qmin = params_.video_mb_qmin_; -+ //video_enc->mb_qmax = params_.video_mb_qmax_; - video_enc->max_qdiff = params_.video_qdiff_; - video_enc->qblur = params_.video_qblur_; - video_enc->qcompress = params_.video_qcomp_; -@@ -377,10 +386,12 @@ - } - - os_->fmt_cxt_->timestamp = 0; -+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 31, 0) - os_->fmt_cxt_->title[0] = '\0'; - os_->fmt_cxt_->author[0] = '\0'; - os_->fmt_cxt_->copyright[0] = '\0'; - os_->fmt_cxt_->comment[0] = '\0'; -+#endif - - vcl_strncpy( os_->fmt_cxt_->filename, filename_.c_str(), 1023 ); - -@@ -542,7 +553,7 @@ - pkt.pts = codec->coded_frame->pts; - } - if ( codec->coded_frame && codec->coded_frame->key_frame ) { -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - } - av_interleaved_write_frame( os_->fmt_cxt_, &pkt ); - } _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
