Processing of mplayer-blue_1.11-1_source.changes

2015-11-02 Thread Debian FTP Masters
mplayer-blue_1.11-1_source.changes uploaded successfully to localhost
along with the files:
  mplayer-blue_1.11-1.dsc
  mplayer-blue_1.11.orig.tar.bz2
  mplayer-blue_1.11-1.debian.tar.xz

Greetings,

Your Debian queue daemon (running on host franck.debian.org)

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers


Processing of mplayer_1.2-1_source.changes

2015-11-02 Thread Debian FTP Masters
mplayer_1.2-1_source.changes uploaded successfully to localhost
along with the files:
  mplayer_1.2-1.dsc
  mplayer_1.2.orig.tar.xz
  mplayer_1.2-1.debian.tar.xz

Greetings,

Your Debian queue daemon (running on host franck.debian.org)

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers


inkscape 0.91-6 MIGRATED to testing

2015-11-02 Thread Debian testing watch
FYI: The status of the inkscape source package
in Debian's testing distribution has changed.

  Previous version: 0.91-5
  Current version:  0.91-6

-- 
This email is automatically generated once a day.  As the installation of
new packages into testing happens multiple times a day you will receive
later changes on the next day.
See https://release.debian.org/testing-watch/ for more information.

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers


Re: upcoming ffmpeg transition

2015-11-02 Thread Felipe Sateler
On 2 November 2015 at 14:40, Andreas Cadhalpun
 wrote:
> On 02.11.2015 00:57, Felipe Sateler wrote:
>> On 1 November 2015 at 19:51, Andreas Cadhalpun
>>  wrote:
>>>
>>> building:   30
>>> simple changes: 61
>>> complex changes:21
>>> --
>>> total: 112
>>
>> How did you come up with those numbers? Did you actually make a patch for 
>> each??
>
> Yes, of course. That's the only way to get accurate numbers. ;)

Excellent. That makes the transition much smoother.

>
>>> I'll file bug reports for the affected packages with:
>>> User: pkg-multimedia-maintainers@lists.alioth.debian.org
>>> Usertags: ffmpeg2.9
>>
>> Do the required changes work already? IOW, if a patch is applied can
>> it build with ffmpeg 2.8?
>
> Yes, the only exception is, as always, taoframework with its hardcoded 
> SONAMEs.

Ugh. Feel free to ping me for NMUs if packages are not updated in time
for the transition.


-- 

Saludos,
Felipe Sateler

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers


Re: upcoming ffmpeg transition

2015-11-02 Thread Andreas Cadhalpun
On 02.11.2015 00:57, Felipe Sateler wrote:
> On 1 November 2015 at 19:51, Andreas Cadhalpun
>  wrote:
>>
>> building:   30
>> simple changes: 61
>> complex changes:21
>> --
>> total: 112
> 
> How did you come up with those numbers? Did you actually make a patch for 
> each??

Yes, of course. That's the only way to get accurate numbers. ;)

>> I'll file bug reports for the affected packages with:
>> User: pkg-multimedia-maintainers@lists.alioth.debian.org
>> Usertags: ffmpeg2.9
> 
> Do the required changes work already? IOW, if a patch is applied can
> it build with ffmpeg 2.8?

Yes, the only exception is, as always, taoframework with its hardcoded SONAMEs.

>> Additionally, there are five unrelated FTBFS bugs among the affected 
>> packages:
>> bino:  #802374
>> gazebo:#797809
>> mrpt:  #803700
>> ovito: #803701
>> pjproject: #793094
>>
>> It would be good if most of this was fixed, when the next ffmpeg
>> version gets released.
> 
> I'd use severity: important. When the release gets done, then the
> severity is bumped to serious.

I'll do it that way.

Best regards,
Andreas


___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers


harvid_0.8.0-3_amd64.changes ACCEPTED into unstable

2015-11-02 Thread Debian FTP Masters


Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Format: 1.8
Date: Tue, 03 Nov 2015 08:21:08 +0100
Source: harvid
Binary: harvid
Architecture: source amd64
Version: 0.8.0-3
Distribution: unstable
Urgency: medium
Maintainer: Debian Multimedia Maintainers 

Changed-By: Jaromír Mikeš 
Description:
 harvid - HTTP Ardour Video Server
Closes: 803824
Changes:
 harvid (0.8.0-3) unstable; urgency=medium
 .
   * Add ffmpeg_2.9.patch (Closes: #803824)
   * Remove libav patch.
   * Build parallel.
   * Add gitigonere file.
   * Add local-options file.
   * Fix more spelling errors.
   * Update copyright file.
Checksums-Sha1:
 c9b21b478f883f726057474fc933ad1a136d9890 2108 harvid_0.8.0-3.dsc
 7c563c9a3e7270329b548c6697c9e4be911e9817 6332 harvid_0.8.0-3.debian.tar.xz
 5766b6eab9440da65b4252dc26f5b8c037536a71 77798 harvid_0.8.0-3_amd64.deb
Checksums-Sha256:
 7fd230c4b59439d6ac7bf69a3458771e3f04996645bf9d8f62a8174023e356c2 2108 
harvid_0.8.0-3.dsc
 ed6ded46cf74596d07ba4b4750b4460036180b7569b29be749636ba22617b2db 6332 
harvid_0.8.0-3.debian.tar.xz
 d9531b9cfe53a40d0ad2a35db48e201aa794dea6a3bcc37063f5f1b1b0a84293 77798 
harvid_0.8.0-3_amd64.deb
Files:
 0af9e98a5057314cdcae51856742027d 2108 video optional harvid_0.8.0-3.dsc
 00a40541eea35fbb01e6d349878786ba 6332 video optional 
harvid_0.8.0-3.debian.tar.xz
 24cf6b172755742e8502d82a011a6e06 77798 video optional harvid_0.8.0-3_amd64.deb

-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAEBAgAGBQJWOGEvAAoJEFsBlFXiuE+l4X8P+wYjLhsXNtpzAEWMidHLt243
zsDTzhFDspFBuVf9QIU2zqltzxPNCnhCGwjbM9OUaMCGUqnI8cVdLNEQaqS+HK+F
lS1pDzr0UAgjpReRxpvCB77NwpOyqi9joQtJ+Qc32oQnYE+X2dk8K+GbHSPqQuQd
GEtlIhXt11mbre9MtuD4Gtv0wOMQS6AZYMOvb3g39bVVQN7J9n9CYDP3c/z1G+hM
sGOaITEKX4k1+DITXtQtHfARm0iDfpRszCU93rNMEmKXaMczR3WjC9N+pJOO6eQg
K4m51775mcvdjLykYyXfduBMD5+V98A77IzopR3J3aJJAmh4Q2zXRSaRSKxd00Yk
WUrqZp28C+UPAZZuSrhkCdtcoujB5ojEhyQ6znVo8qhlREKN/7bidmYYlnOy+QAH
QxAiTNVNSPu1Bkj1f/BRLWZ3FFo9JSMUYCjPWynLnlp+AcXtfxKOllVIrYofoilZ
oXGqrizAriFE/SZQqXj9T1vmoiSx78z3m8twbzJHi+85arwt1GJpLOhBv0s3DZag
T099mO/CzgIOevLzKyqC4mmaKnz7652b/RSMcOkrqEBQKVKTP2NFCovHQsFUp/+5
BufAjuabyvTkunyrTc+8l9tv9K2XdlyYNkPpQY/M2S5jAzmm9tzMHU5RWlCEoztI
+lo4n58bZ0tXThctUtuo
=Fp96
-END PGP SIGNATURE-


Thank you for your contribution to Debian.

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#803824: marked as done (harvid: FTBFS with FFmpeg 2.9)

2015-11-02 Thread Debian Bug Tracking System
Your message dated Tue, 03 Nov 2015 07:33:44 +
with message-id 
and subject line Bug#803824: fixed in harvid 0.8.0-3
has caused the Debian Bug report #803824,
regarding harvid: FTBFS with FFmpeg 2.9
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
803824: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803824
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: harvid
Version: 0.8.0-2
Severity: important
Tags: patch
User: pkg-multimedia-maintainers@lists.alioth.debian.org
Usertags: ffmpeg2.9

Dear Maintainer,

your package fails to build with the upcoming ffmpeg 2.9.
This bug will become release-critical at some point when the
ffmpeg2.9 transition gets closer.

Attached is a patch replacing the deprecated functionality.
It also works with ffmpeg 2.8.
Please apply this patch and forward it upstream, if necessary.

These changes have little regression potential.

Best regards,
Andreas

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 000..04de003
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,299 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun 
+Last-Update: <2015-11-02>
+
+--- harvid-0.8.0.orig/libharvid/decoder_ctrl.c
 harvid-0.8.0/libharvid/decoder_ctrl.c
+@@ -29,7 +29,7 @@
+ #include "ffcompat.h"
+ #include "dlog.h"
+ 
+-#define DEFAULT_PIX_FMT (PIX_FMT_RGB24) // TODO global default
++#define DEFAULT_PIX_FMT (AV_PIX_FMT_RGB24) // TODO global default
+ 
+ //#define HASH_EMIT_KEYS 3
+ #define HASH_FUNCTION HASH_SAX
+@@ -104,15 +104,15 @@ static inline int my_open_movie(void **v
+   }
+   ff_create(vd);
+   assert (
+- render_fmt == PIX_FMT_YUV420P
+-  || render_fmt == PIX_FMT_YUV440P
+-  || render_fmt == PIX_FMT_YUYV422
+-  || render_fmt == PIX_FMT_UYVY422
+-  || render_fmt == PIX_FMT_RGB24
+-  || render_fmt == PIX_FMT_BGR24
+-  || render_fmt == PIX_FMT_RGBA
+-  || render_fmt == PIX_FMT_ARGB
+-  || render_fmt == PIX_FMT_BGRA
++ render_fmt == AV_PIX_FMT_YUV420P
++  || render_fmt == AV_PIX_FMT_YUV440P
++  || render_fmt == AV_PIX_FMT_YUYV422
++  || render_fmt == AV_PIX_FMT_UYVY422
++  || render_fmt == AV_PIX_FMT_RGB24
++  || render_fmt == AV_PIX_FMT_BGR24
++  || render_fmt == AV_PIX_FMT_RGBA
++  || render_fmt == AV_PIX_FMT_ARGB
++  || render_fmt == AV_PIX_FMT_BGRA
+   );
+ 
+   if (!ff_open_movie (*vd, fn, render_fmt)) {
+@@ -144,7 +144,7 @@ static inline void my_get_info_canonical
+ static JVOBJECT *newjvo (JVOBJECT *jvo, pthread_mutex_t *appendlock) {
+   debugmsg(DEBUG_DCTL, "DCTL: newjvo() allocated new decoder object\n");
+   JVOBJECT *n = calloc(1, sizeof(JVOBJECT));
+-  n->fmt = PIX_FMT_NONE;
++  n->fmt = AV_PIX_FMT_NONE;
+   n->frame = -1;
+   pthread_mutex_init(>lock, NULL);
+   JVOBJECT *cptr = jvo;
+@@ -175,8 +175,8 @@ static JVOBJECT *testjvd(JVOBJECT *jvo,
+ if (!(cptr->flags_VALID) || cptr->id != id) {
+   continue;
+ }
+-if (fmt != PIX_FMT_NONE && cptr->fmt != fmt
+-&& cptr->fmt != PIX_FMT_NONE
++if (fmt != AV_PIX_FMT_NONE && cptr->fmt != fmt
++&& cptr->fmt != AV_PIX_FMT_NONE
+ ) {
+   continue;
+ }
+@@ -324,7 +324,7 @@ static int clearjvo(JVD *jvd, int f, int
+   my_destroy(>decoder);
+   cptr->decoder = NULL;
+   cptr->flags &= ~VOF_OPEN;
+-  cptr->fmt = PIX_FMT_NONE;
++  cptr->fmt = AV_PIX_FMT_NONE;
+ }
+ 
+ hashref_delete_jvo(jvd, cptr);
+@@ -410,7 +410,7 @@ static JVOBJECT *getjvo(JVD *jvd) {
+ if (cptr->flags&(VOF_OPEN)) {
+   my_destroy(>decoder); // close it.
+   cptr->decoder = NULL; // not really need..
+-  cptr->fmt = PIX_FMT_NONE;
++  cptr->fmt = AV_PIX_FMT_NONE;
+ }
+ 
+ hashref_delete_jvo(jvd, cptr);
+@@ -563,7 +563,7 @@ static JVOBJECT *new_video_object(JVD *j
+ 
+ 
+   jvo->id = id;
+-  jvo->fmt = fmt == PIX_FMT_NONE ? DEFAULT_PIX_FMT : fmt;
++  jvo->fmt = fmt == AV_PIX_FMT_NONE ? DEFAULT_PIX_FMT : fmt;
+   jvo->frame = -1;
+   jvo->flags |= VOF_VALID;
+ 
+@@ -619,7 +619,7 @@ static void * dctrl_get_decoder(void *p,
+* use it IFF frame == -1  (ie. non-blocking info lookups) */
+   if (frame < 0) {
+ pthread_rwlock_rdlock(>lock_jdh);
+-if (fmt == PIX_FMT_NONE) {
++if (fmt == AV_PIX_FMT_NONE) {
+   HASH_FIND(hhi, jvd->jvi, , sizeof(unsigned short), jvo);
+ } else {
+   const JVOBJECT jvt = {id, fmt, 0};
+@@ -670,7 +670,7 @@ static 

Processing of harvid_0.8.0-3_amd64.changes

2015-11-02 Thread Debian FTP Masters
harvid_0.8.0-3_amd64.changes uploaded successfully to localhost
along with the files:
  harvid_0.8.0-3.dsc
  harvid_0.8.0-3.debian.tar.xz
  harvid_0.8.0-3_amd64.deb

Greetings,

Your Debian queue daemon (running on host franck.debian.org)

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers


Bug#796173: reportbug: Sound goes away after seeking in VLC

2015-11-02 Thread Manolo Díaz
On Monday, 2 Nov 2015 at 19:33 UTC
Rémi Denis-Courmont wrote:

> On Friday 30 October 2015 20:16:46 Manolo Díaz wrote:
> > VLC media player 2.2.1 Terry Pratchett (Weatherwax) (revision
> > 2.2.1-0-ga425c42) [006d0398] core libvlc: Running vlc with the
> > default interface. Use 'cvlc' to use vlc without interface.
> > [007cc5d8] alsa audio output error: cannot set buffer duration:
> > Invalid argument [007cc5d8] core audio output error: module not
> > functional
> > [7f2458c05288] core decoder error: failed to create audio output  
> 
> That looks like bug 801448, not bug 796173...
> 

Well, upgrading to 2.2.1-5 doesn't fix my problem, and the correct
audio device is set by default.

OTH it seems that failures depend on the audio codec. I think I will
open a new bug report.

-- 
Manolo Díaz

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#734100: Fixed in VLC 3.0

2015-11-02 Thread Rémi Denis-Courmont
On Monday 02 November 2015 00:34:47 Modestas Vainius wrote:
> The end result builds fine and seems to fix the problem on my machine. Not
> sure if patches break anything on 2.2.1 (i.e. if they need anything else
> from 3.0.0 to work properly). Rémi, maybe you could comment on that?

At least 557eaa06 and 5b2de769 are needed too. I can´t really check deeper in 
my free time.

-- 
Rémi Denis-Courmont
http://www.remlab.net/

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#796173: reportbug: Sound goes away after seeking in VLC

2015-11-02 Thread Rémi Denis-Courmont
On Friday 30 October 2015 20:16:46 Manolo Díaz wrote:
> VLC media player 2.2.1 Terry Pratchett (Weatherwax) (revision
> 2.2.1-0-ga425c42) [006d0398] core libvlc: Running vlc with the
> default interface. Use 'cvlc' to use vlc without interface.
> [007cc5d8] alsa audio output error: cannot set buffer duration:
> Invalid argument [007cc5d8] core audio output error: module not
> functional
> [7f2458c05288] core decoder error: failed to create audio output

That looks like bug 801448, not bug 796173...

-- 
Rémi Denis-Courmont
http://www.remlab.net/

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Processing of xjadeo_0.8.4-2_amd64.changes

2015-11-02 Thread Debian FTP Masters
xjadeo_0.8.4-2_amd64.changes uploaded successfully to localhost
along with the files:
  xjadeo_0.8.4-2.dsc
  xjadeo_0.8.4-2.debian.tar.xz
  xjadeo_0.8.4-2_amd64.deb

Greetings,

Your Debian queue daemon (running on host franck.debian.org)

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers


xjadeo_0.8.4-2_amd64.changes ACCEPTED into unstable

2015-11-02 Thread Debian FTP Masters


Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Format: 1.8
Date: Tue, 03 Nov 2015 06:39:02 +0100
Source: xjadeo
Binary: xjadeo
Architecture: source amd64
Version: 0.8.4-2
Distribution: unstable
Urgency: medium
Maintainer: Debian Multimedia Maintainers 

Changed-By: Jaromír Mikeš 
Description:
 xjadeo - Video player with JACK sync
Closes: 803875
Changes:
 xjadeo (0.8.4-2) unstable; urgency=medium
 .
   * Add ffmpeg_2.9.patch (Closes: #803875)
Checksums-Sha1:
 ca230ad03c95d7260e092757c87de0af894e347b 2249 xjadeo_0.8.4-2.dsc
 9a426fe190d9b91a71605cd8284d77a902285da6 8556 xjadeo_0.8.4-2.debian.tar.xz
 6402927ac3f22bc248927ba63c9e3ec374b24155 186250 xjadeo_0.8.4-2_amd64.deb
Checksums-Sha256:
 a6257769283678ef61a9a4d846be5cf8f82c86c32a238bb46357990cbe041ed1 2249 
xjadeo_0.8.4-2.dsc
 2492c43af9c2e4d74378581777ea95a4cca1035873b8923aa4943b7c46d86fdb 8556 
xjadeo_0.8.4-2.debian.tar.xz
 35c528550b5d583b30ff3408b3624df71ce2d122d5f360fc4d8d9bbda255beb9 186250 
xjadeo_0.8.4-2_amd64.deb
Files:
 26244e0ae280129cbb5553ef876766dc 2249 video optional xjadeo_0.8.4-2.dsc
 b954628bf076d56f72d0ff5eefe5db42 8556 video optional 
xjadeo_0.8.4-2.debian.tar.xz
 431dd40311db2fd559e8039c506edfa9 186250 video optional xjadeo_0.8.4-2_amd64.deb

-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAEBAgAGBQJWOEliAAoJEFsBlFXiuE+lu1sP/i8v5gOztOS6XfFhXdox2B0E
AjdL1E/MS+Czf91y7qLtsi6KekMgoLmWqC0sqRdX3L7It/HOHjag5KkzD2m+hGxL
PvpbZJUREA5ewCMzqg9RuBdb0Q7SJYGb0UgxLF4XvS596/SlO58UnUe6FYN3Jd/L
mwF5NCe9ax85mGRd4b4m9IMXqijouF+mgHYojX8loHb4KoYAubJnHRAlCEeAEVEt
g/GF+xtl2iTLx4PkajcMMa88gqaeiuKSiBz6amYTMh1DzfhHqBTHaYDH+acfHjds
M9miLsT27+mL8/cKaqz5ITHpPpsYogreyUVXVDOQCNaYZvzNR7S91Q33+3Jgvk4L
0So1IEHxfWgpEghPbvbUMKdf77s+UIK72UZPzIuFaWgjxerQcvuARayGcYzJDK34
ZHjAzibEDUNNYMc3SCwJcZl3jZIr+b7gltZBcQDqGQPepMoEw7YPNjhmp4yBq7W5
7fVDZCRtlwNGj6BqlMBpGhruBC2F5leWmAW2L0E+NS17tHy6RitVOgD/ainmJMxY
xfsLm5bHqjbX8LUTd7SFFwCDM+CaovZ0LldyzlZSnpMfMgcnE2c+dRQxldSk5Zro
aswpHmzomDLQ9QkapBYSynWUekXg66IfjW85q1Fb56pnENGVamWXM79jDcA2ncrY
AGvDVM64l5FZ8519eMsY
=573O
-END PGP SIGNATURE-


Thank you for your contribution to Debian.

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#803875: marked as done (xjadeo: FTBFS with FFmpeg 2.9)

2015-11-02 Thread Debian Bug Tracking System
Your message dated Tue, 03 Nov 2015 05:49:54 +
with message-id 
and subject line Bug#803875: fixed in xjadeo 0.8.4-2
has caused the Debian Bug report #803875,
regarding xjadeo: FTBFS with FFmpeg 2.9
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
803875: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803875
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: xjadeo
Version: 0.8.4-1
Severity: important
Tags: patch
User: pkg-multimedia-maintainers@lists.alioth.debian.org
Usertags: ffmpeg2.9

Dear Maintainer,

your package fails to build with the upcoming ffmpeg 2.9.
This bug will become release-critical at some point when the
ffmpeg2.9 transition gets closer.

Attached is a patch replacing the deprecated functionality.
It also works with ffmpeg 2.8.
Please apply this patch and forward it upstream, if necessary.

These changes have little regression potential.

Best regards,
Andreas

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 000..f91ea98
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,351 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun 
+Last-Update: <2015-11-02>
+
+--- xjadeo-0.8.4.orig/src/xjadeo/display.c
 xjadeo-0.8.4/src/xjadeo/display.c
+@@ -194,8 +194,8 @@ void rgb2abgr (uint8_t *rgbabuffer, uint
+ 
+ // see xjadeo.h VideoModes
+ const vidout VO[] = {
+-	{ PIX_FMT_RGB24,   1, 		"NULL", NULLOUTPUT}, // NULL is --vo 0 -> autodetect
+-	{ PIX_FMT_BGRA32,   SUP_OPENGL,   "OpenGL",
++	{ AV_PIX_FMT_RGB24,   1, 		"NULL", NULLOUTPUT}, // NULL is --vo 0 -> autodetect
++	{ AV_PIX_FMT_BGRA32,   SUP_OPENGL,   "OpenGL",
+ #ifdef HAVE_GL
+ 		_render, _open_window, & gl_close_window,
+ 		_handle_events, _newsrc,
+@@ -209,7 +209,7 @@ const vidout VO[] = {
+ 			NULLOUTPUT
+ #endif
+ 	},
+-	{ PIX_FMT_YUV420P, SUP_LIBXV, "XV - X11 video extension",
++	{ AV_PIX_FMT_YUV420P, SUP_LIBXV, "XV - X11 video extension",
+ #if HAVE_LIBXV
+ 		_xv, _window_xv, _window_xv,
+ 		_X_events_xv, _xv, _xv,
+@@ -220,7 +220,7 @@ const vidout VO[] = {
+ 			NULLOUTPUT
+ #endif
+ 	},
+-	{ PIX_FMT_YUV420P, SUP_SDL, "SDL",
++	{ AV_PIX_FMT_YUV420P, SUP_SDL, "SDL",
+ #ifdef HAVE_SDL
+ 		_sdl, _window_sdl, _window_sdl,
+ 		_X_events_sdl, _sdl, _sdl,
+@@ -233,9 +233,9 @@ const vidout VO[] = {
+ 	},
+ 	{
+ #ifdef IMLIB2RGBA
+-		PIX_FMT_BGRA32,   SUP_IMLIB2,   "ImLib2/x11 (RGBA32)",
++		AV_PIX_FMT_BGRA32,   SUP_IMLIB2,   "ImLib2/x11 (RGBA32)",
+ #else
+-		PIX_FMT_RGB24,   SUP_IMLIB2,   "ImLib2/x11 (RGB24)",
++		AV_PIX_FMT_RGB24,   SUP_IMLIB2,   "ImLib2/x11 (RGB24)",
+ #endif
+ #if HAVE_IMLIB2
+ 		_imlib2, _window_imlib2, _window_imlib2,
+@@ -247,7 +247,7 @@ const vidout VO[] = {
+ 			NULLOUTPUT
+ #endif
+ 	},
+-	{ PIX_FMT_UYVY422,   SUP_MACOSX,   "Mac OSX - quartz",
++	{ AV_PIX_FMT_UYVY422,   SUP_MACOSX,   "Mac OSX - quartz",
+ #if defined PLATFORM_OSX && (defined __i386 || defined __ppc__)
+ 		_mac, _window_mac, _window_mac,
+ 		_X_events_mac, _mac, _mac,
+@@ -342,17 +342,17 @@ extern int ST_top;
+ #define PB_W (movie_width - 2 * PB_X)
+ 
+ #define SET_RFMT(FORMAT, POINTER, VARS, FUNC) \
+-	if ((FORMAT) == PIX_FMT_YUV420P) \
++	if ((FORMAT) == AV_PIX_FMT_YUV420P) \
+ 		(POINTER) = &_##FUNC##_YUV; \
+-	else if ((FORMAT) == PIX_FMT_UYVY422) \
++	else if ((FORMAT) == AV_PIX_FMT_UYVY422) \
+ 		(POINTER) = &_##FUNC##_YUV422; \
+-	else if ((FORMAT) == PIX_FMT_RGB24) { \
++	else if ((FORMAT) == AV_PIX_FMT_RGB24) { \
+ 		 (POINTER) = &_##FUNC##_RGB; \
+ 		VARS.bpp = 3; \
+-	} else if ((FORMAT) == PIX_FMT_RGBA32) { \
++	} else if ((FORMAT) == AV_PIX_FMT_RGBA32) { \
+ 		(POINTER) = &_##FUNC##_RGB; \
+ 		VARS.bpp = 4; \
+-	} else if ((FORMAT) == PIX_FMT_BGRA32) { \
++	} else if ((FORMAT) == AV_PIX_FMT_BGRA32) { \
+ 		(POINTER) = &_##FUNC##_RGB; \
+ 		VARS.bpp = 4; \
+ 	} else return ;
+--- xjadeo-0.8.4.orig/src/xjadeo/display_mac.c
 xjadeo-0.8.4/src/xjadeo/display_mac.c
+@@ -553,16 +553,16 @@ void window_resized_mac() {
+   }
+ 
+   switch (image_format) {
+-case PIX_FMT_RGB24:
+-case PIX_FMT_RGBA32:
++case AV_PIX_FMT_RGB24:
++case AV_PIX_FMT_RGBA32:
+ {
+   bounds = CGRectMake(dstRect.left, dstRect.top, dstRect.right-dstRect.left, dstRect.bottom-dstRect.top);
+   CreateCGContextForPort (GetWindowPort (theWindow), );
+   break;
+ }
+-case PIX_FMT_YUV420P:
+-case PIX_FMT_YUYV422:
+-case PIX_FMT_UYVY422:
++case AV_PIX_FMT_YUV420P:
++case AV_PIX_FMT_YUYV422:
++case AV_PIX_FMT_UYVY422:
+ 

sonic-visualiser 2.5~repack1-1 MIGRATED to testing

2015-11-02 Thread Debian testing watch
FYI: The status of the sonic-visualiser source package
in Debian's testing distribution has changed.

  Previous version: 2.4.1~repack1-2
  Current version:  2.5~repack1-1

-- 
This email is automatically generated once a day.  As the installation of
new packages into testing happens multiple times a day you will receive
later changes on the next day.
See https://release.debian.org/testing-watch/ for more information.

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers


vlc 2.2.1-5 MIGRATED to testing

2015-11-02 Thread Debian testing watch
FYI: The status of the vlc source package
in Debian's testing distribution has changed.

  Previous version: 2.2.1-4
  Current version:  2.2.1-5

-- 
This email is automatically generated once a day.  As the installation of
new packages into testing happens multiple times a day you will receive
later changes on the next day.
See https://release.debian.org/testing-watch/ for more information.

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers


qtractor 0.7.1-1 MIGRATED to testing

2015-11-02 Thread Debian testing watch
FYI: The status of the qtractor source package
in Debian's testing distribution has changed.

  Previous version: 0.7.0-1
  Current version:  0.7.1-1

-- 
This email is automatically generated once a day.  As the installation of
new packages into testing happens multiple times a day you will receive
later changes on the next day.
See https://release.debian.org/testing-watch/ for more information.

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers


mplayer_1.2-1_source.changes ACCEPTED into unstable

2015-11-02 Thread Debian FTP Masters


Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512

Format: 1.8
Date: Mon, 02 Nov 2015 06:02:19 -0500
Source: mplayer
Binary: mplayer-gui mencoder mplayer mplayer-dbg mplayer-doc
Architecture: source
Version: 2:1.2-1
Distribution: unstable
Urgency: medium
Maintainer: Debian Multimedia Maintainers 

Changed-By: Miguel A. Colón Vélez 
Description:
 mencoder   - MPlayer's Movie Encoder
 mplayer- movie player for Unix-like systems
 mplayer-dbg - debugging symbols for MPlayer
 mplayer-doc - documentation for MPlayer
 mplayer-gui - movie player for Unix-like systems (GUI variant)
Changes:
 mplayer (2:1.2-1) unstable; urgency=medium
 .
   * New upstream release.
 - MPlayer using the FFmpeg 2.8 release. This will be the last FFmpeg 
release
   before a lot of the old APIs are dropped. Some features will have to be
   removed in MPlayer after (eg. XvMC, lavfi ulnless it's rewritten), 
because
   of incompatibilities or deprecation.
   * debian/control:
 - Split the Build-Depends into B-D/B-D-Arch/B-D-Indep. This allows building
   the source or arch-all packages without having to install unneeded
   packages.
   * debian/patches:
 - Refresh patches and drop the ones applied by upsteam.
 - Cherry pick r37545 to allow building without an internal FFmpeg.
 - Cherry pick r37548 from the 1.2 branch to fix a segmentation fault.
 - Cherry pick r37549 to allow building the documentation without FFmpeg.
   * debian/rules:
 - Pass a minimal set of configuration options when just building the docs.
   * Update the copyright file.
   * Remove the menu file since a desktop file is provided.
Checksums-Sha1:
 af55bea40f4499322b90371452370a7c6446 3461 mplayer_1.2-1.dsc
 845e4be3c0bd979a4584e3d79dd423cf085a9195 5208176 mplayer_1.2.orig.tar.xz
 7878882f2c814b68e6166919209041ab495434d2 39432 mplayer_1.2-1.debian.tar.xz
Checksums-Sha256:
 dd919793810eb7efdce7fd3efc2ee395d3261e3ab10bf9c0b3027d01c4c8b8df 3461 
mplayer_1.2-1.dsc
 a3741d5a54b7b2b2ce1dc3f4908b787943ad89af9b05c63de381bee7cd393aa0 5208176 
mplayer_1.2.orig.tar.xz
 62959648f45cfb896d3738ad828ba317e21802b0ec74c6a925b74b2889174bca 39432 
mplayer_1.2-1.debian.tar.xz
Files:
 63a52d219977b651ab2b6864e53fbd91 3461 video optional mplayer_1.2-1.dsc
 abca61e8f2ef58ec6cb14ae4c71e339b 5208176 video optional mplayer_1.2.orig.tar.xz
 b0b901f8aeb5c3cb11cc589b5d932103 39432 video optional 
mplayer_1.2-1.debian.tar.xz

-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAEBCgAGBQJWN3ibAAoJEAamIUI/8faTTfEP/i3yrJC8p93ba/+DEhCA5dqs
K51fIvbYx4lak57UckpwDrpbCFf27fz5Bt5q7NugQh844xoNhXUdbxrSPU9ZhH8B
fJr3CH+Zy6/9A1Hx/BMe0Kje8Ly+YTbauTxHxqoKnH0EM8ujNt/B/5AW9P01lDZg
PsJ5g5lmal0kPm2F1AgPEjgglUe00PT46TKdfdW9kFga4+/1KYFeU67+4JVUfaEt
6tpCRw81Jo2Yz3Xmzed/o4AkP8bZG4z9fo/8l38WnkCCBLw13TILe7l4XvNLa/6V
CrSVXxGCQiB1GlgcW81kPAlvuc9ZJjGoMd+6Bl2xHo6EXC/+fVzxkAu60UdpfZoL
8yMyIAbZzcaLKJZWyKk4imklW+RFacLeyIg/izsvaHRhGr6ITDIQHVvSo11eysF1
LdpGalBrunUFUWxCASbWkdy4G5TvmGh6quwp/MqT0Ez5EUSP4GOG037JwWyU8/f/
ADUb/Oz511cnnvYGAWAdxDQaOOzhDMSqTEi6RT5HBj9KSA8MUOzDGJH5VlHptT/b
FkO3t9hVLa8zZILD8yX4bXRPJdf1pfHpLQtjeLDr8HcnIOfTqiUQgG0WmFOIY5sy
0XOwowmTlz/oLyaw0kXuWl6FnItAPUCnoUhXP5LFAehMYtniGtpRjbZA44b+z1+0
qPnnV65qJkT2Ju0kXfcK
=7A0t
-END PGP SIGNATURE-


Thank you for your contribution to Debian.

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

mplayer-blue_1.11-1_source.changes ACCEPTED into unstable

2015-11-02 Thread Debian FTP Masters


Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512

Format: 1.8
Date: Mon, 02 Nov 2015 06:48:04 -0500
Source: mplayer-blue
Binary: mplayer-skin-blue
Architecture: source
Version: 1.11-1
Distribution: unstable
Urgency: medium
Maintainer: Debian Multimedia Maintainers 

Changed-By: Miguel A. Colón Vélez 
Description:
 mplayer-skin-blue - Blue skin for MPlayer
Changes:
 mplayer-blue (1.11-1) unstable; urgency=medium
 .
   * New upstream release.
   * Add a note about the current status of the License as requested by
 ftpmaster.
Checksums-Sha1:
 6b684949107a31bcefea700377a95d4353c70f15 1987 mplayer-blue_1.11-1.dsc
 7e112978e5cf16a023fbbfdb73d06f9709164aff 222529 mplayer-blue_1.11.orig.tar.bz2
 b1cb01f5cab281160a9faafb77f629b93b491e1d 3656 mplayer-blue_1.11-1.debian.tar.xz
Checksums-Sha256:
 cfd9b3116727aab57a01cd1946617c69bd01f25f97ce6776ab7e640dcc3a8f89 1987 
mplayer-blue_1.11-1.dsc
 b43babe52ee8ab6f35f85d4c4405169cb55777db090f6b846db4657e8c227331 222529 
mplayer-blue_1.11.orig.tar.bz2
 c2d40a297438ef66e8b2137a46cef320beddc2fc860e147e753c6e294d8ec120 3656 
mplayer-blue_1.11-1.debian.tar.xz
Files:
 048dc80102d5732060eca8f3b51273b2 1987 graphics optional mplayer-blue_1.11-1.dsc
 de7b4438b68729089d92912f041abe54 222529 graphics optional 
mplayer-blue_1.11.orig.tar.bz2
 1a02dd8a1d9283e2459aa379a51108dd 3656 graphics optional 
mplayer-blue_1.11-1.debian.tar.xz

-BEGIN PGP SIGNATURE-
Version: GnuPG v2

iQIcBAEBCgAGBQJWN2ozAAoJEAamIUI/8faT2lIP/R7ZuHPttjB0j3wZmdTXYCpZ
2g8t4MogFF7EvfNrd9r7/yyxlKXvJkJNITxpCUGELTGoV53NyMez72+HK73RWJ6y
ZKjs7ouC1vIf5bKBW3rgSkMnPiPhYlsQUCnB3Q/GyJ8DcCkx9LcsDEzEEGKwtmrK
Sd+YFphFWyh+OnoKUkmkY0XKZG4k5rcqvZqUsiUW0NcXLmHqlnrPEo2sUdBny6/o
l9LrqHjwMJ5RAPvhqzgeTv0Qbk+1Vox44DbtqiSTVvULEqpG4UaeQk2sEuQPuZHN
b0FAWeSAUtCcwXTT6ShBP6X0EQqQzjw49q2unrUlYzG/rAS2TuXECAJUvujKlCzR
UGVCZFbFJU+Z+XgfXzOBDwjfXKaXYn7i2KqwtcUtZbPcjoNAyMCRFqDOTety62s9
z1fkXYXV1NFA62iYsm5jhwVVotOK7HqDgWsgVmJJLdBQv2ixCsrkxQXB3M2Esy9M
JaWEsVVaUgFqV8fCl9k+lXvjACPYSRbZ5Y2lxczbeqc+exsUSRsaf8KfMYQUuQ1j
tOmVjUp25skZX3QfyHPLdYNlbpYklNS2dAY7//hU0rCnrv7viIBB8QTM2YXzO96I
OOF7kLNo3syYhe7RHAslLqDgvMCVoAFeQhh7YSkTQnIuOAo4F+h/WYqbJ9O5/gkM
pWq3Di/XMS3/Sao1aoot
=Z60Y
-END PGP SIGNATURE-


Thank you for your contribution to Debian.

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#803831: kodi: FTBFS with FFmpeg 2.9

2015-11-02 Thread Andreas Cadhalpun
Package: kodi
Version: 15.2~rc3+dfsg1-1
Severity: important
Tags: patch
User: pkg-multimedia-maintainers@lists.alioth.debian.org
Usertags: ffmpeg2.9

Dear Maintainer,

your package fails to build with the upcoming ffmpeg 2.9.
This bug will become release-critical at some point when the
ffmpeg2.9 transition gets closer.

Attached is a patch replacing the deprecated functionality.
It also works with ffmpeg 2.8.
Please apply this patch and forward it upstream, if necessary.

These changes have little regression potential.

Best regards,
Andreas

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 000..af3c870
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,574 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun 
+Last-Update: <2015-11-02>
+
+--- kodi-15.2~rc3+dfsg1.orig/xbmc/cores/FFmpeg.h
 kodi-15.2~rc3+dfsg1/xbmc/cores/FFmpeg.h
+@@ -33,23 +33,6 @@ extern "C" {
+ #include "libpostproc/postprocess.h"
+ }
+ 
+-inline int SwScaleCPUFlags()
+-{
+-  unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures();
+-  int flags = 0;
+-
+-  if (cpuFeatures & CPU_FEATURE_MMX)
+-flags |= SWS_CPU_CAPS_MMX;
+-  if (cpuFeatures & CPU_FEATURE_MMX2)
+-flags |= SWS_CPU_CAPS_MMX2;
+-  if (cpuFeatures & CPU_FEATURE_3DNOW)
+-flags |= SWS_CPU_CAPS_3DNOW;
+-  if (cpuFeatures & CPU_FEATURE_ALTIVEC)
+-flags |= SWS_CPU_CAPS_ALTIVEC;
+-
+-  return flags;
+-}
+-
+ inline int PPCPUFlags()
+ {
+   unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures();
+--- kodi-15.2~rc3+dfsg1.orig/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
 kodi-15.2~rc3+dfsg1/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
+@@ -2932,7 +2932,7 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im
+   }
+   else if (m_format == RENDER_FMT_NV12)
+   {
+-srcFormat = PIX_FMT_NV12;
++srcFormat = AV_PIX_FMT_NV12;
+ for (int i = 0; i < 2; i++)
+ {
+   src[i]   = im->plane[i];
+@@ -2941,13 +2941,13 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im
+   }
+   else if (m_format == RENDER_FMT_YUYV422)
+   {
+-srcFormat= PIX_FMT_YUYV422;
++srcFormat= AV_PIX_FMT_YUYV422;
+ src[0]   = im->plane[0];
+ srcStride[0] = im->stride[0];
+   }
+   else if (m_format == RENDER_FMT_UYVY422)
+   {
+-srcFormat= PIX_FMT_UYVY422;
++srcFormat= AV_PIX_FMT_UYVY422;
+ src[0]   = im->plane[0];
+ srcStride[0] = im->stride[0];
+   }
+@@ -2965,8 +2965,8 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im
+ 
+   m_context = sws_getCachedContext(m_context,
+  im->width, im->height, (AVPixelFormat)srcFormat,
+- im->width, im->height, (AVPixelFormat)PIX_FMT_BGRA,
+- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
++ im->width, im->height, (AVPixelFormat)AV_PIX_FMT_BGRA,
++ SWS_FAST_BILINEAR, NULL, NULL, NULL);
+ 
+   uint8_t *dst[]   = { m_rgbBuffer, 0, 0, 0 };
+   int  dstStride[] = { (int)m_sourceWidth * 4, 0, 0, 0 };
+@@ -2995,7 +2995,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I
+ 
+   if (m_format == RENDER_FMT_YUV420P)
+   {
+-srcFormat = PIX_FMT_YUV420P;
++srcFormat = AV_PIX_FMT_YUV420P;
+ for (int i = 0; i < 3; i++)
+ {
+   srcTop[i]   = im->plane[i];
+@@ -3006,7 +3006,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I
+   }
+   else if (m_format == RENDER_FMT_NV12)
+   {
+-srcFormat = PIX_FMT_NV12;
++srcFormat = AV_PIX_FMT_NV12;
+ for (int i = 0; i < 2; i++)
+ {
+   srcTop[i]   = im->plane[i];
+@@ -3017,7 +3017,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I
+   }
+   else if (m_format == RENDER_FMT_YUYV422)
+   {
+-srcFormat   = PIX_FMT_YUYV422;
++srcFormat   = AV_PIX_FMT_YUYV422;
+ srcTop[0]   = im->plane[0];
+ srcStrideTop[0] = im->stride[0] * 2;
+ srcBot[0]   = im->plane[0] + im->stride[0];
+@@ -3025,7 +3025,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I
+   }
+   else if (m_format == RENDER_FMT_UYVY422)
+   {
+-srcFormat   = PIX_FMT_UYVY422;
++srcFormat   = AV_PIX_FMT_UYVY422;
+ srcTop[0]   = im->plane[0];
+ srcStrideTop[0] = im->stride[0] * 2;
+ srcBot[0]   = im->plane[0] + im->stride[0];
+@@ -3045,8 +3045,8 @@ void CLinuxRendererGL::ToRGBFields(YV12I
+ 
+   m_context = sws_getCachedContext(m_context,
+  im->width, im->height >> 1, (AVPixelFormat)srcFormat,
+- im->width, im->height >> 1, (AVPixelFormat)PIX_FMT_BGRA,
+- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
++ im->width, im->height >> 1, (AVPixelFormat)AV_PIX_FMT_BGRA,
++   

Bug#803810: ffdiaporama: FTBFS with FFmpeg 2.9

2015-11-02 Thread Andreas Cadhalpun
Package: ffdiaporama
Version: 1.5-4
Severity: important
Tags: patch
User: pkg-multimedia-maintainers@lists.alioth.debian.org
Usertags: ffmpeg2.9

Dear Maintainer,

your package fails to build with the upcoming ffmpeg 2.9.
This bug will become release-critical at some point when the
ffmpeg2.9 transition gets closer.

Attached is a patch replacing the deprecated functionality.
It also works with ffmpeg 2.8.
Please apply this patch and forward it upstream, if necessary.

These changes are non-trivial and should be runtime-tested.

Best regards,
Andreas

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 000..2035493
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,161 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun 
+Last-Update: <2015-11-02>
+
+--- ffdiaporama-1.5.orig/src/engine/cBaseMediaFile.cpp
 ffdiaporama-1.5/src/engine/cBaseMediaFile.cpp
+@@ -1571,7 +1571,7 @@ void cVideoFile::CloseCodecAndFile() {
+ }
+ 
+ if (FrameBufferYUV!=NULL) {
+-av_free(FrameBufferYUV);
++av_frame_free();
+ FrameBufferYUV=NULL;
+ }
+ FrameBufferYUVReady=false;
+@@ -1680,7 +1680,7 @@ void cVideoFile::ReadAudioFrame(bool Pre
+ int SizeDecoded =(AVCODEC_MAX_AUDIO_FRAME_SIZE*3)/2;
+ int Len =avcodec_decode_audio3(AudioStream->codec,(int16_t *)BufferToDecode,,);
+ #else
+-AVFrame *Frame  =avcodec_alloc_frame();
++AVFrame *Frame  =av_frame_alloc();
+ int SizeDecoded =0;
+ int Len =avcodec_decode_audio4(AudioStream->codec,Frame,,);
+ #endif
+@@ -1723,7 +1723,7 @@ void cVideoFile::ReadAudioFrame(bool Pre
+ LastAudioReadedPosition =int(FramePosition*1000);// Keep NextPacketPosition for determine next time if we need to seek
+ }
+ #ifndef LIBAV_07
+-av_free(Frame);
++av_frame_free();
+ #endif
+ }
+ }
+@@ -1857,9 +1857,9 @@ void cVideoFile::ReadAudioFrame(bool Pre
+ ToLog(LOGMSG_CRITICAL,QString("Error in cVideoFile::VideoFilter_Open : avfilter_graph_create_filter: src"));
+ return result;
+ }
+-std::vector m_formats;
+-m_formats.push_back(PIX_FMT_YUVJ420P);
+-m_formats.push_back(PIX_FMT_NONE);  /* always add none to get a terminated list in ffmpeg world */
++std::vector m_formats;
++m_formats.push_back(AV_PIX_FMT_YUVJ420P);
++m_formats.push_back(AV_PIX_FMT_NONE);  /* always add none to get a terminated list in ffmpeg world */
+ AVBufferSinkParams *buffersink_params=av_buffersink_params_alloc();
+ buffersink_params->pixel_fmts=_formats[0];
+ #ifdef FF_API_OLD_VSINK_API
+@@ -2043,11 +2048,8 @@ void cVideoFile::ReadAudioFrame(bool Pre
+ return VC_ERROR;
+ }
+ while (Ret>=0) {
+-AVFilterBufferRef *m_pBufferRef=NULL;
+-Ret=av_buffersink_read(VideoFilterOut,_pBufferRef);
++Ret=av_buffersink_get_frame(VideoFilterOut,FrameBufferYUV);
+ if (Ret<0) break;
+-avfilter_copy_buf_props(FrameBufferYUV,m_pBufferRef);
+-FrameBufferYUV->opaque=m_pBufferRef;
+ }
+ #endif
+ return VC_BUFFER;
+@@ -2212,7 +2219,7 @@ QImage *cVideoFile::ReadVideoFrame(bool
+ }
+ 
+ // Allocate structure for YUV image
+-if (FrameBufferYUV==NULL) FrameBufferYUV=avcodec_alloc_frame();
++if (FrameBufferYUV==NULL) FrameBufferYUV=av_frame_alloc();
+ if (FrameBufferYUV==NULL) return NULL;
+ 
+ boolDataInBuffer=false;
+@@ -2281,13 +2288,6 @@ QImage *cVideoFile::ReadVideoFrame(bool
+ if (av_read_frame(ffmpegVideoFile,StreamPacket)==0) {
+ 
+ if (StreamPacket->stream_index==VideoStreamNumber) {
+-#if LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(3,1,0)
+-if (FrameBufferYUV->opaque) {
+-avfilter_unref_buffer((AVFilterBufferRef *)FrameBufferYUV->opaque);
+-FrameBufferYUV->opaque=NULL;
+-}
+-#endif
+-
+ int FrameDecoded=0;
+ if (avcodec_decode_video2(VideoStream->codec,FrameBufferYUV,,StreamPacket)<0)
+ ToLog(LOGMSG_INFORMATION,"IN:cVideoFile::ReadVideoFrame : avcodec_decode_video2 return an error");
+@@ -2380,9 +2380,9 @@ QImage *cVideoFile::ReadVideoFrame(bool
+ }
+ 
+ //
+-//#define PIXFMT  PIX_FMT_BGRA
++//#define 

Bug#803821: gpac: FTBFS with FFmpeg 2.9

2015-11-02 Thread Andreas Cadhalpun
Package: gpac
Version: 0.5.2-426-gc5ad4e4+dfsg5-1
Severity: important
Tags: patch
User: pkg-multimedia-maintainers@lists.alioth.debian.org
Usertags: ffmpeg2.9

Dear Maintainer,

your package fails to build with the upcoming ffmpeg 2.9.
This bug will become release-critical at some point when the
ffmpeg2.9 transition gets closer.

Attached is a patch replacing the deprecated functionality.
It also works with ffmpeg 2.8.
Please apply this patch and forward it upstream, if necessary.

These changes have little regression potential.

Best regards,
Andreas

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 000..693ea39
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,302 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun 
+Last-Update: <2015-11-02>
+
+--- gpac-0.5.2-426-gc5ad4e4+dfsg5.orig/applications/dashcast/audio_decoder.c
 gpac-0.5.2-426-gc5ad4e4+dfsg5/applications/dashcast/audio_decoder.c
+@@ -205,11 +205,7 @@ int dc_audio_decoder_read(AudioInputFile
+ 			packet.data = NULL;
+ 			packet.size = 0;
+ 
+-#ifndef FF_API_AVFRAME_LAVC
+-			avcodec_get_frame_defaults(audio_input_data->aframe);
+-#else
+ 			av_frame_unref(audio_input_data->aframe);
+-#endif
+ 
+ 			avcodec_decode_audio4(codec_ctx, audio_input_data->aframe, _frame, );
+ 
+@@ -240,11 +236,7 @@ int dc_audio_decoder_read(AudioInputFile
+ 		if (packet.stream_index == audio_input_file->astream_idx) {
+ 			/* Set audio frame to default */
+ 
+-#ifndef FF_API_AVFRAME_LAVC
+-			avcodec_get_frame_defaults(audio_input_data->aframe);
+-#else
+ 			av_frame_unref(audio_input_data->aframe);
+-#endif
+ 
+ 			/* Decode audio frame */
+ 			if (avcodec_decode_audio4(codec_ctx, audio_input_data->aframe, _frame, ) < 0) {
+--- gpac-0.5.2-426-gc5ad4e4+dfsg5.orig/applications/dashcast/audio_encoder.c
 gpac-0.5.2-426-gc5ad4e4+dfsg5/applications/dashcast/audio_encoder.c
+@@ -85,11 +85,7 @@ int dc_audio_encoder_open(AudioOutputFil
+ 
+ 	audio_output_file->frame_bytes = audio_output_file->codec_ctx->frame_size * av_get_bytes_per_sample(DC_AUDIO_SAMPLE_FORMAT) * DC_AUDIO_NUM_CHANNELS;
+ 
+-#ifndef FF_API_AVFRAME_LAVC
+-	avcodec_get_frame_defaults(audio_output_file->aframe);
+-#else
+ 	av_frame_unref(audio_output_file->aframe);
+-#endif
+ 
+ 
+ 	audio_output_file->aframe->nb_samples = audio_output_file->codec_ctx->frame_size;
+--- gpac-0.5.2-426-gc5ad4e4+dfsg5.orig/applications/dashcast/video_decoder.c
 gpac-0.5.2-426-gc5ad4e4+dfsg5/applications/dashcast/video_decoder.c
+@@ -253,11 +253,7 @@ int dc_video_decoder_read(VideoInputFile
+ 			video_data_node->source_number = source_number;
+ 			/* Flush decoder */
+ 			memset(, 0, sizeof(AVPacket));
+-#ifndef FF_API_AVFRAME_LAVC
+-			avcodec_get_frame_defaults(video_data_node->vframe);
+-#else
+ 			av_frame_unref(video_data_node->vframe);
+-#endif
+ 
+ 			avcodec_decode_video2(codec_ctx, video_data_node->vframe, _frame, );
+ 			if (got_frame) {
+@@ -292,11 +288,7 @@ int dc_video_decoder_read(VideoInputFile
+ 			video_data_node->source_number = source_number;
+ 
+ 			/* Set video frame to default */
+-#ifndef FF_API_AVFRAME_LAVC
+-			avcodec_get_frame_defaults(video_data_node->vframe);
+-#else
+ 			av_frame_unref(video_data_node->vframe);
+-#endif
+ 
+ 			/* Decode video frame */
+ 			if (avcodec_decode_video2(codec_ctx, video_data_node->vframe, _frame, ) < 0) {
+--- gpac-0.5.2-426-gc5ad4e4+dfsg5.orig/applications/dashcast/video_encoder.c
 gpac-0.5.2-426-gc5ad4e4+dfsg5/applications/dashcast/video_encoder.c
+@@ -86,7 +86,7 @@ int dc_video_encoder_open(VideoOutputFil
+ 		video_output_file->codec_ctx->time_base.den = video_data_conf->time_base.den;
+ 		video_output_file->codec_ctx->time_base.num = video_data_conf->time_base.num * video_data_conf->time_base.den / video_data_conf->framerate;
+ 	}
+-	video_output_file->codec_ctx->pix_fmt = PIX_FMT_YUV420P;
++	video_output_file->codec_ctx->pix_fmt = AV_PIX_FMT_YUV420P;
+ 	video_output_file->codec_ctx->gop_size = video_data_conf->framerate;
+ 
+ //	video_output_file->codec_ctx->codec_id = video_codec->id;
+@@ -96,7 +96,7 @@ int dc_video_encoder_open(VideoOutputFil
+ //	video_output_file->codec_ctx->height = video_data_conf->height;
+ //	video_output_file->codec_ctx->time_base = (AVRational) {1 ,
+ //video_output_file->video_data_conf->framerate};
+-//	video_output_file->codec_ctx->codec->pix_fmt = PIX_FMT_YUV420P;
++//	video_output_file->codec_ctx->codec->pix_fmt = AV_PIX_FMT_YUV420P;
+ 	video_output_file->codec_ctx->gop_size = video_data_conf->framerate;
+ //
+ //	av_opt_set(video_output_file->codec_ctx->priv_data, "preset", "ultrafast", 0);
+--- gpac-0.5.2-426-gc5ad4e4+dfsg5.orig/applications/dashcast/video_muxer.c
 gpac-0.5.2-426-gc5ad4e4+dfsg5/applications/dashcast/video_muxer.c
+@@ -636,7 +636,7 @@ int dc_ffmpeg_video_muxer_open(VideoOutp
+ 
+ 	video_stream->codec->time_base = video_codec_ctx->time_base;
+ 
+-	

Bug#803824: harvid: FTBFS with FFmpeg 2.9

2015-11-02 Thread Andreas Cadhalpun
Package: harvid
Version: 0.8.0-2
Severity: important
Tags: patch
User: pkg-multimedia-maintainers@lists.alioth.debian.org
Usertags: ffmpeg2.9

Dear Maintainer,

your package fails to build with the upcoming ffmpeg 2.9.
This bug will become release-critical at some point when the
ffmpeg2.9 transition gets closer.

Attached is a patch replacing the deprecated functionality.
It also works with ffmpeg 2.8.
Please apply this patch and forward it upstream, if necessary.

These changes have little regression potential.

Best regards,
Andreas

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 000..04de003
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,299 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun 
+Last-Update: <2015-11-02>
+
+--- harvid-0.8.0.orig/libharvid/decoder_ctrl.c
 harvid-0.8.0/libharvid/decoder_ctrl.c
+@@ -29,7 +29,7 @@
+ #include "ffcompat.h"
+ #include "dlog.h"
+ 
+-#define DEFAULT_PIX_FMT (PIX_FMT_RGB24) // TODO global default
++#define DEFAULT_PIX_FMT (AV_PIX_FMT_RGB24) // TODO global default
+ 
+ //#define HASH_EMIT_KEYS 3
+ #define HASH_FUNCTION HASH_SAX
+@@ -104,15 +104,15 @@ static inline int my_open_movie(void **v
+   }
+   ff_create(vd);
+   assert (
+- render_fmt == PIX_FMT_YUV420P
+-  || render_fmt == PIX_FMT_YUV440P
+-  || render_fmt == PIX_FMT_YUYV422
+-  || render_fmt == PIX_FMT_UYVY422
+-  || render_fmt == PIX_FMT_RGB24
+-  || render_fmt == PIX_FMT_BGR24
+-  || render_fmt == PIX_FMT_RGBA
+-  || render_fmt == PIX_FMT_ARGB
+-  || render_fmt == PIX_FMT_BGRA
++ render_fmt == AV_PIX_FMT_YUV420P
++  || render_fmt == AV_PIX_FMT_YUV440P
++  || render_fmt == AV_PIX_FMT_YUYV422
++  || render_fmt == AV_PIX_FMT_UYVY422
++  || render_fmt == AV_PIX_FMT_RGB24
++  || render_fmt == AV_PIX_FMT_BGR24
++  || render_fmt == AV_PIX_FMT_RGBA
++  || render_fmt == AV_PIX_FMT_ARGB
++  || render_fmt == AV_PIX_FMT_BGRA
+   );
+ 
+   if (!ff_open_movie (*vd, fn, render_fmt)) {
+@@ -144,7 +144,7 @@ static inline void my_get_info_canonical
+ static JVOBJECT *newjvo (JVOBJECT *jvo, pthread_mutex_t *appendlock) {
+   debugmsg(DEBUG_DCTL, "DCTL: newjvo() allocated new decoder object\n");
+   JVOBJECT *n = calloc(1, sizeof(JVOBJECT));
+-  n->fmt = PIX_FMT_NONE;
++  n->fmt = AV_PIX_FMT_NONE;
+   n->frame = -1;
+   pthread_mutex_init(>lock, NULL);
+   JVOBJECT *cptr = jvo;
+@@ -175,8 +175,8 @@ static JVOBJECT *testjvd(JVOBJECT *jvo,
+ if (!(cptr->flags_VALID) || cptr->id != id) {
+   continue;
+ }
+-if (fmt != PIX_FMT_NONE && cptr->fmt != fmt
+-&& cptr->fmt != PIX_FMT_NONE
++if (fmt != AV_PIX_FMT_NONE && cptr->fmt != fmt
++&& cptr->fmt != AV_PIX_FMT_NONE
+ ) {
+   continue;
+ }
+@@ -324,7 +324,7 @@ static int clearjvo(JVD *jvd, int f, int
+   my_destroy(>decoder);
+   cptr->decoder = NULL;
+   cptr->flags &= ~VOF_OPEN;
+-  cptr->fmt = PIX_FMT_NONE;
++  cptr->fmt = AV_PIX_FMT_NONE;
+ }
+ 
+ hashref_delete_jvo(jvd, cptr);
+@@ -410,7 +410,7 @@ static JVOBJECT *getjvo(JVD *jvd) {
+ if (cptr->flags&(VOF_OPEN)) {
+   my_destroy(>decoder); // close it.
+   cptr->decoder = NULL; // not really need..
+-  cptr->fmt = PIX_FMT_NONE;
++  cptr->fmt = AV_PIX_FMT_NONE;
+ }
+ 
+ hashref_delete_jvo(jvd, cptr);
+@@ -563,7 +563,7 @@ static JVOBJECT *new_video_object(JVD *j
+ 
+ 
+   jvo->id = id;
+-  jvo->fmt = fmt == PIX_FMT_NONE ? DEFAULT_PIX_FMT : fmt;
++  jvo->fmt = fmt == AV_PIX_FMT_NONE ? DEFAULT_PIX_FMT : fmt;
+   jvo->frame = -1;
+   jvo->flags |= VOF_VALID;
+ 
+@@ -619,7 +619,7 @@ static void * dctrl_get_decoder(void *p,
+* use it IFF frame == -1  (ie. non-blocking info lookups) */
+   if (frame < 0) {
+ pthread_rwlock_rdlock(>lock_jdh);
+-if (fmt == PIX_FMT_NONE) {
++if (fmt == AV_PIX_FMT_NONE) {
+   HASH_FIND(hhi, jvd->jvi, , sizeof(unsigned short), jvo);
+ } else {
+   const JVOBJECT jvt = {id, fmt, 0};
+@@ -670,7 +670,7 @@ static void * dctrl_get_decoder(void *p,
+   jvo->lru = time(NULL);
+   pthread_mutex_unlock(>lock);
+ 
+-  if (fmt == PIX_FMT_NONE) fmt = DEFAULT_PIX_FMT;
++  if (fmt == AV_PIX_FMT_NONE) fmt = DEFAULT_PIX_FMT;
+ 
+   if (!my_open_movie(>decoder, get_fn(jvd, jvo->id), fmt)) {
+ pthread_mutex_lock(>lock);
+@@ -798,7 +798,7 @@ int dctrl_decode(void *p, unsigned short
+ 
+ int dctrl_get_info(void *p, unsigned short id, VInfo *i) {
+   int err = 0;
+-  JVOBJECT *jvo = (JVOBJECT*) dctrl_get_decoder(p, id, PIX_FMT_NONE, -1, );
++  JVOBJECT *jvo = (JVOBJECT*) dctrl_get_decoder(p, id, AV_PIX_FMT_NONE, -1, );
+   if (!jvo) return err;
+   my_get_info(jvo->decoder, i);
+   jvo->hitcount_info++;
+--- harvid-0.8.0.orig/libharvid/ffdecoder.c
 harvid-0.8.0/libharvid/ffdecoder.c
+@@ -103,7 +103,7 @@ static int 

Bug#803817: gmerlin-avdecoder: FTBFS with FFmpeg 2.9

2015-11-02 Thread Andreas Cadhalpun
Package: gmerlin-avdecoder
Version: 1.2.0~dfsg-5
Severity: important
Tags: patch
User: pkg-multimedia-maintainers@lists.alioth.debian.org
Usertags: ffmpeg2.9

Dear Maintainer,

your package fails to build with the upcoming ffmpeg 2.9.
This bug will become release-critical at some point when the
ffmpeg2.9 transition gets closer.

Attached is a patch replacing the deprecated functionality.
It also works with ffmpeg 2.8.
Please apply this patch and forward it upstream, if necessary.

These changes are non-trivial and should be runtime-tested.

Best regards,
Andreas

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 000..6d3b744
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,258 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun 
+Last-Update: <2015-11-02>
+
+--- gmerlin-avdecoder-1.2.0~dfsg.orig/lib/video_ffmpeg.c
 gmerlin-avdecoder-1.2.0~dfsg/lib/video_ffmpeg.c
+@@ -117,7 +117,7 @@ typedef struct
+ 
+   /* Pixelformat */
+   int do_convert;
+-  enum PixelFormat dst_format;
++  enum AVPixelFormat dst_format;
+ 
+   /* Real video ugliness */
+ 
+@@ -181,16 +181,15 @@ typedef struct
+   
+ #endif
+ 
+-  int b_age;
+-  int ip_age[2];
+-
+   bgav_packet_t * p;
+   
+   } ffmpeg_video_priv;
+ 
+ 
+ #ifdef HAVE_VDPAU
+-static int vdpau_get_buffer(struct AVCodecContext *c, AVFrame *pic)
++static void vdpau_dummy_free_buffer(void *opaque, uint8_t *data);
++
++static int vdpau_get_buffer(struct AVCodecContext *c, AVFrame *pic, int flags)
+   {
+   ffmpeg_video_priv * priv;
+   int i = 0;
+@@ -202,8 +201,8 @@ static int vdpau_get_buffer(struct AVCod
+ {
+ if(!priv->vdpau_states[i].used)
+   {
+-  pic->data[0] = (uint8_t*)(>vdpau_states[i]);
+-  pic->type = FF_BUFFER_TYPE_USER;
++  pic->buf[0] = av_buffer_create((uint8_t*)(>vdpau_states[i]), 0, vdpau_dummy_free_buffer, NULL, 0);
++  pic->data[0] = pic->buf[0]->data;
+   
+   //  pic->age = INT_MAX;
+   
+@@ -219,24 +218,6 @@ static int vdpau_get_buffer(struct AVCod
+   //  priv->vdpau_states[i].state.surface);
+   }
+ }
+-  if(pic->reference)
+-{
+-#if LIBAVCODEC_VERSION_INT < ((53<<16)|(28<<8)|1)
+-pic->age= priv->ip_age[0];
+-#endif
+-priv->ip_age[0]= priv->ip_age[1]+1;
+-priv->ip_age[1]= 1;
+-priv->b_age++;
+-}
+-  else
+-{
+-#if LIBAVCODEC_VERSION_INT < ((53<<16)|(28<<8)|1)
+-pic->age= priv->b_age;
+-#endif
+-priv->ip_age[0]++;
+-priv->ip_age[1]++;
+-priv->b_age=1;
+-}
+   priv->vdpau_states[i].used = 1;
+   return 0;
+   }
+@@ -245,10 +226,9 @@ static int vdpau_get_buffer(struct AVCod
+   return -1;
+   }
+ 
+-static void vdpau_release_buffer(struct AVCodecContext *avctx, AVFrame *pic)
++static void vdpau_dummy_free_buffer(void *opaque, uint8_t *data)
+   {
+-  vdpau_state_t * state = (vdpau_state_t *)pic->data[0];
+-  pic->data[0] = NULL;
++  vdpau_state_t * state = (vdpau_state_t *)data;
+   state->used = 0;
+   }
+ 
+@@ -273,7 +253,7 @@ static void vdpau_draw_horiz_band(struct
+ state->bitstream_buffers);
+   }
+ 
+-static enum PixelFormat vdpau_get_format(struct AVCodecContext *s, const enum PixelFormat *fmt)
++static enum AVPixelFormat vdpau_get_format(struct AVCodecContext *s, const enum AVPixelFormat *fmt)
+   {
+   return *fmt;
+   }
+@@ -785,8 +765,7 @@ static int init_vdpau(bgav_stream_t * s,
+   if(priv->vdpau_decoder == VDP_INVALID_HANDLE)
+ goto fail;
+   
+-  priv->ctx->get_buffer  = vdpau_get_buffer;
+-  priv->ctx->release_buffer  = vdpau_release_buffer;
++  priv->ctx->get_buffer2  = vdpau_get_buffer;
+   priv->ctx->draw_horiz_band = vdpau_draw_horiz_band;
+   priv->ctx->get_format  = vdpau_get_format;
+   
+@@ -822,10 +801,6 @@ static int init_ffmpeg(bgav_stream_t * s
+   priv = calloc(1, sizeof(*priv));
+   priv->skip_time = BGAV_TIMESTAMP_UNDEFINED;
+ 
+-  priv->ip_age[0] = 256*256*256*64;
+-  priv->ip_age[1] = 256*256*256*64;
+-  priv->b_age = 256*256*256*64;
+-  
+   s->data.video.decoder->priv = priv;
+   
+   /* Set up coded specific details */
+@@ -934,7 +909,7 @@ static int init_ffmpeg(bgav_stream_t * s
+   
+   //  bgav_hexdump(s->ext_data, s->ext_size, 16);
+   
+-  priv->frame = avcodec_alloc_frame();
++  priv->frame = av_frame_alloc();
+   priv->gavl_frame = gavl_video_frame_create(NULL);
+   
+   /* Some codecs need extra stuff */
+@@ -1032,7 +1007,7 @@ static int init_ffmpeg(bgav_stream_t * s
+ {
+ s->data.video.format.pixelformat = GAVL_YUV_420_P;
+ priv->do_convert = 1;
+-priv->dst_format = PIX_FMT_YUV420P;
++priv->dst_format = AV_PIX_FMT_YUV420P;
+ 
+ #ifdef HAVE_LIBSWSCALE
+ priv->swsContext =
+@@ -1073,10 +1048,6 @@ static void resync_ffmpeg(bgav_stream_t
+   priv = s->data.video.decoder->priv;
+   

Bug#803864: transcode: FTBFS with FFmpeg 2.9

2015-11-02 Thread Andreas Cadhalpun
Package: transcode
Version: 1.1.7-9
Severity: important
Tags: patch
User: pkg-multimedia-maintainers@lists.alioth.debian.org
Usertags: ffmpeg2.9

Dear Maintainer,

your package fails to build with the upcoming ffmpeg 2.9.
This bug will become release-critical at some point when the
ffmpeg2.9 transition gets closer.

Attached is a patch replacing the deprecated functionality.
It also works with ffmpeg 2.8.
Please apply this patch and forward it upstream, if necessary.

These changes are non-trivial and should be runtime-tested.

Best regards,
Andreas

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 000..ae2c141
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,433 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun 
+Last-Update: <2015-11-02>
+
+--- transcode-1.1.7.orig/encode/encode_lavc.c
 transcode-1.1.7/encode/encode_lavc.c
+@@ -233,7 +233,7 @@ static void pre_encode_video_yuv420p(TCL
+  vframe_list_t *vframe)
+ {
+ avpicture_fill((AVPicture *)>ff_venc_frame, vframe->video_buf,
+-PIX_FMT_YUV420P,
++AV_PIX_FMT_YUV420P,
+ pd->ff_vcontext.width, pd->ff_vcontext.height);
+ }
+ 
+@@ -247,7 +247,7 @@ static void pre_encode_video_yuv420p_huf
+ IMG_YUV_DEFAULT,
+ pd->ff_vcontext.width, pd->ff_vcontext.height);
+ avpicture_fill((AVPicture *)>ff_venc_frame, pd->vframe_buf->video_buf,
+-   PIX_FMT_YUV422P,
++   AV_PIX_FMT_YUV422P,
+pd->ff_vcontext.width, pd->ff_vcontext.height);
+ ac_imgconvert(src, IMG_YUV_DEFAULT,
+   pd->ff_venc_frame.data, IMG_YUV422P,
+@@ -263,7 +263,7 @@ static void pre_encode_video_yuv422p(TCL
+ IMG_YUV422P,
+ pd->ff_vcontext.width, pd->ff_vcontext.height);
+ avpicture_fill((AVPicture *)>ff_venc_frame, pd->vframe_buf->video_buf,
+-   PIX_FMT_YUV420P,
++   AV_PIX_FMT_YUV420P,
+pd->ff_vcontext.width, pd->ff_vcontext.height);
+ ac_imgconvert(src, IMG_YUV422P,
+   pd->ff_venc_frame.data, IMG_YUV420P,
+@@ -275,7 +275,7 @@ static void pre_encode_video_yuv422p_huf
+  vframe_list_t *vframe)
+ {
+ avpicture_fill((AVPicture *)>ff_venc_frame, vframe->video_buf,
+-   PIX_FMT_YUV422P,
++   AV_PIX_FMT_YUV422P,
+pd->ff_vcontext.width, pd->ff_vcontext.height);
+ 
+ }
+@@ -285,7 +285,7 @@ static void pre_encode_video_rgb24(TCLav
+vframe_list_t *vframe)
+ {
+ avpicture_fill((AVPicture *)>ff_venc_frame, pd->vframe_buf->video_buf,
+-   PIX_FMT_YUV420P,
++   AV_PIX_FMT_YUV420P,
+pd->ff_vcontext.width, pd->ff_vcontext.height);
+ ac_imgconvert(>video_buf, IMG_RGB_DEFAULT,
+   pd->ff_venc_frame.data, IMG_YUV420P,
+@@ -610,21 +610,21 @@ static int tc_lavc_set_pix_fmt(TCLavcPri
+   case CODEC_YUV:
+ if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) {
+ pd->tc_pix_fmt = TC_CODEC_YUV422P;
+-pd->ff_vcontext.pix_fmt = PIX_FMT_YUV422P;
++pd->ff_vcontext.pix_fmt = AV_PIX_FMT_YUV422P;
+ pd->pre_encode_video = pre_encode_video_yuv420p_huffyuv;
+ } else {
+ pd->tc_pix_fmt = TC_CODEC_YUV420P;
+ pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) 
+-   ? PIX_FMT_YUVJ420P
+-   : PIX_FMT_YUV420P;
++   ? AV_PIX_FMT_YUVJ420P
++   : AV_PIX_FMT_YUV420P;
+ pd->pre_encode_video = pre_encode_video_yuv420p;
+ }
+ break;
+   case CODEC_YUV422:
+ pd->tc_pix_fmt = TC_CODEC_YUV422P;
+ pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) 
+-   ? PIX_FMT_YUVJ422P
+-   : PIX_FMT_YUV422P;
++   ? AV_PIX_FMT_YUVJ422P
++   : AV_PIX_FMT_YUV422P;
+ if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) {
+ pd->pre_encode_video = pre_encode_video_yuv422p_huffyuv;
+ } else {
+@@ -634,10 +634,10 @@ static int tc_lavc_set_pix_fmt(TCLavcPri
+   case CODEC_RGB:
+ pd->tc_pix_fmt = TC_CODEC_RGB;
+ pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV)
+-? PIX_FMT_YUV422P
++? AV_PIX_FMT_YUV422P
+ : (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) 
+-   ? PIX_FMT_YUVJ420P
+- 

Bug#803860: shotdetect: FTBFS with FFmpeg 2.9

2015-11-02 Thread Andreas Cadhalpun
Package: shotdetect
Version: 1.0.86-4
Severity: important
Tags: patch
User: pkg-multimedia-maintainers@lists.alioth.debian.org
Usertags: ffmpeg2.9

Dear Maintainer,

your package fails to build with the upcoming ffmpeg 2.9.
This bug will become release-critical at some point when the
ffmpeg2.9 transition gets closer.

Attached is a patch replacing the deprecated functionality.
It also works with ffmpeg 2.8.
Please apply this patch and forward it upstream, if necessary.

These changes have little regression potential.

Best regards,
Andreas

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 000..5a75ef0
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,68 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun 
+Last-Update: <2015-11-02>
+
+--- shotdetect-1.0.86.orig/src/film.cpp
 shotdetect-1.0.86/src/film.cpp
+@@ -292,14 +292,14 @@ film::process ()
+   /*
+* Allocate video frame 
+*/
+-  pFrame = avcodec_alloc_frame ();
+-  pFrameRGB = avcodec_alloc_frame ();
+-  pFrameRGBprev = avcodec_alloc_frame ();
++  pFrame = av_frame_alloc ();
++  pFrameRGB = av_frame_alloc ();
++  pFrameRGBprev = av_frame_alloc ();
+ 
+   /*
+* Determine required buffer size and allocate buffer 
+*/
+-  numBytes = avpicture_get_size (PIX_FMT_RGB24, width, height);
++  numBytes = avpicture_get_size (AV_PIX_FMT_RGB24, width, height);
+ 
+   buffer = (uint8_t *) malloc (sizeof (uint8_t) * numBytes);
+   buffer2 = (uint8_t *) malloc (sizeof (uint8_t) * numBytes);
+@@ -307,9 +307,9 @@ film::process ()
+   /*
+* Assign appropriate parts of buffer to image planes in pFrameRGB 
+*/
+-  avpicture_fill ((AVPicture *) pFrameRGB, buffer, PIX_FMT_RGB24, width, height);
++  avpicture_fill ((AVPicture *) pFrameRGB, buffer, AV_PIX_FMT_RGB24, width, height);
+ 
+-  avpicture_fill ((AVPicture *) pFrameRGBprev, buffer2, PIX_FMT_RGB24, width, height);
++  avpicture_fill ((AVPicture *) pFrameRGBprev, buffer2, AV_PIX_FMT_RGB24, width, height);
+ 
+ 
+   /*
+@@ -351,7 +351,7 @@ film::process ()
+ 	  if (! img_convert_ctx)
+ 		{
+ 		  img_convert_ctx = sws_getContext(width, height, pCodecCtx->pix_fmt,
+-		   width, height, PIX_FMT_RGB24, SWS_BICUBIC, 
++		   width, height, AV_PIX_FMT_RGB24, SWS_BICUBIC, 
+ 		   NULL, NULL, NULL);
+ 		  if (! img_convert_ctx) 
+ 		  {
+@@ -374,7 +374,7 @@ film::process ()
+ int src_width, int src_height)
+ 	  */
+ 	  /*
+-	  img_convert ((AVPicture *) pFrameRGB, PIX_FMT_RGB24, (AVPicture *) pFrame, pCodecCtx->pix_fmt, width, height);
++	  img_convert ((AVPicture *) pFrameRGB, AV_PIX_FMT_RGB24, (AVPicture *) pFrame, pCodecCtx->pix_fmt, width, height);
+ 	  */
+ 
+ this->frame_number ++;
+@@ -437,9 +437,9 @@ film::process ()
+*/
+   free (buffer);
+   free (buffer2);
+-  av_free (pFrameRGB);
+-  av_free (pFrame);
+-  av_free (pFrameRGBprev);
++  av_frame_free ();
++  av_frame_free ();
++  av_frame_free ();
+   avcodec_close (pCodecCtx);
+ }
+   /*
diff --git a/debian/patches/series b/debian/patches/series
index a9283dd..777acd1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 1004-fix_comments_and_names.patch
 
 libav10.patch
+ffmpeg_2.9.patch
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#803868: vlc: FTBFS with FFmpeg 2.9

2015-11-02 Thread Andreas Cadhalpun
Package: vlc
Version: 2.2.1-5
Severity: important
Tags: patch
User: pkg-multimedia-maintainers@lists.alioth.debian.org
Usertags: ffmpeg2.9

Dear Maintainer,

your package fails to build with the upcoming ffmpeg 2.9.
This bug will become release-critical at some point when the
ffmpeg2.9 transition gets closer.

Attached is a patch replacing the deprecated functionality.
It also works with ffmpeg 2.8.
Please apply this patch and forward it upstream, if necessary.

These changes have little regression potential.

Best regards,
Andreas

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 000..87c022a
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,520 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun 
+Last-Update: <2015-11-02>
+
+--- vlc-2.2.1.orig/modules/codec/avcodec/audio.c
 vlc-2.2.1/modules/codec/avcodec/audio.c
+@@ -39,7 +39,7 @@
+ #include 
+ #include 
+ 
+-#include 
++#include 
+ 
+ #include "avcodec.h"
+ 
+--- vlc-2.2.1.orig/modules/codec/avcodec/chroma.c
 vlc-2.2.1/modules/codec/avcodec/chroma.c
+@@ -62,77 +62,77 @@ static const struct
+ } chroma_table[] =
+ {
+ /* Planar YUV formats */
+-{VLC_CODEC_I444, PIX_FMT_YUV444P, 0, 0, 0 },
+-{VLC_CODEC_J444, PIX_FMT_YUVJ444P, 0, 0, 0 },
++{VLC_CODEC_I444, AV_PIX_FMT_YUV444P, 0, 0, 0 },
++{VLC_CODEC_J444, AV_PIX_FMT_YUVJ444P, 0, 0, 0 },
+ 
+-{VLC_CODEC_I440, PIX_FMT_YUV440P, 0, 0, 0 },
+-{VLC_CODEC_J440, PIX_FMT_YUVJ440P, 0, 0, 0 },
++{VLC_CODEC_I440, AV_PIX_FMT_YUV440P, 0, 0, 0 },
++{VLC_CODEC_J440, AV_PIX_FMT_YUVJ440P, 0, 0, 0 },
+ 
+-{VLC_CODEC_I422, PIX_FMT_YUV422P, 0, 0, 0 },
+-{VLC_CODEC_J422, PIX_FMT_YUVJ422P, 0, 0, 0 },
++{VLC_CODEC_I422, AV_PIX_FMT_YUV422P, 0, 0, 0 },
++{VLC_CODEC_J422, AV_PIX_FMT_YUVJ422P, 0, 0, 0 },
+ 
+-{VLC_CODEC_I420, PIX_FMT_YUV420P, 0, 0, 0 },
+-{VLC_CODEC_YV12, PIX_FMT_YUV420P, 0, 0, 0 },
+-{VLC_FOURCC('I','Y','U','V'), PIX_FMT_YUV420P, 0, 0, 0 },
+-{VLC_CODEC_J420, PIX_FMT_YUVJ420P, 0, 0, 0 },
+-{VLC_CODEC_I411, PIX_FMT_YUV411P, 0, 0, 0 },
+-{VLC_CODEC_I410, PIX_FMT_YUV410P, 0, 0, 0 },
+-{VLC_FOURCC('Y','V','U','9'), PIX_FMT_YUV410P, 0, 0, 0 },
+-
+-{VLC_FOURCC('N','V','1','2'), PIX_FMT_NV12, 0, 0, 0 },
+-{VLC_FOURCC('N','V','2','1'), PIX_FMT_NV21, 0, 0, 0 },
+-
+-{VLC_CODEC_I420_9L, PIX_FMT_YUV420P9LE, 0, 0, 0 },
+-{VLC_CODEC_I420_9B, PIX_FMT_YUV420P9BE, 0, 0, 0 },
+-{VLC_CODEC_I420_10L, PIX_FMT_YUV420P10LE, 0, 0, 0 },
+-{VLC_CODEC_I420_10B, PIX_FMT_YUV420P10BE, 0, 0, 0 },
++{VLC_CODEC_I420, AV_PIX_FMT_YUV420P, 0, 0, 0 },
++{VLC_CODEC_YV12, AV_PIX_FMT_YUV420P, 0, 0, 0 },
++{VLC_FOURCC('I','Y','U','V'), AV_PIX_FMT_YUV420P, 0, 0, 0 },
++{VLC_CODEC_J420, AV_PIX_FMT_YUVJ420P, 0, 0, 0 },
++{VLC_CODEC_I411, AV_PIX_FMT_YUV411P, 0, 0, 0 },
++{VLC_CODEC_I410, AV_PIX_FMT_YUV410P, 0, 0, 0 },
++{VLC_FOURCC('Y','V','U','9'), AV_PIX_FMT_YUV410P, 0, 0, 0 },
++
++{VLC_FOURCC('N','V','1','2'), AV_PIX_FMT_NV12, 0, 0, 0 },
++{VLC_FOURCC('N','V','2','1'), AV_PIX_FMT_NV21, 0, 0, 0 },
++
++{VLC_CODEC_I420_9L, AV_PIX_FMT_YUV420P9LE, 0, 0, 0 },
++{VLC_CODEC_I420_9B, AV_PIX_FMT_YUV420P9BE, 0, 0, 0 },
++{VLC_CODEC_I420_10L, AV_PIX_FMT_YUV420P10LE, 0, 0, 0 },
++{VLC_CODEC_I420_10B, AV_PIX_FMT_YUV420P10BE, 0, 0, 0 },
+ #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,13,0)
+-{VLC_CODEC_I422_9L, PIX_FMT_YUV422P9LE, 0, 0, 0 },
+-{VLC_CODEC_I422_9B, PIX_FMT_YUV422P9BE, 0, 0, 0 },
++{VLC_CODEC_I422_9L, AV_PIX_FMT_YUV422P9LE, 0, 0, 0 },
++{VLC_CODEC_I422_9B, AV_PIX_FMT_YUV422P9BE, 0, 0, 0 },
+ #endif
+-{VLC_CODEC_I422_10L, PIX_FMT_YUV422P10LE, 0, 0, 0 },
+-{VLC_CODEC_I422_10B, PIX_FMT_YUV422P10BE, 0, 0, 0 },
++{VLC_CODEC_I422_10L, AV_PIX_FMT_YUV422P10LE, 0, 0, 0 },
++{VLC_CODEC_I422_10B, AV_PIX_FMT_YUV422P10BE, 0, 0, 0 },
+ 
+-{VLC_CODEC_YUV420A, PIX_FMT_YUVA420P, 0, 0, 0 },
++{VLC_CODEC_YUV420A, AV_PIX_FMT_YUVA420P, 0, 0, 0 },
+ #if LIBAVUTIL_VERSION_CHECK( 51, 45, 0, 74, 100 )
+ {VLC_CODEC_YUV422A, AV_PIX_FMT_YUVA422P, 0, 0, 0 },
+ #endif
+ 
+-{VLC_CODEC_I444_9L, PIX_FMT_YUV444P9LE, 0, 0, 0 },
+-{VLC_CODEC_I444_9B, PIX_FMT_YUV444P9BE, 0, 0, 0 },
+-{VLC_CODEC_I444_10L, PIX_FMT_YUV444P10LE, 0, 0, 0 },
+-{VLC_CODEC_I444_10B, PIX_FMT_YUV444P10BE, 0, 0, 0 },
+-{VLC_CODEC_I444_16L, PIX_FMT_YUV444P16LE, 0, 0, 0 },
+-{VLC_CODEC_I444_16B, PIX_FMT_YUV444P16BE, 0, 0, 0 },
++{VLC_CODEC_I444_9L, AV_PIX_FMT_YUV444P9LE, 0, 0, 0 },
++{VLC_CODEC_I444_9B, AV_PIX_FMT_YUV444P9BE, 0, 0, 0 },
++{VLC_CODEC_I444_10L, AV_PIX_FMT_YUV444P10LE, 0, 0, 0 },
++{VLC_CODEC_I444_10B, AV_PIX_FMT_YUV444P10BE, 0, 0, 0 },
++{VLC_CODEC_I444_16L, AV_PIX_FMT_YUV444P16LE, 0, 0, 0 },
++{VLC_CODEC_I444_16B, AV_PIX_FMT_YUV444P16BE, 0, 0, 0 },
+ 
+ /* Packed YUV formats */
+-{VLC_CODEC_YUYV, PIX_FMT_YUYV422, 

Re: upcoming ffmpeg transition

2015-11-02 Thread Andreas Cadhalpun
On 02.11.2015 18:58, Felipe Sateler wrote:
> On 2 November 2015 at 14:40, Andreas Cadhalpun
>  wrote:
>> On 02.11.2015 00:57, Felipe Sateler wrote:
>>> On 1 November 2015 at 19:51, Andreas Cadhalpun
>>>  wrote:

 building:   30
 simple changes: 61
 complex changes:21
 --
 total: 112
>>>
>>> How did you come up with those numbers? Did you actually make a patch for 
>>> each??
>>
>> Yes, of course. That's the only way to get accurate numbers. ;)
> 
> Excellent. That makes the transition much smoother.

I've filed the bugs now (except for taoframework). [1]

 I'll file bug reports for the affected packages with:
 User: pkg-multimedia-maintainers@lists.alioth.debian.org
 Usertags: ffmpeg2.9
>>>
>>> Do the required changes work already? IOW, if a patch is applied can
>>> it build with ffmpeg 2.8?
>>
>> Yes, the only exception is, as always, taoframework with its hardcoded 
>> SONAMEs.
> 
> Ugh. Feel free to ping me for NMUs if packages are not updated in time
> for the transition.

Thanks for the offer. Considering the number of affected packages, NMUs will 
likely
be necessary.

Best regards,
Andreas


1: 
https://bugs.debian.org/cgi-bin/pkgreport.cgi?users=pkg-multimedia-maintainers%40lists.alioth.debian.org;tag=ffmpeg2.9

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers


Bug#803836: libquicktime: FTBFS with FFmpeg 2.9

2015-11-02 Thread Andreas Cadhalpun
Package: libquicktime
Version: 1.2.4-7
Severity: important
Tags: patch
User: pkg-multimedia-maintainers@lists.alioth.debian.org
Usertags: ffmpeg2.9

Dear Maintainer,

your package fails to build with the upcoming ffmpeg 2.9.
This bug will become release-critical at some point when the
ffmpeg2.9 transition gets closer.

Attached is a patch replacing the deprecated functionality.
It also works with ffmpeg 2.8.
Please apply this patch and forward it upstream, if necessary.

These changes have little regression potential.

Best regards,
Andreas

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 000..bb3bc6d
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,343 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun 
+Last-Update: <2015-11-02>
+
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c
 libquicktime-1.2.4/plugins/ffmpeg/audio.c
+@@ -1267,7 +1267,7 @@ static int lqt_ffmpeg_encode_audio(quick
+ pkt.data = codec->chunk_buffer;
+ pkt.size = codec->chunk_buffer_alloc;
+ 
+-avcodec_get_frame_defaults();
++av_frame_unref();
+ f.nb_samples = codec->avctx->frame_size;
+ 
+ avcodec_fill_audio_frame(, channels, codec->avctx->sample_fmt,
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c
 libquicktime-1.2.4/plugins/ffmpeg/params.c
+@@ -158,7 +158,6 @@ enum_t coder_type[] =
+ { "Arithmetic",   FF_CODER_TYPE_AC },
+ { "Raw",  FF_CODER_TYPE_RAW },
+ { "RLE",  FF_CODER_TYPE_RLE },
+-{ "Deflate",  FF_CODER_TYPE_DEFLATE },
+   };
+ 
+ #define PARAM_ENUM(name, var, arr) \
+@@ -253,15 +252,13 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
+   PARAM_INT("ff_me_penalty_compensation",me_penalty_compensation);
+   PARAM_INT("ff_bidir_refine",bidir_refine);
+   PARAM_INT("ff_brd_scale",brd_scale);
+-  PARAM_INT("ff_scenechange_factor",scenechange_factor);
+   PARAM_FLAG("ff_flag_qscale",CODEC_FLAG_QSCALE);
+   PARAM_FLAG("ff_flag_4mv",CODEC_FLAG_4MV);
+   PARAM_FLAG("ff_flag_qpel",CODEC_FLAG_QPEL);
+-  PARAM_FLAG("ff_flag_gmc",CODEC_FLAG_GMC);
++  PARAM_DICT_FLAG("ff_flag_gmc", "gmc");
+   PARAM_FLAG("ff_flag_mv0",CODEC_FLAG_MV0);
+   //  PARAM_FLAG("ff_flag_part",CODEC_FLAG_PART); // Unused
+   PARAM_FLAG("ff_flag_gray",CODEC_FLAG_GRAY);
+-  PARAM_FLAG("ff_flag_emu_edge",CODEC_FLAG_EMU_EDGE);
+   PARAM_FLAG("ff_flag_normalize_aqp",CODEC_FLAG_NORMALIZE_AQP);
+   //  PARAM_FLAG("ff_flag_alt_scan",CODEC_FLAG_ALT_SCAN); // Unused
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/params.h
 libquicktime-1.2.4/plugins/ffmpeg/params.h
+@@ -149,7 +149,7 @@ the reference. Unused for constant quant
+ .type =LQT_PARAMETER_INT, \
+ .val_default = { .val_int = 0 }, \
+ .val_min = { .val_int = 0 }, \
+-.val_max = { .val_int = FF_MAX_B_FRAMES }, \
++.val_max = { .val_int = INT_MAX }, \
+ .help_string = TRS("Maximum number of B-frames between non B-frames") \
+   }
+ 
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c
 libquicktime-1.2.4/plugins/ffmpeg/video.c
+@@ -37,10 +37,10 @@
+ #endif
+ 
+ 
+-#ifdef  PIX_FMT_YUV422P10
+-#define PIX_FMT_YUV422P10_OR_DUMMY PIX_FMT_YUV422P10
++#ifdef  AV_PIX_FMT_YUV422P10
++#define AV_PIX_FMT_YUV422P10_OR_DUMMY AV_PIX_FMT_YUV422P10
+ #else
+-#define PIX_FMT_YUV422P10_OR_DUMMY -1234
++#define AV_PIX_FMT_YUV422P10_OR_DUMMY -1234
+ #endif
+ 
+ #if LIBAVCODEC_VERSION_INT >= ((54<<16)|(1<<8)|0)
+@@ -90,9 +90,9 @@ typedef struct
+   int imx_bitrate;
+   int imx_strip_vbi;
+ 
+-  /* In some cases FFMpeg would report something like PIX_FMT_YUV422P, while
+- we would like to treat it as PIX_FMT_YUVJ422P. It's only used for decoding */
+-  enum PixelFormat reinterpret_pix_fmt;
++  /* In some cases FFMpeg would report something like AV_PIX_FMT_YUV422P, while
++ we would like to treat it as AV_PIX_FMT_YUVJ422P. It's only used for decoding */
++  enum AVPixelFormat reinterpret_pix_fmt;
+   
+   int is_imx;
+   int y_offset;
+@@ -137,42 +137,42 @@ typedef struct
+ 
+ static const struct
+   {
+-  enum PixelFormat ffmpeg_id;
++  enum AVPixelFormat ffmpeg_id;
+   int  lqt_id;
+   int  exact;
+   }
+ colormodels[] =
+   {
+-{ PIX_FMT_YUV420P,   BC_YUV420P,   1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples)
++{ AV_PIX_FMT_YUV420P,   BC_YUV420P,   1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples)
+ #if LIBAVUTIL_VERSION_INT < (50<<16)
+-{ PIX_FMT_YUV422,BC_YUV422,1 },
++{ AV_PIX_FMT_YUV422,BC_YUV422,1 },
+ #else
+-{ PIX_FMT_YUYV422,   BC_YUV422,1 },
++{ AV_PIX_FMT_YUYV422,   BC_YUV422,1 },
+ #endif
+-{ PIX_FMT_RGB24, BC_RGB888,1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB...
+-{ PIX_FMT_BGR24, BC_BGR888,1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR...
+-{ 

Bug#803834: libde265: FTBFS with FFmpeg 2.9

2015-11-02 Thread Andreas Cadhalpun
Package: libde265
Version: 1.0.2-1
Severity: important
Tags: patch
User: pkg-multimedia-maintainers@lists.alioth.debian.org
Usertags: ffmpeg2.9

Dear Maintainer,

your package fails to build with the upcoming ffmpeg 2.9.
This bug will become release-critical at some point when the
ffmpeg2.9 transition gets closer.

Attached is a patch replacing the deprecated functionality.
It also works with ffmpeg 2.8.
Please apply this patch and forward it upstream, if necessary.

These changes have little regression potential.

Best regards,
Andreas

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 000..5b53631
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,15 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun 
+Last-Update: <2015-11-02>
+
+--- libde265-1.0.2.orig/sherlock265/VideoDecoder.cc
 libde265-1.0.2/sherlock265/VideoDecoder.cc
+@@ -219,7 +219,7 @@ void VideoDecoder::convert_frame_swscale
+ }
+ width = img->get_width();
+ height = img->get_height();
+-sws = sws_getContext(width, height, PIX_FMT_YUV420P, width, height, PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
++sws = sws_getContext(width, height, AV_PIX_FMT_YUV420P, width, height, AV_PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+   }
+ 
+   int stride[3];
diff --git a/debian/patches/series b/debian/patches/series
index 2ee218a..2daa526 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 only_export_decoder_api.patch
 disable_tools.patch
+ffmpeg_2.9.patch
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#803839: lives: FTBFS with FFmpeg 2.9

2015-11-02 Thread Andreas Cadhalpun
Package: lives
Version: 2.4.0~ds0-1
Severity: important
Tags: patch
User: pkg-multimedia-maintainers@lists.alioth.debian.org
Usertags: ffmpeg2.9

Dear Maintainer,

your package fails to build with the upcoming ffmpeg 2.9.
This bug will become release-critical at some point when the
ffmpeg2.9 transition gets closer.

Attached is a patch replacing the deprecated functionality.
It also works with ffmpeg 2.8.
Please apply this patch and forward it upstream, if necessary.

These changes are non-trivial and should be runtime-tested.

Best regards,
Andreas

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 000..2f651c4
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,265 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun 
+Last-Update: <2015-11-02>
+
+--- lives-2.4.0~ds0.orig/libweed/weed-compat.h
 lives-2.4.0~ds0/libweed/weed-compat.h
+@@ -590,44 +590,44 @@ const AVCodecTag codec_bmp_tags[] = {
+ #include 
+ #endif
+ 
+-int avi_pix_fmt_to_weed_palette(enum PixelFormat pix_fmt, int *clamped) {
++int avi_pix_fmt_to_weed_palette(enum AVPixelFormat pix_fmt, int *clamped) {
+   // clamped may be set to NULL if you are not interested in the value
+ 
+   switch (pix_fmt) {
+-  case PIX_FMT_RGB24:
++  case AV_PIX_FMT_RGB24:
+   return WEED_PALETTE_RGB24;
+-  case PIX_FMT_BGR24:
++  case AV_PIX_FMT_BGR24:
+ return WEED_PALETTE_BGR24;
+-  case PIX_FMT_RGBA:
++  case AV_PIX_FMT_RGBA:
+ return WEED_PALETTE_RGBA32;
+-  case PIX_FMT_BGRA:
++  case AV_PIX_FMT_BGRA:
+ return WEED_PALETTE_BGRA32;
+-  case PIX_FMT_ARGB:
++  case AV_PIX_FMT_ARGB:
+ return WEED_PALETTE_ARGB32;
+-  case PIX_FMT_YUV444P:
++  case AV_PIX_FMT_YUV444P:
+ return WEED_PALETTE_YUV444P;
+-  case PIX_FMT_YUV422P:
++  case AV_PIX_FMT_YUV422P:
+ return WEED_PALETTE_YUV422P;
+-  case PIX_FMT_YUV420P:
++  case AV_PIX_FMT_YUV420P:
+ return WEED_PALETTE_YUV420P;
+-  case PIX_FMT_YUYV422:
++  case AV_PIX_FMT_YUYV422:
+ return WEED_PALETTE_YUYV;
+-  case PIX_FMT_UYVY422:
++  case AV_PIX_FMT_UYVY422:
+ return WEED_PALETTE_UYVY;
+-  case PIX_FMT_UYYVYY411:
++  case AV_PIX_FMT_UYYVYY411:
+ return WEED_PALETTE_YUV411;
+-  case PIX_FMT_GRAY8:
++  case AV_PIX_FMT_GRAY8:
+ return WEED_PALETTE_A8;
+-  case PIX_FMT_MONOWHITE:
+-  case PIX_FMT_MONOBLACK:
++  case AV_PIX_FMT_MONOWHITE:
++  case AV_PIX_FMT_MONOBLACK:
+ return WEED_PALETTE_A1;
+-  case PIX_FMT_YUVJ422P:
++  case AV_PIX_FMT_YUVJ422P:
+ if (clamped) *clamped=WEED_YUV_CLAMPING_UNCLAMPED;
+ return WEED_PALETTE_YUV422P;
+-  case PIX_FMT_YUVJ444P:
++  case AV_PIX_FMT_YUVJ444P:
+ if (clamped) *clamped=WEED_YUV_CLAMPING_UNCLAMPED;
+ return WEED_PALETTE_YUV444P;
+-  case PIX_FMT_YUVJ420P:
++  case AV_PIX_FMT_YUVJ420P:
+ if (clamped) *clamped=WEED_YUV_CLAMPING_UNCLAMPED;
+ return WEED_PALETTE_YUV420P;
+ 
+@@ -639,48 +639,48 @@ int avi_pix_fmt_to_weed_palette(enum Pix
+ 
+ 
+ 
+-enum PixelFormat weed_palette_to_avi_pix_fmt(int pal, int *clamped) {
++enum AVPixelFormat weed_palette_to_avi_pix_fmt(int pal, int *clamped) {
+ 
+   switch (pal) {
+   case WEED_PALETTE_RGB24:
+-  return PIX_FMT_RGB24;
++  return AV_PIX_FMT_RGB24;
+   case WEED_PALETTE_BGR24:
+-return PIX_FMT_BGR24;
++return AV_PIX_FMT_BGR24;
+   case WEED_PALETTE_RGBA32:
+-return PIX_FMT_RGBA;
++return AV_PIX_FMT_RGBA;
+   case WEED_PALETTE_BGRA32:
+-return PIX_FMT_BGRA;
++return AV_PIX_FMT_BGRA;
+   case WEED_PALETTE_ARGB32:
+-return PIX_FMT_ARGB;
++return AV_PIX_FMT_ARGB;
+   case WEED_PALETTE_YUV444P:
+ if (clamped && *clamped==WEED_YUV_CLAMPING_UNCLAMPED)
+-  return PIX_FMT_YUVJ444P;
+-return PIX_FMT_YUV444P;
++  return AV_PIX_FMT_YUVJ444P;
++return AV_PIX_FMT_YUV444P;
+   case WEED_PALETTE_YUV422P:
+ if (clamped && *clamped==WEED_YUV_CLAMPING_UNCLAMPED)
+-  return PIX_FMT_YUVJ422P;
+-return PIX_FMT_YUV422P;
++  return AV_PIX_FMT_YUVJ422P;
++return AV_PIX_FMT_YUV422P;
+   case WEED_PALETTE_YUV420P:
+ if (clamped && *clamped==WEED_YUV_CLAMPING_UNCLAMPED)
+-  return PIX_FMT_YUVJ420P;
+-return PIX_FMT_YUV420P;
++  return AV_PIX_FMT_YUVJ420P;
++return AV_PIX_FMT_YUV420P;
+   case WEED_PALETTE_YUYV:
+-return PIX_FMT_YUYV422;
++return AV_PIX_FMT_YUYV422;
+   case WEED_PALETTE_UYVY:
+-return PIX_FMT_UYVY422;
++return AV_PIX_FMT_UYVY422;
+   case WEED_PALETTE_YUV411:
+-return PIX_FMT_UYYVYY411;
++return AV_PIX_FMT_UYYVYY411;
+ 
+   case WEED_PALETTE_A8:
+-return PIX_FMT_GRAY8;
++return AV_PIX_FMT_GRAY8;
+   case WEED_PALETTE_A1:
+-return PIX_FMT_MONOBLACK;
++return AV_PIX_FMT_MONOBLACK;
+ 
+   default:
+-return PIX_FMT_NONE;
++return AV_PIX_FMT_NONE;
+   }
+ 
+-  return PIX_FMT_NONE;
++  return AV_PIX_FMT_NONE;
+ 
+ }
+ 
+--- lives-2.4.0~ds0.orig/lives-plugins/plugins/decoders/avformat_decoder.c
 

Bug#803875: xjadeo: FTBFS with FFmpeg 2.9

2015-11-02 Thread Andreas Cadhalpun
Package: xjadeo
Version: 0.8.4-1
Severity: important
Tags: patch
User: pkg-multimedia-maintainers@lists.alioth.debian.org
Usertags: ffmpeg2.9

Dear Maintainer,

your package fails to build with the upcoming ffmpeg 2.9.
This bug will become release-critical at some point when the
ffmpeg2.9 transition gets closer.

Attached is a patch replacing the deprecated functionality.
It also works with ffmpeg 2.8.
Please apply this patch and forward it upstream, if necessary.

These changes have little regression potential.

Best regards,
Andreas

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 000..f91ea98
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,351 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun 
+Last-Update: <2015-11-02>
+
+--- xjadeo-0.8.4.orig/src/xjadeo/display.c
 xjadeo-0.8.4/src/xjadeo/display.c
+@@ -194,8 +194,8 @@ void rgb2abgr (uint8_t *rgbabuffer, uint
+ 
+ // see xjadeo.h VideoModes
+ const vidout VO[] = {
+-	{ PIX_FMT_RGB24,   1, 		"NULL", NULLOUTPUT}, // NULL is --vo 0 -> autodetect
+-	{ PIX_FMT_BGRA32,   SUP_OPENGL,   "OpenGL",
++	{ AV_PIX_FMT_RGB24,   1, 		"NULL", NULLOUTPUT}, // NULL is --vo 0 -> autodetect
++	{ AV_PIX_FMT_BGRA32,   SUP_OPENGL,   "OpenGL",
+ #ifdef HAVE_GL
+ 		_render, _open_window, & gl_close_window,
+ 		_handle_events, _newsrc,
+@@ -209,7 +209,7 @@ const vidout VO[] = {
+ 			NULLOUTPUT
+ #endif
+ 	},
+-	{ PIX_FMT_YUV420P, SUP_LIBXV, "XV - X11 video extension",
++	{ AV_PIX_FMT_YUV420P, SUP_LIBXV, "XV - X11 video extension",
+ #if HAVE_LIBXV
+ 		_xv, _window_xv, _window_xv,
+ 		_X_events_xv, _xv, _xv,
+@@ -220,7 +220,7 @@ const vidout VO[] = {
+ 			NULLOUTPUT
+ #endif
+ 	},
+-	{ PIX_FMT_YUV420P, SUP_SDL, "SDL",
++	{ AV_PIX_FMT_YUV420P, SUP_SDL, "SDL",
+ #ifdef HAVE_SDL
+ 		_sdl, _window_sdl, _window_sdl,
+ 		_X_events_sdl, _sdl, _sdl,
+@@ -233,9 +233,9 @@ const vidout VO[] = {
+ 	},
+ 	{
+ #ifdef IMLIB2RGBA
+-		PIX_FMT_BGRA32,   SUP_IMLIB2,   "ImLib2/x11 (RGBA32)",
++		AV_PIX_FMT_BGRA32,   SUP_IMLIB2,   "ImLib2/x11 (RGBA32)",
+ #else
+-		PIX_FMT_RGB24,   SUP_IMLIB2,   "ImLib2/x11 (RGB24)",
++		AV_PIX_FMT_RGB24,   SUP_IMLIB2,   "ImLib2/x11 (RGB24)",
+ #endif
+ #if HAVE_IMLIB2
+ 		_imlib2, _window_imlib2, _window_imlib2,
+@@ -247,7 +247,7 @@ const vidout VO[] = {
+ 			NULLOUTPUT
+ #endif
+ 	},
+-	{ PIX_FMT_UYVY422,   SUP_MACOSX,   "Mac OSX - quartz",
++	{ AV_PIX_FMT_UYVY422,   SUP_MACOSX,   "Mac OSX - quartz",
+ #if defined PLATFORM_OSX && (defined __i386 || defined __ppc__)
+ 		_mac, _window_mac, _window_mac,
+ 		_X_events_mac, _mac, _mac,
+@@ -342,17 +342,17 @@ extern int ST_top;
+ #define PB_W (movie_width - 2 * PB_X)
+ 
+ #define SET_RFMT(FORMAT, POINTER, VARS, FUNC) \
+-	if ((FORMAT) == PIX_FMT_YUV420P) \
++	if ((FORMAT) == AV_PIX_FMT_YUV420P) \
+ 		(POINTER) = &_##FUNC##_YUV; \
+-	else if ((FORMAT) == PIX_FMT_UYVY422) \
++	else if ((FORMAT) == AV_PIX_FMT_UYVY422) \
+ 		(POINTER) = &_##FUNC##_YUV422; \
+-	else if ((FORMAT) == PIX_FMT_RGB24) { \
++	else if ((FORMAT) == AV_PIX_FMT_RGB24) { \
+ 		 (POINTER) = &_##FUNC##_RGB; \
+ 		VARS.bpp = 3; \
+-	} else if ((FORMAT) == PIX_FMT_RGBA32) { \
++	} else if ((FORMAT) == AV_PIX_FMT_RGBA32) { \
+ 		(POINTER) = &_##FUNC##_RGB; \
+ 		VARS.bpp = 4; \
+-	} else if ((FORMAT) == PIX_FMT_BGRA32) { \
++	} else if ((FORMAT) == AV_PIX_FMT_BGRA32) { \
+ 		(POINTER) = &_##FUNC##_RGB; \
+ 		VARS.bpp = 4; \
+ 	} else return ;
+--- xjadeo-0.8.4.orig/src/xjadeo/display_mac.c
 xjadeo-0.8.4/src/xjadeo/display_mac.c
+@@ -553,16 +553,16 @@ void window_resized_mac() {
+   }
+ 
+   switch (image_format) {
+-case PIX_FMT_RGB24:
+-case PIX_FMT_RGBA32:
++case AV_PIX_FMT_RGB24:
++case AV_PIX_FMT_RGBA32:
+ {
+   bounds = CGRectMake(dstRect.left, dstRect.top, dstRect.right-dstRect.left, dstRect.bottom-dstRect.top);
+   CreateCGContextForPort (GetWindowPort (theWindow), );
+   break;
+ }
+-case PIX_FMT_YUV420P:
+-case PIX_FMT_YUYV422:
+-case PIX_FMT_UYVY422:
++case AV_PIX_FMT_YUV420P:
++case AV_PIX_FMT_YUYV422:
++case AV_PIX_FMT_UYVY422:
+ {
+   long scale_X = FixDiv(Long2Fix(dstRect.right - dstRect.left),Long2Fix(imgRect.right));
+   long scale_Y = FixDiv(Long2Fix(dstRect.bottom - dstRect.top),Long2Fix(imgRect.bottom));
+@@ -849,16 +849,16 @@ static void flip_page(void) {
+ 
+ 
+   switch (image_format) {
+-case PIX_FMT_RGB24:
+-case PIX_FMT_RGBA32:
++case AV_PIX_FMT_RGB24:
++case AV_PIX_FMT_RGBA32:
+ {
+   CGContextDrawImage (context, bounds, image);
+ }
+ break;
+ 
+-case PIX_FMT_YUV420P:
+-case PIX_FMT_YUYV422:
+-case PIX_FMT_UYVY422:
++case AV_PIX_FMT_YUV420P:
++case AV_PIX_FMT_YUYV422:
++case AV_PIX_FMT_UYVY422:
+ {
+   OSErr qterr;
+   CodecFlags flags = 0;
+@@ -919,14 +919,14 @@ static void flip_page(void) {
+ static int draw_frame(uint8_t *src) {
+   

Bug#803872: wxsvg: FTBFS with FFmpeg 2.9

2015-11-02 Thread Andreas Cadhalpun
Package: wxsvg
Version: 1.4~dfsg-3
Severity: important
Tags: patch
User: pkg-multimedia-maintainers@lists.alioth.debian.org
Usertags: ffmpeg2.9

Dear Maintainer,

your package fails to build with the upcoming ffmpeg 2.9.
This bug will become release-critical at some point when the
ffmpeg2.9 transition gets closer.

Attached is a patch replacing the deprecated functionality.
It also works with ffmpeg 2.8.
Please apply this patch and forward it upstream, if necessary.

These changes have little regression potential.

Best regards,
Andreas

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 000..4f55464
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,15 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun 
+Last-Update: <2015-11-02>
+
+--- wxsvg-1.4~dfsg.orig/src/mediadec_ffmpeg.cpp
 wxsvg-1.4~dfsg/src/mediadec_ffmpeg.cpp
+@@ -265,7 +265,7 @@ wxImage wxFfmpegMediaDecoder::GetNextFra
+ 			avcodec_decode_video2(m_codecCtx, m_frame, , );
+ 			if (frameFinished) {
+ SwsContext* imgConvertCtx = sws_getContext(m_codecCtx->width, m_codecCtx->height, m_codecCtx->pix_fmt,
+-		m_width, m_height, PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
++		m_width, m_height, AV_PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
+ if (imgConvertCtx == NULL)
+ 	return wxImage();
+ 
diff --git a/debian/patches/series b/debian/patches/series
index ee77a31..f6aab62 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 libav10.patch
+ffmpeg_2.9.patch
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#803804: cantata: FTBFS with FFmpeg 2.9

2015-11-02 Thread Andreas Cadhalpun
Package: cantata
Version: 1.5.2.ds2-2
Severity: important
Tags: patch
User: pkg-multimedia-maintainers@lists.alioth.debian.org
Usertags: ffmpeg2.9

Dear Maintainer,

your package fails to build with the upcoming ffmpeg 2.9.
This bug will become release-critical at some point when the
ffmpeg2.9 transition gets closer.

Attached is a patch replacing the deprecated functionality.
It also works with ffmpeg 2.8.
Please apply this patch and forward it upstream, if necessary.

These changes have little regression potential.

Best regards,
Andreas

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 000..5f025fe
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,15 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun 
+Last-Update: <2015-11-02>
+
+--- cantata-1.5.2.ds2.orig/replaygain/ffmpeginput.cpp
 cantata-1.5.2.ds2/replaygain/ffmpeginput.cpp
+@@ -21,7 +21,7 @@ extern "C" {
+ #include 
+ #include 
+ #if LIBAVFORMAT_VERSION_MAJOR >= 54
+-#include 
++#include 
+ #endif
+ #ifdef __cplusplus
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 381f209..2844f70 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 #playeradaptor.patch
 ebur128-location.patch
 libmusicbrainz5cc.patch
+ffmpeg_2.9.patch
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#803803: blender: FTBFS with FFmpeg 2.9

2015-11-02 Thread Andreas Cadhalpun
Package: blender
Version: 2.74+dfsg0-4
Severity: important
Tags: patch
User: pkg-multimedia-maintainers@lists.alioth.debian.org
Usertags: ffmpeg2.9

Dear Maintainer,

your package fails to build with the upcoming ffmpeg 2.9.
This bug will become release-critical at some point when the
ffmpeg2.9 transition gets closer.

Attached is a patch replacing the deprecated functionality.
It also works with ffmpeg 2.8.
Please apply this patch and forward it upstream, if necessary.

These changes are non-trivial and should be runtime-tested.

Best regards,
Andreas

diff --git a/debian/control b/debian/control
index 93a843a..e23485b 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends: autotools-dev,
libavcodec-dev (>> 6:10),
libavdevice-dev,
libavformat-dev,
+   libavfilter-dev,
libboost-dev,
libboost-filesystem-dev,
libboost-locale-dev,
diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 000..0f1ff1c
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,668 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun 
+Last-Update: <2015-11-02>
+
+--- blender-2.74+dfsg0.orig/CMakeLists.txt
 blender-2.74+dfsg0/CMakeLists.txt
+@@ -892,7 +892,7 @@ if(UNIX AND NOT APPLE)
+ 
+ 	if(WITH_CODEC_FFMPEG)
+ 		set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
+-		set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
++		set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale avfilter CACHE STRING "FFMPEG Libraries")
+ 
+ 		mark_as_advanced(FFMPEG)
+ 
+--- blender-2.74+dfsg0.orig/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
 blender-2.74+dfsg0/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
+@@ -58,9 +58,9 @@ int AUD_FFMPEGReader::decode(AVPacket& p
+ 		got_frame = 0;
+ 
+ 		if(!frame)
+-			frame = avcodec_alloc_frame();
++			frame = av_frame_alloc();
+ 		else
+-			avcodec_get_frame_defaults(frame);
++			av_frame_unref(frame);
+ 
+ 		read_length = avcodec_decode_audio4(m_codecCtx, frame, _frame, );
+ 		if(read_length < 0)
+--- blender-2.74+dfsg0.orig/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
 blender-2.74+dfsg0/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
+@@ -202,7 +202,7 @@ AUD_FFMPEGWriter::AUD_FFMPEGWriter(std::
+ 			m_frame = av_frame_alloc();
+ 			if (!m_frame)
+ AUD_THROW(AUD_ERROR_FFMPEG, codec_error);
+-			avcodec_get_frame_defaults(m_frame);
++			av_frame_unref(m_frame);
+ 			m_frame->linesize[0]= m_input_size * samplesize;
+ 			m_frame->format = m_codecCtx->sample_fmt;
+ 			m_frame->nb_samples = m_input_size;
+--- blender-2.74+dfsg0.orig/source/blender/blenkernel/intern/writeffmpeg.c
 blender-2.74+dfsg0/source/blender/blenkernel/intern/writeffmpeg.c
+@@ -133,8 +133,8 @@ static int write_audio_frame(void)
+ 	audio_time += (double) audio_input_samples / (double) c->sample_rate;
+ 
+ #ifdef FFMPEG_HAVE_ENCODE_AUDIO2
+-	frame = avcodec_alloc_frame();
+-	avcodec_get_frame_defaults(frame);
++	frame = av_frame_alloc();
++	av_frame_unref(frame);
+ 	frame->pts = audio_time / av_q2d(c->time_base);
+ 	frame->nb_samples = audio_input_samples;
+ 	frame->format = c->sample_fmt;
+@@ -167,7 +167,7 @@ static int write_audio_frame(void)
+ 	}
+ 
+ 	if (!got_output) {
+-		avcodec_free_frame();
++		av_frame_free();
+ 		return 0;
+ 	}
+ #else
+@@ -197,7 +197,7 @@ static int write_audio_frame(void)
+ 		if (av_interleaved_write_frame(outfile, ) != 0) {
+ 			fprintf(stderr, "Error writing audio packet!\n");
+ 			if (frame)
+-avcodec_free_frame();
++av_frame_free();
+ 			return -1;
+ 		}
+ 
+@@ -205,7 +205,7 @@ static int write_audio_frame(void)
+ 	}
+ 
+ 	if (frame)
+-		avcodec_free_frame();
++		av_frame_free();
+ 
+ 	return 0;
+ }
+@@ -219,7 +219,7 @@ static AVFrame *alloc_picture(int pix_fm
+ 	int size;
+ 	
+ 	/* allocate space for the struct */
+-	f = avcodec_alloc_frame();
++	f = av_frame_alloc();
+ 	if (!f) return NULL;
+ 	size = avpicture_get_size(pix_fmt, width, height);
+ 	/* allocate the actual picture buffer */
+@@ -358,8 +358,8 @@ static AVFrame *generate_video_frame(uin
+ 	int height = c->height;
+ 	AVFrame *rgb_frame;
+ 
+-	if (c->pix_fmt != PIX_FMT_BGR32) {
+-		rgb_frame = alloc_picture(PIX_FMT_BGR32, width, height);
++	if (c->pix_fmt != AV_PIX_FMT_BGR32) {
++		rgb_frame = alloc_picture(AV_PIX_FMT_BGR32, width, height);
+ 		if (!rgb_frame) {
+ 			BKE_report(reports, RPT_ERROR, "Could not allocate temporary frame");
+ 			return NULL;
+@@ -409,14 +409,14 @@ static AVFrame *generate_video_frame(uin
+ 		}
+ 	}
+ 
+-	if (c->pix_fmt != PIX_FMT_BGR32) {
++	if (c->pix_fmt != AV_PIX_FMT_BGR32) {
+ 		sws_scale(img_convert_ctx, (const uint8_t *const *) rgb_frame->data,
+ 		  rgb_frame->linesize, 0, c->height,
+ 		  current_frame->data, current_frame->linesize);
+ 		delete_picture(rgb_frame);

Bug#803805: chromaprint: FTBFS with FFmpeg 2.9

2015-11-02 Thread Andreas Cadhalpun
Package: chromaprint
Version: 1.2-1
Severity: important
Tags: patch
User: pkg-multimedia-maintainers@lists.alioth.debian.org
Usertags: ffmpeg2.9

Dear Maintainer,

your package fails to build with the upcoming ffmpeg 2.9.
This bug will become release-critical at some point when the
ffmpeg2.9 transition gets closer.

Attached is a patch replacing the deprecated functionality.
It also works with ffmpeg 2.8.
Please apply this patch and forward it upstream, if necessary.

These changes have little regression potential.

Best regards,
Andreas

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 000..f5fd17e
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,44 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun 
+Last-Update: <2015-11-02>
+
+--- chromaprint-1.2.orig/examples/fpcalc.c
 chromaprint-1.2/examples/fpcalc.c
+@@ -17,10 +17,6 @@
+ #define MAX(a, b) ((a) > (b) ? (a) : (b))
+ #define MIN(a, b) ((a) < (b) ? (a) : (b))
+ 
+-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 28, 0)
+-#define avcodec_free_frame av_freep
+-#endif
+-
+ int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name, int max_length, int *duration)
+ {
+ 	int ok = 0, remaining, length, consumed, codec_ctx_opened = 0, got_frame, stream_index;
+@@ -131,7 +127,7 @@ int decode_audio_file(ChromaprintContext
+ 	remaining = max_length * codec_ctx->channels * codec_ctx->sample_rate;
+ 	chromaprint_start(chromaprint_ctx, codec_ctx->sample_rate, codec_ctx->channels);
+ 
+-	frame = avcodec_alloc_frame();
++	frame = av_frame_alloc();
+ 
+ 	while (1) {
+ 		if (av_read_frame(format_ctx, ) < 0) {
+@@ -139,7 +135,7 @@ int decode_audio_file(ChromaprintContext
+ 		}
+ 
+ 		if (packet.stream_index == stream_index) {
+-			avcodec_get_frame_defaults(frame);
++			av_frame_unref(frame);
+ 
+ 			got_frame = 0;
+ 			consumed = avcodec_decode_audio4(codec_ctx, frame, _frame, );
+@@ -196,7 +192,7 @@ finish:
+ 
+ done:
+ 	if (frame) {
+-		avcodec_free_frame();
++		av_frame_free();
+ 	}
+ 	if (dst_data[0]) {
+ 		av_freep(_data[0]);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..f762d21
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+ffmpeg_2.9.patch
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#803844: mplayer: FTBFS with FFmpeg 2.9

2015-11-02 Thread Andreas Cadhalpun
Package: mplayer
Version: 1.2-1
Severity: important
Tags: patch
User: pkg-multimedia-maintainers@lists.alioth.debian.org
Usertags: ffmpeg2.9

Dear Maintainer,

your package fails to build with the upcoming ffmpeg 2.9.
This bug will become release-critical at some point when the
ffmpeg2.9 transition gets closer.

Attached is a patch replacing the deprecated functionality.
It also works with ffmpeg 2.8.
Please apply this patch and forward it upstream, if necessary.

These changes are non-trivial and should be runtime-tested.

Best regards,
Andreas

diff --git a/debian/patches/0103_svn37447.patch b/debian/patches/0103_svn37447.patch
new file mode 100644
index 000..b511b5a
--- /dev/null
+++ b/debian/patches/0103_svn37447.patch
@@ -0,0 +1,34 @@
+From: rtogni
+Date: Fri, 14 Aug 2015 19:30:34 +
+Subject: [PATCH] Replace deprecated avctx->request_channels with
+ request_channel_layout
+
+Origin: svn://svn.mplayerhq.hu/mplayer/trunk@37447
+---
+ libmpcodecs/ad_ffmpeg.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c
+index 3abbf64..6def3bd 100644
+--- a/libmpcodecs/ad_ffmpeg.c
 b/libmpcodecs/ad_ffmpeg.c
+@@ -46,6 +46,7 @@ LIBAD_EXTERN(ffmpeg)
+ 
+ #include "libavcodec/avcodec.h"
+ #include "libavutil/dict.h"
++#include "libavutil/channel_layout.h"
+ 
+ struct adctx {
+ int last_samplerate;
+@@ -127,7 +128,7 @@ static int init(sh_audio_t *sh_audio)
+ 	lavc_context->bits_per_coded_sample = sh_audio->wf->wBitsPerSample;
+ }
+ lavc_context->channel_layout = sh_audio->channel_layout;
+-lavc_context->request_channels = audio_output_channels;
++lavc_context->request_channel_layout = av_get_default_channel_layout(audio_output_channels);
+ lavc_context->codec_tag = sh_audio->format; //FOURCC
+ lavc_context->codec_id = lavc_codec->id; // not sure if required, imho not --A'rpi
+ 
+-- 
+2.5.0
+
diff --git a/debian/patches/0104_svn37451.patch b/debian/patches/0104_svn37451.patch
new file mode 100644
index 000..7409000
--- /dev/null
+++ b/debian/patches/0104_svn37451.patch
@@ -0,0 +1,167 @@
+From: rtogni
+Date: Mon, 17 Aug 2015 21:18:31 +
+Subject: [PATCH] Replace deprecated avcodec resamples with libswresample
+ in af_lavcresample
+
+Origin: svn://svn.mplayerhq.hu/mplayer/trunk@37451
+---
+ libaf/af_lavcresample.c | 102 +++-
+ 1 file changed, 41 insertions(+), 61 deletions(-)
+
+diff --git a/libaf/af_lavcresample.c b/libaf/af_lavcresample.c
+index a69e7de..fd7fe0c 100644
+--- a/libaf/af_lavcresample.c
 b/libaf/af_lavcresample.c
+@@ -25,15 +25,20 @@
+ 
+ #include "config.h"
+ #include "af.h"
+-#include "libavcodec/avcodec.h"
+ #include "libavutil/rational.h"
++#include "libswresample/swresample.h"
++#include "libavutil/channel_layout.h"
++#include "libavutil/opt.h"
++#include "libavutil/mem.h"
++#include "libavutil/common.h"
+ 
+ // Data for specific instances of this filter
+ typedef struct af_resample_s{
+-struct AVResampleContext *avrctx;
+-int16_t *in[AF_NCH];
++struct SwrContext *swrctx;
++uint8_t *in[1];
++uint8_t *tmp[1];
+ int in_alloc;
+-int index;
++int tmp_alloc;
+ 
+ int filter_length;
+ int linear;
+@@ -70,8 +75,19 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
+ 
+ if (s->ctx_out_rate != af->data->rate || s->ctx_in_rate != data->rate || s->ctx_filter_size != s->filter_length ||
+ s->ctx_phase_shift != s->phase_shift || s->ctx_linear != s->linear || s->ctx_cutoff != s->cutoff) {
+-if(s->avrctx) av_resample_close(s->avrctx);
+-s->avrctx= av_resample_init(af->data->rate, /*in_rate*/data->rate, s->filter_length, s->phase_shift, s->linear, s->cutoff);
++swr_free(>swrctx);
++if((s->swrctx=swr_alloc()) == NULL) return AF_ERROR;
++av_opt_set_int(s->swrctx, "out_sample_rate", af->data->rate, 0);
++av_opt_set_int(s->swrctx, "in_sample_rate", data->rate, 0);
++av_opt_set_int(s->swrctx, "filter_size", s->filter_length, 0);
++av_opt_set_int(s->swrctx, "phase_shift", s->phase_shift, 0);
++av_opt_set_int(s->swrctx, "linear_interp", s->linear, 0);
++av_opt_set_double(s->swrctx, "cutoff", s->cutoff, 0);
++av_opt_set_sample_fmt(s->swrctx, "in_sample_fmt", AV_SAMPLE_FMT_S16, 0);
++av_opt_set_sample_fmt(s->swrctx, "out_sample_fmt", AV_SAMPLE_FMT_S16, 0);
++av_opt_set_int(s->swrctx, "in_channel_count", af->data->nch, 0);
++av_opt_set_int(s->swrctx, "out_channel_count", af->data->nch, 0);
++if(swr_init(s->swrctx) < 0) return AF_ERROR;
+ s->ctx_out_rate= af->data->rate;
+ s->ctx_in_rate = data->rate;
+ s->ctx_filter_size = s->filter_length;
+@@ -106,11 +122,10 @@ static void uninit(struct af_instance_s* af)
+ free(af->data->audio);
+ free(af->data);
+ if(af->setup){
+-int i;
+ af_resample_t *s = af->setup;
+-

Bug#803811: ffmpeg2theora: FTBFS with FFmpeg 2.9

2015-11-02 Thread Andreas Cadhalpun
Package: ffmpeg2theora
Version: 0.29.0~git+20140316-3
Severity: important
Tags: patch
User: pkg-multimedia-maintainers@lists.alioth.debian.org
Usertags: ffmpeg2.9

Dear Maintainer,

your package fails to build with the upcoming ffmpeg 2.9.
This bug will become release-critical at some point when the
ffmpeg2.9 transition gets closer.

Attached is a patch replacing the deprecated functionality.
It also works with ffmpeg 2.8.
Please apply this patch and forward it upstream, if necessary.

These changes are non-trivial and should be runtime-tested.

Best regards,
Andreas

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 000..9c0dfb0
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,205 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun 
+Last-Update: <2015-11-02>
+
+--- ffmpeg2theora-0.29.0~git+20140316.orig/src/avinfo.c
 ffmpeg2theora-0.29.0~git+20140316/src/avinfo.c
+@@ -178,8 +178,6 @@ void json_codec_info(FILE *output, AVCod
+ /* fake mpeg2 transport stream codec (currently not
+registered) */
+ codec_name = "mpeg2ts";
+-} else if (enc->codec_name[0] != '\0') {
+-codec_name = enc->codec_name;
+ } else {
+ /* output avi tags */
+ if(   isprint(enc->codec_tag&0xFF) && isprint((enc->codec_tag>>8)&0xFF)
+@@ -200,7 +198,7 @@ void json_codec_info(FILE *output, AVCod
+ case AVMEDIA_TYPE_VIDEO:
+ codec_name = fix_codec_name(codec_name);
+ json_add_key_value(output, "codec", (void *)codec_name, JSON_STRING, 0, indent);
+-if (enc->pix_fmt != PIX_FMT_NONE) {
++if (enc->pix_fmt != AV_PIX_FMT_NONE) {
+ json_add_key_value(output, "pixel_format", (void *)av_get_pix_fmt_name(enc->pix_fmt), JSON_STRING, 0, indent);
+ }
+ if (enc->width) {
+--- ffmpeg2theora-0.29.0~git+20140316.orig/src/ffmpeg2theora.c
 ffmpeg2theora-0.29.0~git+20140316/src/ffmpeg2theora.c
+@@ -148,13 +148,13 @@ static AVFrame *frame_alloc(int pix_fmt,
+ uint8_t *picture_buf;
+ int size;
+ 
+-picture = avcodec_alloc_frame();
++picture = av_frame_alloc();
+ if (!picture)
+ return NULL;
+ size = avpicture_get_size (pix_fmt, width, height);
+ picture_buf = av_malloc (size);
+ if (!picture_buf) {
+-av_free (picture);
++av_frame_free ();
+ return NULL;
+ }
+ avpicture_fill((AVPicture *) picture, picture_buf, pix_fmt, width, height);
+@@ -167,7 +167,7 @@ static AVFrame *frame_alloc(int pix_fmt,
+ static void frame_dealloc(AVFrame *frame) {
+ if (frame) {
+ avpicture_free((AVPicture*)frame);
+-av_free(frame);
++av_frame_free();
+ }
+ }
+ 
+@@ -231,7 +231,7 @@ static ff2theora ff2theora_init() {
+ this->kate_streams=NULL;
+ this->ignore_non_utf8 = 0;
+ 
+-this->pix_fmt = PIX_FMT_YUV420P;
++this->pix_fmt = AV_PIX_FMT_YUV420P;
+ 
+ // ffmpeg2theora --nosound -f dv -H 32000 -S 0 -v 8 -x 384 -y 288 -G 1.5 input.dv
+ this->video_gamma  = 0.0;
+@@ -521,6 +521,74 @@ static const char *find_language_for_sub
+   return lang;
+ }
+ 
++static void delete_filter_graph(ff2theora this) {
++if (this->filter_graph) {
++av_frame_free(>filter_frame);
++avfilter_graph_free(>filter_graph);
++}
++}
++
++static int init_filter_graph(ff2theora this, enum AVPixelFormat pixfmt, int width, int height) {
++AVFilterInOut *inputs = NULL, *outputs = NULL;
++char args[512];
++int res;
++
++delete_filter_graph(this);
++this->filter_graph = avfilter_graph_alloc();
++snprintf(args, sizeof(args),
++ "buffer=video_size=%dx%d:pix_fmt=%d:time_base=1/1:pixel_aspect=0/1[in];"
++ "[in]yadif[out];"
++ "[out]buffersink",
++ width, height, pixfmt);
++res = avfilter_graph_parse2(this->filter_graph, args, , );
++if (res < 0)
++return res;
++if(inputs || outputs)
++return -1;
++res = avfilter_graph_config(this->filter_graph, NULL);
++if (res < 0)
++return res;
++
++this->buffersrc_ctx = avfilter_graph_get_filter(this->filter_graph, "Parsed_buffer_0");
++this->buffersink_ctx = avfilter_graph_get_filter(this->filter_graph, "Parsed_buffersink_2");
++if (!this->buffersrc_ctx || !this->buffersink_ctx)
++return -1;
++this->filter_frame = av_frame_alloc();
++this->last_width = width;
++this->last_height = height;
++this->last_pixfmt = pixfmt;
++
++return 0;
++}
++
++static int process_filter_graph(ff2theora this, AVPicture *dst, const AVPicture *src,
++enum AVPixelFormat pixfmt, int width, int height) {
++int res;
++
++if (!this->filter_graph || width != this->last_width ||
++height != this->last_height || pixfmt != this->last_pixfmt) {
++res = init_filter_graph(this, pixfmt, 

Bug#803818: gmerlin-encoders: FTBFS with FFmpeg 2.9

2015-11-02 Thread Andreas Cadhalpun
Package: gmerlin-encoders
Version: 1.2.0-7
Severity: important
Tags: patch
User: pkg-multimedia-maintainers@lists.alioth.debian.org
Usertags: ffmpeg2.9

Dear Maintainer,

your package fails to build with the upcoming ffmpeg 2.9.
This bug will become release-critical at some point when the
ffmpeg2.9 transition gets closer.

Attached is a patch replacing the deprecated functionality.
It also works with ffmpeg 2.8.
Please apply this patch and forward it upstream, if necessary.

These changes have little regression potential.

Best regards,
Andreas

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 000..fed7222
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,342 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun 
+Last-Update: <2015-11-02>
+
+--- gmerlin-encoders-1.2.0.orig/plugins/ffmpeg/codecs.c
 gmerlin-encoders-1.2.0/plugins/ffmpeg/codecs.c
+@@ -119,7 +119,6 @@
+   },\
+   PARAM_GOP_SIZE,  \
+   PARAM_SCENE_CHANGE_THRESHOLD,   \
+-  PARAM_SCENECHANGE_FACTOR,\
+   PARAM_FLAG_CLOSED_GOP \
+ 
+ #define ENCODE_PARAM_VIDEO_FRAMETYPES_IPB \
+@@ -414,63 +413,63 @@ static const ffmpeg_codec_info_t video_c
+   .long_name  = TRS("Motion JPEG"),
+   .id = AV_CODEC_ID_MJPEG,
+   .parameters = parameters_mjpeg,
+-  .pixelformats = (enum PixelFormat[]) { PIX_FMT_YUVJ420P, PIX_FMT_NB },
++  .pixelformats = (enum AVPixelFormat[]) { AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_NB },
+ },
+ {
+   .name   = "mpeg4",
+   .long_name  = TRS("MPEG-4"),
+   .id = AV_CODEC_ID_MPEG4,
+   .parameters = parameters_mpeg4,
+-  .pixelformats = (enum PixelFormat[]) { PIX_FMT_YUV420P, PIX_FMT_NB },
++  .pixelformats = (enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NB },
+ },
+ {
+   .name   = "msmpeg4v3",
+   .long_name  = TRS("Divx 3 compatible"),
+   .id = AV_CODEC_ID_MSMPEG4V3,
+   .parameters = parameters_msmpeg4v3,
+-  .pixelformats = (enum PixelFormat[]) { PIX_FMT_YUV420P, PIX_FMT_NB },
++  .pixelformats = (enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NB },
+ },
+ {
+   .name   = "mpeg1video",
+   .long_name  = TRS("MPEG-1 Video"),
+   .id = AV_CODEC_ID_MPEG1VIDEO,
+   .parameters = parameters_mpeg1,
+-  .pixelformats = (enum PixelFormat[]) { PIX_FMT_YUV420P, PIX_FMT_NB },
++  .pixelformats = (enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NB },
+ },
+ {
+   .name   = "mpeg2video",
+   .long_name  = TRS("MPEG-2 Video"),
+   .id = AV_CODEC_ID_MPEG2VIDEO,
+   .parameters = parameters_mpeg1,
+-  .pixelformats = (enum PixelFormat[]) { PIX_FMT_YUV420P, PIX_FMT_NB },
++  .pixelformats = (enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NB },
+ },
+ {
+   .name   = "flv1",
+   .long_name  = TRS("Flash 1"),
+   .id = AV_CODEC_ID_FLV1,
+   .parameters = parameters_msmpeg4v3,
+-  .pixelformats = (enum PixelFormat[]) { PIX_FMT_YUV420P, PIX_FMT_NB },
++  .pixelformats = (enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NB },
+ },
+ {
+   .name   = "wmv1",
+   .long_name  = TRS("WMV 1"),
+   .id = AV_CODEC_ID_WMV1,
+   .parameters = parameters_msmpeg4v3,
+-  .pixelformats = (enum PixelFormat[]) { PIX_FMT_YUV420P, PIX_FMT_NB },
++  .pixelformats = (enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NB },
+ },
+ {
+   .name   = "rv10",
+   .long_name  = TRS("Real Video 1"),
+   .id = AV_CODEC_ID_RV10,
+   .parameters = parameters_msmpeg4v3,
+-  .pixelformats = (enum PixelFormat[]) { PIX_FMT_YUV420P, PIX_FMT_NB },
++  .pixelformats = (enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NB },
+ },
+ {
+   .name   = "libx264",
+   .long_name  = TRS("H.264"),
+   .id = AV_CODEC_ID_H264,
+   .parameters = parameters_libx264,
+-  .pixelformats = (enum PixelFormat[]) { PIX_FMT_YUV420P, PIX_FMT_NB },
++  .pixelformats = (enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NB },
+ },
+ #if 0
+ {
+@@ -972,7 +971,6 @@ bg_ffmpeg_set_codec_parameter(AVCodecCon
+   PARAM_INT("ff_me_penalty_compensation",me_penalty_compensation);
+   PARAM_INT("ff_bidir_refine",bidir_refine);
+   PARAM_INT("ff_brd_scale",brd_scale);
+-  PARAM_INT("ff_scenechange_factor",scenechange_factor);
+   PARAM_FLAG("ff_flag_qscale",CODEC_FLAG_QSCALE);
+   PARAM_FLAG("ff_flag_4mv",CODEC_FLAG_4MV);
+   PARAM_FLAG("ff_flag_qpel",CODEC_FLAG_QPEL);
+@@ -980,7 +978,6 @@ bg_ffmpeg_set_codec_parameter(AVCodecCon
+   PARAM_FLAG("ff_flag_mv0",CODEC_FLAG_MV0);
+   //  PARAM_FLAG("ff_flag_part",CODEC_FLAG_PART);
+   PARAM_FLAG("ff_flag_gray",CODEC_FLAG_GRAY);
+-  

Bug#803879: vlc: audio doesn't work with some codecs

2015-11-02 Thread Manolo Díaz
Package: vlc
Version: 2.2.1-5+b1
Severity: important

Dear Maintainer,

While it works fine with some audio codecs, fails with others i.e. flac
and mp3.

`vlc -v  --list | grep flac`  shows:

VLC media player 2.2.1 Terry Pratchett (Weatherwax) (revision 2.2.1-0-ga425c42)
  packetizer_flacFlac audio packetizer
  flac   Flac audio decoder
  flac   Flac audio encoder
  flacsysFLAC demuxer

while trying to play a flac encoded audio file:

VLC media player 2.2.1 Terry Pratchett (Weatherwax) (revision 2.2.1-0-ga425c42)
[01269398] core libvlc debug: VLC media player - 2.2.1 Terry Pratchett 
(Weatherwax)
[01269398] core libvlc debug: Copyright © 1996-2015 the VideoLAN team
[01269398] core libvlc debug: revision 2.2.1-0-ga425c42
[01269398] core libvlc debug: configured with ./configure  
'--includedir=${prefix}/include' '--mandir=${prefix}/share/man' 
'--infodir=${prefix}/share/info' '--localstatedir=/var' 
'--libdir=${prefix}/lib/x86_64-linux-gnu' 
'--libexecdir=${prefix}/lib/x86_64-linux-gnu' '--disable-dependency-tracking' 
'--build=x86_64-linux-gnu' 'CPPFLAGS=-D_FORTIFY_SOURCE=2' 'LDFLAGS=-Wl,-z,relro 
-Wl,--as-needed' '--config-cache' '--disable-maintainer-mode' 
'--disable-silent-rules' '--disable-update-check' '--enable-fast-install' 
'--prefix=/usr' '--docdir=/usr/share/doc/vlc-nox' '--libdir=/usr/lib' 
'--sysconfdir=/etc' '--with-binary-version=5' '--enable-a52' '--enable-aa' 
'--enable-bluray' '--enable-bonjour' '--enable-caca' '--enable-chromaprint' 
'--enable-dbus' '--enable-dca' '--enable-directfb' '--enable-dvbpsi' 
'--enable-dvdnav' '--enable-faad' '--enable-flac' '--enable-fluidsynth' 
'--enable-freerdp' '--enable-freetype' '--enable-fribidi' '--enable-gles1' 
'--enable-gles2' '--enable-gnutls' '--enable-jack' '--enable-kate' 
'--enable-libass' '--enable-libmpeg2' '--enable-libxml2' '--enable-lirc' 
'--enable-live555' '--enable-mad' '--enable-mkv' '--enable-mod' '--enable-mpc' 
'--enable-mtp' '--enable-mux_ogg' '--enable-ncurses' '--enable-notify' 
'--enable-ogg' '--enable-opus' '--enable-pulse' '--enable-qt' 
'--enable-realrtsp' '--enable-samplerate' '--enable-schroedinger' 
'--enable-sdl' '--enable-sdl-image' '--enable-sftp' '--enable-shine' 
'--enable-shout' '--enable-skins2' '--enable-speex' '--enable-svg' 
'--enable-svgdec' '--enable-taglib' '--enable-theora' '--enable-twolame' 
'--enable-upnp' '--enable-vcdx' '--enable-vdpau' '--enable-vnc' 
'--enable-vorbis' '--enable-x264' '--enable-x265' '--enable-zvbi' 
'--with-kde-solid=/usr/share/kde4/apps/solid/actions/' '--disable-decklink' 
'--disable-dxva2' '--disable-fdkaac' '--disable-gnomevfs' '--disable-goom' 
'--disable-libtar' '--disable-mfx' '--disable-opencv' '--disable-projectm' 
'--disable-sndio' '--disable-telx' '--disable-vpx' '--disable-vsxu' 
'--disable-wasapi' '--enable-alsa' '--enable-atmo' '--enable-dc1394' 
'--enable-dv1394' '--enable-linsys' '--enable-omxil' '--enable-udev' 
'--enable-v4l2' '--enable-libva' '--enable-vcd' '--enable-smbclient' 
'--disable-oss' '--enable-crystalhd' '--enable-mmx' '--enable-sse' 
'--disable-neon' '--disable-altivec' 'CFLAGS=-g -O2 -fstack-protector-strong 
-Wformat -Werror=format-security' 'CXXFLAGS=-g -O2 -fstack-protector-strong 
-Wformat -Werror=format-security' 'build_alias=x86_64-linux-gnu' 'OBJCFLAGS=-g 
-O2 -fstack-protector-strong -Wformat -Werror=format-security'
[01269398] core libvlc debug: searching plug-in modules
[01269398] core libvlc debug: loading plugins cache file 
/usr/lib/vlc/plugins/plugins.dat
[01269398] core libvlc debug: recursively browsing 
`/usr/lib/vlc/plugins'
[01269398] core libvlc debug: saving plugins cache 
/usr/lib/vlc/plugins/plugins.dat
[01269398] core libvlc debug: plug-ins loaded: 458 modules
[01269398] core libvlc debug: opening config file 
(/home/yo/.config/vlc/vlcrc)
[01269398] core libvlc debug: translation test: code is "C"
[01269398] core libvlc debug: No media player running. Continuing 
normally.
[01269398] core libvlc debug: CPU has capabilities MMX MMXEXT SSE SSE2 
SSE3 3DNow! FPU 
[0127de98] core input debug: Creating an input for 'Media Library'
[0127de98] core input debug: selected audio language[0] es
[0127de98] core input debug: selected audio language[1] any
[0127de98] core input debug: selected subtitle language[0] es
[0127de98] core input debug: Input is a meta file: disabling unneeded 
options
[0127de98] core input debug: using timeshift granularity of 50 MiB, in 
path '/tmp'
[0127de98] core input debug: 
`file/xspf-open:///home/yo/.local/share/vlc/ml.xspf' gives access `file' demux 
`xspf-open' path `/home/yo/.local/share/vlc/ml.xspf'
[0127de98] core input debug: creating demux: access='file' 
demux='xspf-open' location='/home/yo/.local/share/vlc/ml.xspf' 
file='/home/yo/.local/share/vlc/ml.xspf'
[0133c848] core 

Bug#783217: [showq] Crash when saved

2015-11-02 Thread Michael Jarosch
Am Donnerstag, den 30.07.2015, 20:54 +0200 schrieb Jaromír Mikeš:

> Hi Michael,
> […] I will have a look later.
> Thank you

Hi!

Just as a reminder, that some work was done on the showq source code.
Harry's last commit was done last friday fixing some issues with waf.
Please, consider packaging it.

I'd really like to support you maintaining showq, although it would
only be help on a low level. My knowledge on compilers, building
processes and the debian-specialties for packaging is relatively
limited. And - for now - time is also missing. (Ask me in Feb 2016.)

Don't know, if it will safe your time, if you teach me maintaining
stuff. But if you really want to - just wait 3 months and I have an
open ear for this.

Greets!
Mitsch

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

synfigstudio is marked for autoremoval from testing

2015-11-02 Thread Debian testing autoremoval watch
synfigstudio 1.0-1 is marked for autoremoval from testing on 2015-11-24

It is affected by these RC bugs:
803037: synfigstudio: FTBFS: uimanager.h:33:27: fatal error: sigc++/object.h: 
No such file or directory


___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers


Bug#803757: csoundqt: FTBFS: src/configlists.h:55:2: error: 'QHash' does not name a type

2015-11-02 Thread Chris Lamb
Source: csoundqt
Version: 0.9.0-1
Severity: serious
Justification: fails to build from source
User: reproducible-bui...@lists.alioth.debian.org
Usertags: ftbfs
X-Debbugs-Cc: reproducible-bui...@lists.alioth.debian.org

Dear Maintainer,

csoundqt fails to build from source in unstable/amd64:

  [..]

  In file included from src/csoundoptions.cpp:24:0:
  src/configlists.h:55:2: error: 'QHash' does not name a type
QHash getMidiInputDevices(QString module);

  [..]

   ^
  src/csoundengine.cpp:339:42: warning: unused parameter 'csound'
  [-Wunused-parameter]
   int CsoundEngine::midiOutCloseCb(CSOUND *csound, void *ud)
^
  src/csoundengine.cpp:339:56: warning: unused parameter 'ud'
  [-Wunused-parameter]
   int CsoundEngine::midiOutCloseCb(CSOUND *csound, void *ud)
  ^
  src/csoundengine.cpp:364:56: warning: unused parameter 'message'
  [-Wunused-parameter]
   void CsoundEngine::sendMidiOut(QVector )
  ^
  src/csoundengine.cpp:746:54: warning: unused parameter 'delay'
  [-Wunused-parameter]
   void CsoundEngine::queueEvent(QString eventLine, int delay)
^
  src/csoundengine.cpp:1203:47: warning: unused parameter 'csound'
  [-Wunused-parameter]
   void CsoundEngine::breakpointCallback(CSOUND *csound,
   debug_bkpt_info_t *bkpt_info, void *udata)
 ^
  src/documentview.cpp: At global scope:
  src/documentview.cpp:1847:48: warning: unused parameter 'ev'
  [-Wunused-parameter]
   void HoverWidget::mousePressEvent(QMouseEvent *ev)
  ^
  src/documentpage.cpp: In member function 'virtual int
  DocumentPage::setTextString(QString&)':
  src/documentpage.cpp:192:7: warning: unused variable 'visibleEnabled'
  [-Wunused-variable]
 int visibleEnabled = panelElement.attribute("visible","true") ==
 "true";
 ^
  src/documentpage.cpp: At global scope:
  src/documentpage.cpp:558:44: warning: unused parameter 'sheetName'
  [-Wunused-parameter]
   EventSheet* DocumentPage::getSheet(QString sheetName)
  ^
  src/documentpage.cpp:1102:38: warning: unused parameter 'index'
  [-Wunused-parameter]
   void DocumentPage::stopPanelSlot(int index)
^
  src/documentpage.cpp:1119:41: warning: unused parameter 'index'
  [-Wunused-parameter]
   void DocumentPage::setPanelSyncSlot(int index, int mode)
   ^
  src/documentpage.cpp:1119:52: warning: unused parameter 'mode'
  [-Wunused-parameter]
   void DocumentPage::setPanelSyncSlot(int index, int mode)
  ^
  src/documentpage.cpp:1263:30: warning: unused parameter 'format'
  [-Wunused-parameter]
   int DocumentPage::record(int format)
^
  src/documentpage.cpp:1356:53: warning: unused parameter 'widget'
  [-Wunused-parameter]
   void DocumentPage::passUnselectedWidget(QuteWidget *widget)
   ^
  make[1]: Leaving directory '/build/csoundqt-0.9.0'
  /usr/share/cdbs/1/class/makefile.mk:47: recipe for target
  'debian/stamp-makefile-build' failed
  make: *** [debian/stamp-makefile-build] Error 2
  dpkg-buildpackage: error: debian/rules build gave error exit status 2

  [..]

The full build log is attached or (an alternate build) can be viewed
here:


https://reproducible.debian.net/logs/unstable/amd64/csoundqt_0.9.0-1.build1.log.gz


Regards,

-- 
  ,''`.
 : :'  : Chris Lamb
 `. `'`  la...@debian.org / chris-lamb.co.uk
   `-


csoundqt.0.9.0-1.unstable.amd64.log.txt.gz
Description: application/gzip
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Beneficjent Chevroleta

2015-11-02 Thread Chevrolet Company
TWOJE KONTO E-MAIL wygrali $ 700,000,00 Z CHEVROLET FIRMA ASIA loterii, JESTEŚ 
wysyłać, NAZWA, MOBILE NIE, wiek, płeć, I ADRES: chevroletdra...@outlook.com

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Yoopay for Good: Yoopay Proudly Sponsors Chi Fan For Charity (CFFC) in Beijing, Shanghai, and Hong Kong

2015-11-02 Thread 友付 yoopay . cn



 
  



Click here for the web version of this message

 


  
   
   

  

  

   
  

  

  
  
  
  

  
 
  About Chi Fan for Charity (CFFC)
  

   
  

  Founded in 2009 with a mission of giving back to the Beijing community, Chi Fan for Charity (CFFC) is a modern take on the standard concept of a large, gala charity dinner. 


  


  CFFC invites some of Beijing, Shanghai, and Hong Kong’s best-known personalities to host a table at the top restaurants in each city.  Following dinner, all dinner guests and supporters are invited to an incredible after-party where people mix and mingle and talk about the amazing dinners they just experienced.  To date, Chi Fan for Charity has donated more than 3.7 million RMB to local beneficiaries with 100% of table proceeds going directly to our designated charities. 


  


  CFFC is a great way for friends to get together, catch up, give back, and meet new friends, while raising funds for great causes, without the burden and cost of traditional big charity balls.


  


  Yoopay.cn proudly supports CFFC in Beijing, Shanghai, and Hong Kong, and provides event registration, ticketing, and payment platform, both online and on mobile.


   


  If you would like to get involved with Chi Fan for Charity 2015, there is still time to join as a sponsor, table host or attendee. Please visit www.chifanforcharity.org for further details on how to participate in you local Beijing, Shanghai or Hong Kong chapter. 



   


  


   

   


  
   
  About Yoopay


   


  Yoopay.cn is the leading cloud based event online publishing, registration, payment, and management platform in China.


  


  Yoopay's award winning technology supports:



  


   
  1.	Easily publish professional looking event web page, mobile ready, and can be seamlessly integrated into the event's official website
2.	Chinese and English dual languages, RMB and USD dual currencies
3.	All major online payment methods: China UnionPay, WeChat, Alipay, Visa, Mastercard, Amex, and Paypal
4.