[SCM] transcode/master: Refresh 03_libav-api-fixes.diff.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 874bed21d73fff66a86e186ae27d90e8ea1d65e4
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Feb 21 12:12:16 2012 +0100

    Refresh 03_libav-api-fixes.diff.

diff --git a/debian/patches/03_libav-api-fixes.diff b/debian/patches/03_libav-api-fixes.diff
index c8675d6..3198abb 100644
--- a/debian/patches/03_libav-api-fixes.diff
+++ b/debian/patches/03_libav-api-fixes.diff
@@ -3,25 +3,10 @@ Description: Update to libav 0.7 API
 Last-Modified: 2012-02-12
 Forwarded: Francesco Romani <fromani at gmail.com>
 ---
- export/export_ffmpeg.c |    2 ++
- filter/filter_pp.c     |    4 ++--
- import/decode_lavc.c   |   13 +++++++++----
- import/probe_ffmpeg.c  |    4 ++--
- 4 files changed, 15 insertions(+), 8 deletions(-)
+ filter/filter_pp.c   |    4 ++--
+ import/decode_lavc.c |    4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
 
---- transcode.orig/export/export_ffmpeg.c
-+++ transcode/export/export_ffmpeg.c
-@@ -643,8 +643,10 @@ MOD_init
- 
-     lavc_venc_context->bit_rate           = vob->divxbitrate * 1000;
-     lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000;
-+#ifdef FF_API_MB_Q
-     lavc_venc_context->mb_qmin            = lavc_param_mb_qmin;
-     lavc_venc_context->mb_qmax            = lavc_param_mb_qmax;
-+#endif
-     lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5);
-     lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5);
-     lavc_venc_context->max_qdiff          = lavc_param_vqdiff;
 --- transcode.orig/filter/filter_pp.c
 +++ transcode/filter/filter_pp.c
 @@ -38,8 +38,8 @@
@@ -55,39 +40,3 @@ Forwarded: Francesco Romani <fromani at gmail.com>
        tc_log_error(__FILE__, "Could not initialize the '%s' codec.",
  		   codec->name);
        goto decoder_error;
-@@ -261,8 +261,13 @@ void decode_lavc(decode_t *decode)
- 
-       //tc_log_msg(__FILE__, "SIZE: (%d) MP4(%d) blen(%d) BUF(%d) read(%ld)", len, mp4_size, buf_len, READ_BUFFER_SIZE, bytes_read);
-       do {
--	  len = avcodec_decode_video(lavc_dec_context, &picture,
--		  &got_picture, buffer+buf_len, mp4_size-buf_len);
-+          AVPacket avpkt;
-+          av_init_packet(&avpkt);
-+          avpkt.data = (uint8_t*) buffer+buf_len;
-+          avpkt.size = mp4_size-buf_len;
-+
-+	  len = avcodec_decode_video2(lavc_dec_context, &picture,
-+		  &got_picture, &avpkt);
- 
- 	  if (len < 0) {
- 	      tc_log_error(__FILE__, "frame decoding failed");
---- transcode.orig/import/probe_ffmpeg.c
-+++ transcode/import/probe_ffmpeg.c
-@@ -47,7 +47,7 @@ static void translate_info(const AVForma
-     for (i = 0; i < ctx->nb_streams; i++) {
-         st = ctx->streams[i];
- 
--        if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
-+        if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
-             info->bitrate = st->codec->bit_rate / 1000;
-             info->width = st->codec->width;
-             info->height = st->codec->height;
-@@ -65,7 +65,7 @@ static void translate_info(const AVForma
-     for (i = 0; i < ctx->nb_streams; i++) {
-         st = ctx->streams[i];
- 
--        if (st->codec->codec_type == CODEC_TYPE_AUDIO
-+        if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO
-          && j < TC_MAX_AUD_TRACKS) {
-             info->track[j].format = 0x1; /* known wrong */
-             info->track[j].chan = st->codec->channels;

-- 
transcode packaging