rpms
/
libquicktime
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.2.4-93-g4d45177

Browse Source 
Upstream have the official patches for ffmpeg_2.9.patch libav10.patch libquicktime-backport.patch
This release have some security fixes
el8
Sérgio M. Basto 7 years ago
parent 63eab93091
commit 8c09fe02a3
9 changed files with 653 additions and 1268 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape View File

@ -1 +1,2 @@
libquicktime-1.2.4.tar.gz
/libquicktime-1.2.4-4d451774b8.tar.gz

583
ChangeLog
Unescape View File

@ -0,0 +1,583 @@
commit 4d451774b89fbdd2f53204f92b71837af7b06761
Author: gmerlin <gmerlin>
Date: Tue Sep 26 11:46:13 2017 +0000
* Support for version 1 of the mdhd atom (patch by Erik Johansson)
commit f32646eb76a6d2b2768442bd78afb65e7cb5867e
Author: gmerlin <gmerlin>
Date: Tue Jul 18 14:15:30 2017 +0000
* Applied udta.patch
commit bfe392e31eea480d7c4507663395ca483a5abb67
Author: gmerlin <gmerlin>
Date: Fri Jun 23 13:46:41 2017 +0000
* Fixed CVE-2017-9125
commit 3a7b5017e5d803dbe82eddd08a2804be3fda0c5d
Author: gmerlin <gmerlin>
Date: Fri Jun 23 13:00:36 2017 +0000
* Fixed allocation-failed-in_quicktime_read_ftyp and
allocation-failed-in_quicktime_read_info
commit bf6e842131fb013a087df6d7c5069a7d3646b199
Author: gmerlin <gmerlin>
Date: Mon Mar 6 10:16:11 2017 +0000
* Fix security hole
commit 2ea10548de96c3379da6264e6ca21ee3cdc06f0c
Author: gmerlin <gmerlin>
Date: Tue Apr 26 18:04:01 2016 +0000
* Security fix
commit c166ad0b5d00265d6a0a708ed1d39772bfaa8a91
Author: gmerlin <gmerlin>
Date: Tue Apr 26 17:51:07 2016 +0000
* Fix the types of some integer i/o functions (patch by Erik Johansson)
commit 0b908b27ac3acd25a73f72a25ac1b6ffc86d0567
Author: gmerlin <gmerlin>
Date: Tue Apr 26 17:47:30 2016 +0000
* Fix issue with stps-atom and packetindex (patch by Erik Johansson)
commit 1698b8b3f46c46a46e5efb856e19ec952b4f8b92
Author: sms00 <sms00>
Date: Sun Dec 6 18:49:50 2015 +0000
Remove unused functions.
commit 18487486657ba752bf38656509e719b5c5b2c51b
Author: sms00 <sms00>
Date: Sat Dec 5 18:52:43 2015 +0000
ffmpeg's neverending api changes - they went AV crazy (again/still). Needed to add AV_ or AV in front of items used from avcodec
commit 12a6d2878e63d2c602e6f00612450fa8e377f322
Author: gmerlin <gmerlin>
Date: Wed Oct 21 15:38:33 2015 +0000
* Fix Integer over flow in stts.c and quicktime_stsdtable_read_timecode
patch by Erik Johansson
commit f224f75ee4a33c565ddfb2db82c8ea3d38bbb517
Author: gmerlin <gmerlin>
Date: Fri Mar 20 10:00:56 2015 +0000
* Fix stsd atom termination (patch by Balázs Oroszi)
commit 3407dafde9dc28b796059f5932b0be097626fd22
Author: sms00 <sms00>
Date: Fri Mar 6 20:40:23 2015 +0000
annotate the new additions for rear surround and matrixed (Prologic) channels
commit d20fd20cb0f274a0f34371583e745f23021c20f1
Author: sms00 <sms00>
Date: Fri Mar 6 15:14:09 2015 +0000
Add mappings from 'chan atom' to lqt for: rear surround left/right, mono and left/right total (prologic matrix'd)
commit 531270f7db23760e6ebbd6cab493550b4ca1c7fd
Author: gmerlin <gmerlin>
Date: Tue Feb 3 15:45:59 2015 +0000
* Read reserved gmin bits (patch by Derek Chow)
commit 8e22e547d68b048e2936cdaab792a812e4b53941
Author: sms00 <sms00>
Date: Mon Nov 3 20:48:22 2014 +0000
Prevent crash if audio Decoder doesn't exist - example is 'drms'
[codecs] Warning: Could not find audio Decoder for fourcc drms
for soundtracks in iTunes movies would crash qtinfo.
commit 28412a2a639b5ff2078f52c253c8c23810a11bbd
Author: sms00 <sms00>
Date: Fri Oct 24 15:14:27 2014 +0000
returning 0 from the decode initialization causes lqt_ensure_stream_cmodel_decode to not fill in the color model.
qtinfo would print "Native colormodel: Undefined" before. Now qtinfo prints
"Native colormodel: YUV 4:2:2 packed (YUY2)"
commit 54513401b82b6c4dd5f2484420933ff71862e5f2
Author: gmerlin <gmerlin>
Date: Thu Oct 23 15:12:09 2014 +0000
* Fixed stts generation
commit 06cc79271551b43551d13fa27175ada88461126d
Author: gmerlin <gmerlin>
Date: Thu May 1 22:54:30 2014 +0000
* More cleanups
commit 2a9ca087b733aa4922d110c99b28e5c3c3227798
Author: gmerlin <gmerlin>
Date: Thu May 1 21:15:34 2014 +0000
* Remove quicktime_chunk_to_offset
commit 5d2cf083a9e2f70b88403984ed9a3ed060c43953
Author: gmerlin <gmerlin>
Date: Thu May 1 18:58:38 2014 +0000
* More cleanups
commit 7819adf04207d52757237ffec7f87ebb8f6f84a4
Author: gmerlin <gmerlin>
Date: Thu May 1 18:54:00 2014 +0000
* Let the text tracks also use the packet index
* Removed lots of old cruft
commit e3b9f0fe2691f1bf491c94821e5c92b78d1524ba
Author: gmerlin <gmerlin>
Date: Thu May 1 12:58:16 2014 +0000
* Move most video specific functions to video.c
commit 9cb33b4813cd8fb1743b7a8e00299dfef3df703a
Author: gmerlin <gmerlin>
Date: Thu May 1 12:07:28 2014 +0000
* Removed old decode_audio function
commit 1c63349eeedbfc8de05f71513cb3d729983cdd5a
Author: gmerlin <gmerlin>
Date: Tue Apr 29 22:21:55 2014 +0000
* Converted core and all codecs for new Audio demuxing API
commit 223e3c392d29ac8f59a3d2533ce08cfb85226865
Author: gmerlin <gmerlin>
Date: Sun Apr 27 22:59:54 2014 +0000
* Introduce quicktime_trak_read_packet()
* New codec function: decode_audio_packet() which decodes just one
single packet and leaves buffering and seeking to the core
* Audio seeking is not adapted yet but will be ASAP, so it might not work
ATM
commit 73b6a91c7f589e0ff67e9861fa24e5b2c3b6d3fe
Author: gmerlin <gmerlin>
Date: Fri Apr 25 21:55:28 2014 +0000
* Remove old ffmpeg cruft and increase the minimum lavc version
commit d92d1917f06e877d46a5a61159d6228e02f92967
Author: gmerlin <gmerlin>
Date: Wed Apr 23 22:24:04 2014 +0000
* New decoding API works somehow
commit 1a6fbf08be64eca0842095cf7005f475c51e40cb
Author: gmerlin <gmerlin>
Date: Wed Apr 23 20:45:45 2014 +0000
* More API conversions
commit 6e91b8b1cb9255cdefbf5462bc2b6288f4b6b216
Author: sms00 <sms00>
Date: Wed Apr 23 20:35:32 2014 +0000
Accidentally commented AC_LANG_SOURCE(C) out - it causes errors with older
versions of libtool (used on OSX 10.6.8) but other folks perhaps need it.
libquicktime build fine with or without it - not sure why it was added.
commit 766fd107dbe03cfad9b5d03ea1803802214d0729
Author: sms00 <sms00>
Date: Wed Apr 23 20:33:04 2014 +0000
lqt_packet_index_get_next_display_frame needs to be visible/extern'd on OSX 10.6.8 to avoid and undefined error from lqt_ffmpeg plugin:
qtinfo Disc1.mov
[codecinfo] Error: dlopen failed for /usr/local/lib/libquicktime/lqt_ffmpeg.so: dlopen(/usr/local/lib/libquicktime/lqt_ffmpeg.so, 2): Symbol not found: _lqt_packet_index_get_next_display_frame
Referenced from: /usr/local/lib/libquicktime/lqt_ffmpeg.so
commit 4ed5f10623b438f959697b03a56ec94a76b25271
Author: gmerlin <gmerlin>
Date: Wed Apr 23 20:31:17 2014 +0000
* Converted more codecs
commit 4ee0b65979fa2a405727f8ce0f6372c5e3767f91
Author: gmerlin <gmerlin>
Date: Tue Apr 22 19:14:48 2014 +0000
* Convert more codecs for the new API
commit f12c0601b1fd6edca13cdf2d96987d569dd7682a
Author: gmerlin <gmerlin>
Date: Mon Apr 21 06:39:17 2014 +0000
* More updates for the new demuxing API
commit bd67b98a7d0f7f53a22c8467b765c5e181358ab1
Author: gmerlin <gmerlin>
Date: Fri Apr 18 12:30:19 2014 +0000
* Converted pcm and ima4
commit e987e5901de61ef0f0f784eb4fc83c5eeca498b9
Author: gmerlin <gmerlin>
Date: Fri Apr 18 00:55:12 2014 +0000
* Make the pcm codecs use the packet index
commit d6b9f1c25189302b1fce2e0a69e0a8538b82752b
Author: gmerlin <gmerlin>
Date: Wed Apr 16 22:20:52 2014 +0000
* Use new demuxing API for reading video packets
commit a7e10e7b8a6a16939c2b5f6bd33f010ec42942d7
Author: gmerlin <gmerlin>
Date: Tue Apr 15 18:46:42 2014 +0000
* Export the stsd ID in the packet index
commit 37553b919395e48b5db643da29667bb094f5dbdc
Author: gmerlin <gmerlin>
Date: Fri Apr 11 22:15:09 2014 +0000
* generate packet index for audio tracks also
commit dfcacedaafb89817fde58f48e4e44890274e0778
Author: gmerlin <gmerlin>
Date: Sun Apr 6 22:35:50 2014 +0000
* Generate the packet index for Quicktime and AVI video streams
commit 2ef27c3d2bfaf642622734176e25a005a20a92d1
Author: gmerlin <gmerlin>
Date: Tue Apr 1 19:57:30 2014 +0000
* Introduce a runtime generated packet index for more efficient
demultiplexing
commit 0c25e15dc829e69c9f9eb406f856ec0721dd6aaa
Author: gmerlin <gmerlin>
Date: Tue Mar 25 16:57:33 2014 +0000
* Update
commit edb79560e0d5c895e23ea048a8444b521a039547
Author: gmerlin <gmerlin>
Date: Fri Mar 21 13:30:41 2014 +0000
* Initialize tcmi flags to zero as recommended
commit fee30f795236298e8c9548e09da99c3fd7c446de
Author: gmerlin <gmerlin>
Date: Fri Mar 21 11:58:28 2014 +0000
* Skip null blocks patch by Erik Johansson
commit f4a7b6aded4f44bf6d9896a5e5df4d1a2c875e29
Author: gmerlin <gmerlin>
Date: Mon Dec 9 16:03:40 2013 +0000
* Better price calculation for colormodel conversions
(patch by Erik Johansson)
commit 0ce3b70a3858eac940aae4e47b1ea3a0e5f8c237
Author: gmerlin <gmerlin>
Date: Fri Dec 6 15:59:34 2013 +0000
* yuvj420 -> yuvj422 Conversion patch by Erik Johansson
commit 78f4862934b495e7bbaf8452ec247630a6f2bf89
Author: gmerlin <gmerlin>
Date: Wed Nov 27 17:15:31 2013 +0000
* Flush more delayed frames (patch by Erik Johansson)
commit 0bede77253913493c52b76a1e3d793ce92130326
Author: gmerlin <gmerlin>
Date: Wed Nov 27 17:09:30 2013 +0000
* Mingw fixes for utf-8 and 64 bit stat (patch by Derek Chow)
commit 4773c54f5de8ab896cf329d160ec5f6476e37f37
Author: gmerlin <gmerlin>
Date: Thu Nov 21 15:10:54 2013 +0000
* More mingw patches by Derek Chow
commit b292819f366e0446afcb3c2428590acfd63616fe
Author: gmerlin <gmerlin>
Date: Tue Nov 19 16:46:23 2013 +0000
* mingw patch by Derek Chow
commit 8b73d511668e71c3c1f6c57f629df556593b7fd1
Author: gmerlin <gmerlin>
Date: Tue Oct 29 08:57:05 2013 +0000
* Set LDFLAGS for modules in configure.ac
* Fix some crashes (patch by Paul J. Taggart)
commit 400e1e4e03f79bd2bf362ecf7fdd133d5075968f
Author: sms00 <sms00>
Date: Tue Oct 29 03:02:17 2013 +0000
Older versions of autoconf (2.61) sometimes need [] around the 'else' in AC_CHECK_FUNCS to avoid an error
./configure: line 24695: syntax error: unexpected end of file
commit f317d4ce065a61a95c28f70765fa4f740d875867
Author: gmerlin <gmerlin>
Date: Mon Oct 7 14:38:02 2013 +0000
* Add -no-undefined to libtool flags
* Simplified *localtime* ifdefs
commit 6dd6c14f7eac41b62f4fb6a7ad64ac435828f968
Author: gmerlin <gmerlin>
Date: Fri Sep 27 13:46:43 2013 +0000
* mingw patches by Derek Chow
commit 2afeae7edc5d45c6b835fa5bcf7b821b5c72b212
Author: gmerlin <gmerlin>
Date: Fri Sep 27 13:23:39 2013 +0000
* bzero, bcopy -> memset, memcpy
commit 3d30c039370c7d9893b2990e006641f6daea565a
Author: gmerlin <gmerlin>
Date: Fri Jun 7 14:36:20 2013 +0000
* Prores codec name patch by Boris Maksalov
commit 823d5938a5bd0996882ea467ab25015f79958540
Author: gmerlin <gmerlin>
Date: Wed Jun 5 15:10:48 2013 +0000
* Another API update patch by Erik Johansson
commit ac79fc2ee5361bbb49a6fb337d0f23e02fdf7fdf
Author: gmerlin <gmerlin>
Date: Tue May 21 13:49:26 2013 +0000
* AVPacket handling patch by Joseph Artsimovich
commit 220a1bd3cf1502fdb755be3a3771575f484b3e8b
Author: gmerlin <gmerlin>
Date: Tue May 21 13:42:20 2013 +0000
* 8 bit sowt seems to be signed
commit 8d832fabb420fc42edacd914a560943ae9f069ba
Author: gmerlin <gmerlin>
Date: Tue May 7 09:30:01 2013 +0000
* Fix potential crash
commit f23facd94acd3ff0c3be4efd6de82f69dd44fe87
Author: gmerlin <gmerlin>
Date: Tue May 7 09:18:51 2013 +0000
* Latest ffmpeg patch by Joseph Artsimovich
commit ab32b84dd1e6e5b100d22aeeffbafe67e02edb31
Author: gmerlin <gmerlin>
Date: Mon Apr 29 08:30:54 2013 +0000
* Prime sample support patch by Erik Johansson
commit eb0458dd42f28b094e2a4695758865109fb73669
Author: gmerlin <gmerlin>
Date: Tue Apr 23 15:11:53 2013 +0000
* avid imx fix by Joseph Artsimovich
commit 0b8adf13d39b8ba3717a6e8c86d6d59f3d68f711
Author: gmerlin <gmerlin>
Date: Tue Apr 23 15:11:05 2013 +0000
* autotools fix proposed by Christian Ebert
commit 44662bf4f5e1364140f08b26126f097986475435
Author: sms00 <sms00>
Date: Sun Apr 21 21:54:58 2013 +0000
ffmpeg/libavcodec breakage again/still - define AVCODEC_MAX_AUDIO_FRAME_SIZE
using value from libavcodec/avcodec.h dated Dec 23 2012
commit 2158ea2e436cc5d635215078e6bcd7ec8aa7872c
Author: gmerlin <gmerlin>
Date: Fri Apr 19 16:59:59 2013 +0000
* Add avid IMX fourccs (patch by Joseph Artsimovich)
commit 55f5d4523a96cdf2a45a3af81b8d251337c5d020
Author: gmerlin <gmerlin>
Date: Tue Mar 19 10:29:58 2013 +0000
* libpng16 support patch by pgajdos [at] suse.cz
commit 25ebfb6ae1a88586469d7524a82093ead13a3043
Author: gmerlin <gmerlin>
Date: Tue Feb 12 17:34:23 2013 +0000
* Fix qmax for imx30 (patch by Joseph Artsimovich)
commit d001f6e756cd9134b878d870686241fb4bddf4e9
Author: gmerlin <gmerlin>
Date: Tue Feb 12 17:32:53 2013 +0000
* Better handling of broken frames (patch by Joseph Artsimovich)
commit d0388b8915dd34fb3cb2e76978b1d9df6a5dc436
Author: stscheff <stscheff>
Date: Sat Jan 12 13:02:30 2013 +0000
force movie timescale to qtvr timescale
commit b31b4db0497e37aa07320022a71ea2544ea24b44
Author: gmerlin <gmerlin>
Date: Fri Dec 21 13:37:09 2012 +0000
* Compatibility patch
commit a63f3af8467bbd4fc6bb6384d0ca5902c2c46411
Author: gmerlin <gmerlin>
Date: Tue Nov 27 15:52:47 2012 +0000
* Change vendor back to appl to work around broken decoders
commit 812fb9a441592915a416dde10bf559b7162f4f51
Author: gmerlin <gmerlin>
Date: Tue Nov 27 15:46:40 2012 +0000
* Fix pts handling for some codecs, which rely on a constant framerate
commit b4691242da7909b3643e50c78dc03317a2c9c1ef
Author: gmerlin <gmerlin>
Date: Tue Nov 20 09:51:21 2012 +0000
* Forgot this file
commit 3df140a62c0ea17307ea83b5fdae454d3df95ed5
Author: gmerlin <gmerlin>
Date: Mon Nov 19 16:59:29 2012 +0000
* sdtp support patch by Joseph Artsimovich
commit 1436e47438e8d4c40ade2fc1b98eddfef6f1e452
Author: gmerlin <gmerlin>
Date: Mon Nov 19 16:50:48 2012 +0000
* uninitialized read patch by Joseph Artsimovich
* Updated schroedinger settings extraction
commit b68705b23f206513220c625fc2b35241c6e62d9f
Author: gmerlin <gmerlin>
Date: Fri Nov 9 10:24:12 2012 +0000
* Let the codec initialization know if we are en- or decoding
(patch by Joseph Artsimovich)
commit dbf163d577d78f974356ab2cad33fdf9ac3eaae6
Author: gmerlin <gmerlin>
Date: Thu Nov 8 12:53:45 2012 +0000
* Fixed YUV10 to RGB888 conversion
commit 6bb0b58264504ace379917be456f348f287dbaf1
Author: gmerlin <gmerlin>
Date: Tue Nov 6 11:07:01 2012 +0000
* Use codec specific defaults
commit bdacab2a502311ac858923a54347af727af3f07f
Author: gmerlin <gmerlin>
Date: Mon Oct 8 18:50:15 2012 +0000
* Fix crash
commit a5a04a249493c2cb44c18024e84f5dcce73fb910
Author: gmerlin <gmerlin>
Date: Mon Sep 24 09:17:25 2012 +0000
* Gop size patch by Joseph Artsimovich
commit d5aad041e938f4484a7e5d034043834569e2545c
Author: gmerlin <gmerlin>
Date: Fri Sep 14 21:12:57 2012 +0000
* Simplify seeking and consider B-frames used as references
commit 06ff9b12330b77e8aad95da5d0b4997d3eb1823f
Author: gmerlin <gmerlin>
Date: Tue Aug 7 17:36:11 2012 +0000
* ProRes support patch by Boris Maksalov
commit 4d45f43a2ea5c598be9b700789b9f03fc88db806
Author: gmerlin <gmerlin>
Date: Thu Jun 28 14:30:21 2012 +0000
* Support thread_count for more ffmpeg codecs (patch by Joseph Artsimovich)
commit b9f7bf8f201208abe7c992370b19e1659246e862
Author: gmerlin <gmerlin>
Date: Thu Jun 28 14:28:40 2012 +0000
* Delay the colormodel detection such that it happens after setting the
parameters
commit a6dfc1c04cc6a9236613a26c1b9e21bbbc385af3
Author: gmerlin <gmerlin>
Date: Tue Jun 12 16:30:57 2012 +0000
* Works also for mp4
commit adb2dc5b7305d0dfc9a65ea0d8fc4d914f2afac7
Author: gmerlin <gmerlin>
Date: Tue Jun 12 16:27:58 2012 +0000
* Unified seeking patch by Joseph Artsimovich
commit cdb2262a36c518b7b1d10b8a4c50e6e3a8131a92
Author: gmerlin <gmerlin>
Date: Fri Jun 8 13:56:39 2012 +0000
* stps support by Joseph Artsimovich
commit 962af75c8bae8493fd5f8aef3afac041c907b041
Author: gmerlin <gmerlin>
Date: Fri Jun 8 13:56:13 2012 +0000
* stps and xdcam support patch by Joseph Artsimovich
commit 7fac464e1d9220ace2a3f93d4cee3108cd62a0eb
Author: gmerlin <gmerlin>
Date: Fri Jun 8 12:25:42 2012 +0000
* Reverted last patch
commit 59838700eec97a2e07d124b06be80b3c5b09001f
Author: gmerlin <gmerlin>
Date: Fri Jun 8 12:12:47 2012 +0000
* stps support patch by Joseph Artsimovich
commit f36768d87314b85c7e84e6b8bfcdf6a6bedfd77c
Author: gmerlin <gmerlin>
Date: Thu May 24 16:01:13 2012 +0000
* Speed up seeking in long GOP video (patch by Joseph Artsimovich)
commit e6294ee27c9a616f5ea8ce5b5778f0c3e77d258d
Author: gmerlin <gmerlin>
Date: Fri Apr 27 15:19:52 2012 +0000
* Get rid of PATH_MAX in the library

16
converttogit.sh
Unescape View File

@ -0,0 +1,16 @@
cvs -d:pserver:anonymous@libquicktime.cvs.sourceforge.net:/cvsroot/libquicktime login
cvs -z3 -d:pserver:anonymous@libquicktime.cvs.sourceforge.net:/cvsroot/libquicktime co -P libquicktime
cd libquicktime
git cvsimport -v
In github.com press + and new repository, choose repository name: libquicktime
without "Initialize this repository with a README" .
and run:
git remote add origin git@github.com:sergiomb2/libquicktime.git
git push -u origin master
and I got this :
https://github.com/sergiomb2/libquicktime/commits/master

351
ffmpeg_2.9.patch
Unescape View File

@ -1,351 +0,0 @@
Description: Replace deprecated FFmpeg API
Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
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(&f);
+ av_frame_unref(&f);
f.nb_samples = codec->avctx->frame_size;
avcodec_fill_audio_frame(&f, 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...
- { PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples)
- { PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples)
- { PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples)
- { PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples)
-#ifdef PIX_FMT_YUV422P10
- { PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2
-#endif
- { PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness
- { PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg)
- { PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg)
- { PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg)
+ { AV_PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB...
+ { AV_PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR...
+ { AV_PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples)
+ { AV_PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples)
+ { AV_PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples)
+ { AV_PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples)
+#ifdef AV_PIX_FMT_YUV422P10
+ { AV_PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2
+#endif
+ { AV_PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness
+ { AV_PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg)
+ { AV_PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg)
+ { AV_PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg)
#if LIBAVUTIL_VERSION_INT < (50<<16)
- { PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA...
+ { AV_PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA...
#else
- { PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA...
+ { AV_PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA...
#endif
- { PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1
- { PIX_FMT_GRAY8, BC_RGB888, 0 },
- { PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white
- { PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black
- { PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette
- { PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples)
+ { AV_PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1
+ { AV_PIX_FMT_GRAY8, BC_RGB888, 0 },
+ { AV_PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white
+ { AV_PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black
+ { AV_PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette
+ { AV_PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples)
};
static const struct
@@ -248,7 +248,7 @@ static int lqt_ffmpeg_delete_video(quick
if(codec->frame_buffer) free(codec->frame_buffer);
if(codec->buffer) free(codec->buffer);
- if(codec->frame) av_free(codec->frame);
+ if(codec->frame) av_frame_free(&codec->frame);
#ifdef HAVE_LIBSWSCALE
if(codec->swsContext)
@@ -343,16 +343,16 @@ static int lqt_tenbit_dnxhd_supported(AV
if (!codec->pix_fmts)
return 0;
- for (i = 0; codec->pix_fmts[i] != PIX_FMT_NONE; ++i)
+ for (i = 0; codec->pix_fmts[i] != AV_PIX_FMT_NONE; ++i)
{
- if (codec->pix_fmts[i] == PIX_FMT_YUV422P10_OR_DUMMY)
+ if (codec->pix_fmts[i] == AV_PIX_FMT_YUV422P10_OR_DUMMY)
return 1;
}
return 0;
}
-static enum PixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id)
+static enum AVPixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id)
{
int i;
@@ -361,10 +361,10 @@ static enum PixelFormat lqt_ffmpeg_get_f
if(colormodels[i].lqt_id == id)
return colormodels[i].ffmpeg_id;
}
- return PIX_FMT_NB;
+ return AV_PIX_FMT_NB;
}
-static int lqt_ffmpeg_get_lqt_colormodel(enum PixelFormat id, int * exact)
+static int lqt_ffmpeg_get_lqt_colormodel(enum AVPixelFormat id, int * exact)
{
int i;
@@ -405,31 +405,31 @@ static void lqt_ffmpeg_setup_decoding_co
if (lqt_ffmpeg_get_avid_yuv_range(vtrack->track) == AVID_FULL_YUV_RANGE)
{
vtrack->stream_cmodel = BC_YUVJ422P;
- codec->reinterpret_pix_fmt = PIX_FMT_YUVJ422P;
+ codec->reinterpret_pix_fmt = AV_PIX_FMT_YUVJ422P;
*exact = 1;
return;
}
}
else if(codec->decoder->id == AV_CODEC_ID_DNXHD)
{
- /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which
- we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */
- if (codec->avctx->pix_fmt == PIX_FMT_YUV422P || codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY)
+ /* FFMpeg supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 for DNxHD, which
+ we sometimes interpret as AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10. */
+ if (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P || codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY)
{
- int p10 = (codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY);
+ int p10 = (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY);
*exact = 1;
if (lqt_ffmpeg_get_avid_yuv_range(vtrack->track) == AVID_FULL_YUV_RANGE)
{
vtrack->stream_cmodel = p10 ? BC_YUVJ422P10 : BC_YUVJ422P;
- codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUVJ422P;
- // Note: reinterpret_pix_fmt should really be PIX_FMT_YUVJ422P10, except
+ codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUVJ422P;
+ // Note: reinterpret_pix_fmt should really be AV_PIX_FMT_YUVJ422P10, except
// there is no such colormodel in FFMpeg. Fortunately, it's not a problem
// in this case, as reinterpret_pix_fmt is only used when *exact == 0.
}
else
{
vtrack->stream_cmodel = p10 ? BC_YUV422P10 : BC_YUV422P;
- codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUV422P;
+ codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUV422P;
}
return;
}
@@ -440,14 +440,14 @@ static void lqt_ffmpeg_setup_encoding_co
if (codec->encoder->id == AV_CODEC_ID_DNXHD)
{
- /* FFMpeg's DNxHD encoder only supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10
- and doesn't know anything about PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10
+ /* FFMpeg's DNxHD encoder only supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10
+ and doesn't know anything about AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10
(in fact, the latter doesn't even exist) */
- codec->avctx->pix_fmt = PIX_FMT_YUV422P;
+ codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P;
if (vtrack->stream_cmodel == BC_YUV422P10 || vtrack->stream_cmodel == BC_YUVJ422P10)
{
if (lqt_tenbit_dnxhd_supported(codec->encoder))
- codec->avctx->pix_fmt = PIX_FMT_YUV422P10_OR_DUMMY;
+ codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P10_OR_DUMMY;
}
}
}
@@ -458,7 +458,7 @@ static void lqt_ffmpeg_setup_encoding_co
/* From avcodec.h: */
/*
- * PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA
+ * AV_PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA
* color is put together as:
* (A << 24) | (R << 16) | (G << 8) | B
* This is stored as BGRA on little endian CPU architectures and ARGB on
@@ -530,7 +530,7 @@ static void convert_rgba_to_argb(uint8_t
*/
static void convert_image_decode(quicktime_ffmpeg_video_codec_t *codec,
- AVFrame * in_frame, enum PixelFormat in_format,
+ AVFrame * in_frame, enum AVPixelFormat in_format,
unsigned char ** out_frame, int out_format,
int width, int height, int row_span, int row_span_uv)
{
@@ -547,9 +547,9 @@ static void convert_image_decode(quickti
* RGBA format like in ffmpeg??
*/
#if LIBAVUTIL_VERSION_INT < (50<<16)
- if((in_format == PIX_FMT_RGBA32) && (out_format == BC_RGBA8888))
+ if((in_format == AV_PIX_FMT_RGBA32) && (out_format == BC_RGBA8888))
#else
- if((in_format == PIX_FMT_RGB32) && (out_format == BC_RGBA8888))
+ if((in_format == AV_PIX_FMT_RGB32) && (out_format == BC_RGBA8888))
#endif
{
convert_image_decode_rgba(in_frame, out_frame, width, height, codec->y_offset);
@@ -829,7 +829,7 @@ static int lqt_ffmpeg_decode_video(quick
if(avcodec_open2(codec->avctx, codec->decoder, NULL) != 0)
return -1;
#endif
- codec->frame = avcodec_alloc_frame();
+ codec->frame = av_frame_alloc();
vtrack->stream_cmodel = LQT_COLORMODEL_NONE;
codec->initialized = 1;
}
@@ -929,10 +929,10 @@ static int lqt_ffmpeg_decode_video(quick
#ifdef HAVE_LIBSWSCALE
#if LIBAVUTIL_VERSION_INT < (50<<16)
- if(!((codec->avctx->pix_fmt == PIX_FMT_RGBA32) &&
+ if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGBA32) &&
(vtrack->stream_cmodel == BC_RGBA8888)))
#else
- if(!((codec->avctx->pix_fmt == PIX_FMT_RGB32) &&
+ if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGB32) &&
(vtrack->stream_cmodel == BC_RGBA8888)))
#endif
{
@@ -1318,7 +1318,7 @@ static int lqt_ffmpeg_encode_video(quick
if(!codec->initialized)
{
- codec->frame = avcodec_alloc_frame();
+ codec->frame = av_frame_alloc();
/* time_base is 1/framerate for constant framerate */
@@ -1396,9 +1396,9 @@ static int lqt_ffmpeg_encode_video(quick
if(vtrack->stream_cmodel == BC_RGBA8888)
{
/* Libquicktime doesn't natively support a color model equivalent
- to PIX_FMT_ARGB, which is required for QTRLE with alpha channel.
+ to AV_PIX_FMT_ARGB, which is required for QTRLE with alpha channel.
So, we use BC_RGBA8888 and do ad hoc conversion below. */
- codec->avctx->pix_fmt = PIX_FMT_ARGB;
+ codec->avctx->pix_fmt = AV_PIX_FMT_ARGB;
vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32;
}
}
@@ -1467,7 +1467,7 @@ static int lqt_ffmpeg_encode_video(quick
}
// codec->lqt_colormodel = ffmepg_2_lqt(codec->com.ffcodec_enc);
- if(codec->y_offset != 0 || codec->avctx->pix_fmt == PIX_FMT_ARGB)
+ if(codec->y_offset != 0 || codec->avctx->pix_fmt == AV_PIX_FMT_ARGB)
{
if(!codec->tmp_rows)
{
@@ -1492,7 +1492,7 @@ static int lqt_ffmpeg_encode_video(quick
vtrack->stream_cmodel,
0, 0, 0, codec->y_offset);
}
- else if(codec->avctx->pix_fmt == PIX_FMT_ARGB)
+ else if(codec->avctx->pix_fmt == AV_PIX_FMT_ARGB)
{
convert_rgba_to_argb(row_pointers[0], vtrack->stream_row_span,
codec->tmp_rows[0], codec->tmp_row_span,
@@ -1600,7 +1600,7 @@ static int lqt_ffmpeg_encode_video(quick
{
int advanced = 0;
if(codec->avctx->max_b_frames ||
- (codec->avctx->flags & (CODEC_FLAG_QPEL|CODEC_FLAG_GMC)))
+ (codec->avctx->flags & (AV_CODEC_FLAG_QPEL|CODEC_FLAG_GMC)))
advanced = 1;
setup_header_mpeg4(file, track, codec->avctx->extradata,

654
libav10.patch
Unescape View File

@ -1,654 +0,0 @@
Description: build against libav10 (Closes: #739325)
Author: Reinhard Tartler <siretart@tauware.de>
Bug-Debian: http://bugs.debian.org/739325
Last-Update: 2014-03-16
--- libquicktime-1.2.4.orig/plugins/ffmpeg/lqt_ffmpeg.c
+++ libquicktime-1.2.4/plugins/ffmpeg/lqt_ffmpeg.c
@@ -386,7 +386,7 @@ static lqt_image_size_static_t image_siz
struct CODECIDMAP codecidmap_v[] =
{
{
- .id = CODEC_ID_MPEG1VIDEO,
+ .id = AV_CODEC_ID_MPEG1VIDEO,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -397,7 +397,7 @@ struct CODECIDMAP codecidmap_v[] =
.wav_ids = { LQT_WAV_ID_NONE }
},
{
- .id = CODEC_ID_MPEG4,
+ .id = AV_CODEC_ID_MPEG4,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -415,7 +415,7 @@ struct CODECIDMAP codecidmap_v[] =
.compression_id = LQT_COMPRESSION_MPEG4_ASP,
},
{
- .id = CODEC_ID_MSMPEG4V1,
+ .id = AV_CODEC_ID_MSMPEG4V1,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -426,7 +426,7 @@ struct CODECIDMAP codecidmap_v[] =
.wav_ids = { LQT_WAV_ID_NONE },
},
{
- .id = CODEC_ID_MSMPEG4V2,
+ .id = AV_CODEC_ID_MSMPEG4V2,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -437,7 +437,7 @@ struct CODECIDMAP codecidmap_v[] =
.wav_ids = { LQT_WAV_ID_NONE },
},
{
- .id = CODEC_ID_MSMPEG4V3,
+ .id = AV_CODEC_ID_MSMPEG4V3,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -453,7 +453,7 @@ struct CODECIDMAP codecidmap_v[] =
.do_encode = 1,
},
{
- .id = CODEC_ID_MSMPEG4V3,
+ .id = AV_CODEC_ID_MSMPEG4V3,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -468,7 +468,7 @@ struct CODECIDMAP codecidmap_v[] =
},
#if 0
{
- .id = CODEC_ID_WMV1,
+ .id = AV_CODEC_ID_WMV1,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -481,7 +481,7 @@ struct CODECIDMAP codecidmap_v[] =
},
#endif
{
- .id = CODEC_ID_H263,
+ .id = AV_CODEC_ID_H263,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -493,7 +493,7 @@ struct CODECIDMAP codecidmap_v[] =
.compatibility_flags = LQT_FILE_QT_OLD | LQT_FILE_QT | LQT_FILE_MP4 | LQT_FILE_3GP,
},
{
- .id = CODEC_ID_H263,
+ .id = AV_CODEC_ID_H263,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -508,7 +508,7 @@ struct CODECIDMAP codecidmap_v[] =
.do_encode = 1,
},
{
- .id = CODEC_ID_H264,
+ .id = AV_CODEC_ID_H264,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -519,7 +519,7 @@ struct CODECIDMAP codecidmap_v[] =
.wav_ids = { LQT_WAV_ID_NONE },
},
{
- .id = CODEC_ID_H263P,
+ .id = AV_CODEC_ID_H263P,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -533,7 +533,7 @@ struct CODECIDMAP codecidmap_v[] =
.do_encode = 1,
},
{
- .id = CODEC_ID_H263I,
+ .id = AV_CODEC_ID_H263I,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -544,7 +544,7 @@ struct CODECIDMAP codecidmap_v[] =
.wav_ids = { LQT_WAV_ID_NONE },
},
{
- .id = CODEC_ID_SVQ1,
+ .id = AV_CODEC_ID_SVQ1,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -555,7 +555,7 @@ struct CODECIDMAP codecidmap_v[] =
.wav_ids = { LQT_WAV_ID_NONE },
},
{
- .id = CODEC_ID_SVQ3,
+ .id = AV_CODEC_ID_SVQ3,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -566,7 +566,7 @@ struct CODECIDMAP codecidmap_v[] =
.wav_ids = { LQT_WAV_ID_NONE },
},
{
- .id = CODEC_ID_MJPEG,
+ .id = AV_CODEC_ID_MJPEG,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -580,7 +580,7 @@ struct CODECIDMAP codecidmap_v[] =
.do_encode = 1,
},
{
- .id = CODEC_ID_MJPEGB,
+ .id = AV_CODEC_ID_MJPEGB,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -594,7 +594,7 @@ struct CODECIDMAP codecidmap_v[] =
},
#if LIBAVCODEC_BUILD >= 3346688
{
- .id = CODEC_ID_TARGA,
+ .id = AV_CODEC_ID_TARGA,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -606,7 +606,7 @@ struct CODECIDMAP codecidmap_v[] =
#endif
#if LIBAVCODEC_BUILD >= 3347456
{
- .id = CODEC_ID_TIFF,
+ .id = AV_CODEC_ID_TIFF,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -617,7 +617,7 @@ struct CODECIDMAP codecidmap_v[] =
},
#endif
{
- .id = CODEC_ID_8BPS,
+ .id = AV_CODEC_ID_8BPS,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -627,7 +627,7 @@ struct CODECIDMAP codecidmap_v[] =
.wav_ids = { LQT_WAV_ID_NONE },
},
{
- .id = CODEC_ID_INDEO3,
+ .id = AV_CODEC_ID_INDEO3,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -638,7 +638,7 @@ struct CODECIDMAP codecidmap_v[] =
.wav_ids = { LQT_WAV_ID_NONE },
},
{
- .id = CODEC_ID_RPZA,
+ .id = AV_CODEC_ID_RPZA,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -648,7 +648,7 @@ struct CODECIDMAP codecidmap_v[] =
.wav_ids = { LQT_WAV_ID_NONE },
},
{
- .id = CODEC_ID_SMC,
+ .id = AV_CODEC_ID_SMC,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -658,7 +658,7 @@ struct CODECIDMAP codecidmap_v[] =
.wav_ids = { LQT_WAV_ID_NONE },
},
{
- .id = CODEC_ID_CINEPAK,
+ .id = AV_CODEC_ID_CINEPAK,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -669,7 +669,7 @@ struct CODECIDMAP codecidmap_v[] =
.wav_ids = { LQT_WAV_ID_NONE },
},
{
- .id = CODEC_ID_CYUV,
+ .id = AV_CODEC_ID_CYUV,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -680,7 +680,7 @@ struct CODECIDMAP codecidmap_v[] =
.wav_ids = { LQT_WAV_ID_NONE },
},
{
- .id = CODEC_ID_QTRLE,
+ .id = AV_CODEC_ID_QTRLE,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -693,7 +693,7 @@ struct CODECIDMAP codecidmap_v[] =
.encoding_colormodels = (int[]){ BC_RGB888, BC_RGBA8888, LQT_COLORMODEL_NONE },
},
{
- .id = CODEC_ID_MSRLE,
+ .id = AV_CODEC_ID_MSRLE,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -703,7 +703,7 @@ struct CODECIDMAP codecidmap_v[] =
.wav_ids = { LQT_WAV_ID_NONE },
},
{
- .id = CODEC_ID_DVVIDEO,
+ .id = AV_CODEC_ID_DVVIDEO,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -719,7 +719,7 @@ struct CODECIDMAP codecidmap_v[] =
.image_sizes = image_sizes_dv,
},
{
- .id = CODEC_ID_DVVIDEO,
+ .id = AV_CODEC_ID_DVVIDEO,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -735,7 +735,7 @@ struct CODECIDMAP codecidmap_v[] =
.image_sizes = image_sizes_dv,
},
{
- .id = CODEC_ID_DVVIDEO,
+ .id = AV_CODEC_ID_DVVIDEO,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -751,7 +751,7 @@ struct CODECIDMAP codecidmap_v[] =
},
/* DVCPRO HD (decoding only for now) */
{
- .id = CODEC_ID_DVVIDEO,
+ .id = AV_CODEC_ID_DVVIDEO,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -772,7 +772,7 @@ struct CODECIDMAP codecidmap_v[] =
// .do_encode = 1
},
{
- .id = CODEC_ID_FFVHUFF,
+ .id = AV_CODEC_ID_FFVHUFF,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -785,7 +785,7 @@ struct CODECIDMAP codecidmap_v[] =
.do_encode = 1
},
{
- .id = CODEC_ID_FFV1,
+ .id = AV_CODEC_ID_FFV1,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -801,7 +801,7 @@ struct CODECIDMAP codecidmap_v[] =
},
#if LIBAVCODEC_BUILD >= 3352576
{
- .id = CODEC_ID_DNXHD,
+ .id = AV_CODEC_ID_DNXHD,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -817,7 +817,7 @@ struct CODECIDMAP codecidmap_v[] =
},
#endif
{
- .id = CODEC_ID_MPEG2VIDEO,
+ .id = AV_CODEC_ID_MPEG2VIDEO,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -839,7 +839,7 @@ struct CODECIDMAP codecidmap_v[] =
struct CODECIDMAP codecidmap_a[] =
{
{
- .id = CODEC_ID_MP3,
+ .id = AV_CODEC_ID_MP3,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -851,7 +851,7 @@ struct CODECIDMAP codecidmap_a[] =
.wav_ids = { 0x50, 0x55, LQT_WAV_ID_NONE },
},
{
- .id = CODEC_ID_MP2,
+ .id = AV_CODEC_ID_MP2,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -866,7 +866,7 @@ struct CODECIDMAP codecidmap_a[] =
.compression_id = LQT_COMPRESSION_MP2,
},
{
- .id = CODEC_ID_AC3,
+ .id = AV_CODEC_ID_AC3,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -881,7 +881,7 @@ struct CODECIDMAP codecidmap_a[] =
.compression_id = LQT_COMPRESSION_AC3,
},
{
- .id = CODEC_ID_QDM2,
+ .id = AV_CODEC_ID_QDM2,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -896,7 +896,7 @@ struct CODECIDMAP codecidmap_a[] =
#if 1
/* Doesn't work as long as audio chunks are not split into VBR "Samples" */
{
- .id = CODEC_ID_ALAC,
+ .id = AV_CODEC_ID_ALAC,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -909,7 +909,7 @@ struct CODECIDMAP codecidmap_a[] =
#if 1
/* Sounds ugly */
{
- .id = CODEC_ID_ADPCM_MS,
+ .id = AV_CODEC_ID_ADPCM_MS,
.index = -1,
.encoder = NULL,
.decoder = NULL,
@@ -922,7 +922,7 @@ struct CODECIDMAP codecidmap_a[] =
#if 1
/* Sounds ugly */
{
- .id = CODEC_ID_ADPCM_IMA_WAV,
+ .id = AV_CODEC_ID_ADPCM_IMA_WAV,
.index = -1,
.encoder = NULL,
.decoder = NULL,
--- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c
+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c
@@ -626,7 +632,7 @@ static int decode_chunk(quicktime_t * fi
{
/* If the codec is mp3, make sure to decode the very last frame */
- if((codec->avctx->codec_id == CODEC_ID_MP3) &&
+ if((codec->avctx->codec_id == AV_CODEC_ID_MP3) &&
(codec->bytes_in_chunk_buffer >= 4))
{
if(!mpa_decode_header(&mph, codec->chunk_buffer, (const mpa_header*)0))
@@ -695,7 +701,7 @@ static int decode_chunk(quicktime_t * fi
/* Some really broken mp3 files have the header bytes split across 2 chunks */
- if(codec->avctx->codec_id == CODEC_ID_MP3)
+ if(codec->avctx->codec_id == AV_CODEC_ID_MP3)
{
if(codec->bytes_in_chunk_buffer < 4)
{
@@ -806,7 +812,7 @@ static int decode_chunk(quicktime_t * fi
if(bytes_decoded < 0)
{
- if(codec->avctx->codec_id == CODEC_ID_MP3)
+ if(codec->avctx->codec_id == AV_CODEC_ID_MP3)
{
/* For mp3, bytes_decoded < 0 means, that the frame should be muted */
memset(&codec->sample_buffer[track_map->channels * (codec->sample_buffer_end -
@@ -866,8 +872,8 @@ static void init_compression_info(quickt
quicktime_audio_map_t *track_map = &file->atracks[track];
quicktime_ffmpeg_audio_codec_t *codec = track_map->codec->priv;
- if((codec->decoder->id == CODEC_ID_MP2) ||
- (codec->decoder->id == CODEC_ID_MP3))
+ if((codec->decoder->id == AV_CODEC_ID_MP2) ||
+ (codec->decoder->id == AV_CODEC_ID_MP3))
{
mpa_header h;
uint32_t header;
@@ -909,7 +915,7 @@ static void init_compression_info(quickt
else
track_map->ci.bitrate = h.bitrate;
}
- else if(codec->decoder->id == CODEC_ID_AC3)
+ else if(codec->decoder->id == AV_CODEC_ID_AC3)
{
a52_header h;
uint8_t * ptr;
@@ -986,7 +992,7 @@ static int lqt_ffmpeg_decode_audio(quick
#endif
/* Some codecs need extra stuff */
- if(codec->decoder->id == CODEC_ID_ALAC)
+ if(codec->decoder->id == AV_CODEC_ID_ALAC)
{
header = quicktime_wave_get_user_atom(track_map->track, "alac", &header_len);
if(header)
@@ -995,7 +1001,7 @@ static int lqt_ffmpeg_decode_audio(quick
codec->avctx->extradata_size = header_len;
}
}
- if(codec->decoder->id == CODEC_ID_QDM2)
+ if(codec->decoder->id == AV_CODEC_ID_QDM2)
{
header = quicktime_wave_get_user_atom(track_map->track, "QDCA", &header_len);
if(header)
@@ -1495,9 +1501,9 @@ void quicktime_init_audio_codec_ffmpeg(q
codec_base->decode_audio = lqt_ffmpeg_decode_audio;
codec_base->set_parameter = set_parameter;
- if((decoder->id == CODEC_ID_MP3) || (decoder->id == CODEC_ID_MP2))
+ if((decoder->id == AV_CODEC_ID_MP3) || (decoder->id == AV_CODEC_ID_MP2))
codec_base->read_packet = read_packet_mpa;
- else if(decoder->id == CODEC_ID_AC3)
+ else if(decoder->id == AV_CODEC_ID_AC3)
{
codec_base->write_packet = write_packet_ac3;
codec_base->read_packet = read_packet_ac3;
--- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c
+++ libquicktime-1.2.4/plugins/ffmpeg/video.c
@@ -400,7 +400,7 @@ static void lqt_ffmpeg_setup_decoding_co
return;
}
}
- else if(codec->decoder->id == CODEC_ID_DNXHD)
+ else if(codec->decoder->id == AV_CODEC_ID_DNXHD)
{
/* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which
we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */
@@ -438,7 +438,7 @@ static void lqt_ffmpeg_setup_encoding_co
quicktime_ffmpeg_video_codec_t *codec = vtrack->codec->priv;
codec->avctx->pix_fmt = lqt_ffmpeg_get_ffmpeg_colormodel(vtrack->stream_cmodel);
- if (codec->encoder->id == CODEC_ID_DNXHD)
+ if (codec->encoder->id == AV_CODEC_ID_DNXHD)
{
/* FFMpeg's DNxHD encoder only supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10
and doesn't know anything about PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10
@@ -728,13 +728,13 @@ static int lqt_ffmpeg_decode_video(quick
/* Set extradata: It's done differently for each codec */
- if(codec->decoder->id == CODEC_ID_SVQ3)
+ if(codec->decoder->id == AV_CODEC_ID_SVQ3)
{
extradata = trak->mdia.minf.stbl.stsd.table[0].table_raw + 4;
extradata_size = trak->mdia.minf.stbl.stsd.table[0].table_raw_size - 4;
}
- else if(codec->decoder->id == CODEC_ID_H264)
+ else if(codec->decoder->id == AV_CODEC_ID_H264)
{
user_atom = quicktime_stsd_get_user_atom(trak, "avcC", &user_atom_len);
@@ -753,7 +753,7 @@ static int lqt_ffmpeg_decode_video(quick
}
}
- else if(codec->decoder->id == CODEC_ID_MPEG4)
+ else if(codec->decoder->id == AV_CODEC_ID_MPEG4)
{
if(trak->mdia.minf.stbl.stsd.table[0].has_esds)
{
@@ -947,15 +947,15 @@ static int lqt_ffmpeg_decode_video(quick
}
#endif
}
- if(codec->decoder->id == CODEC_ID_DVVIDEO)
+ if(codec->decoder->id == AV_CODEC_ID_DVVIDEO)
{
if(vtrack->stream_cmodel == BC_YUV420P)
vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL;
vtrack->interlace_mode = LQT_INTERLACE_BOTTOM_FIRST;
vtrack->ci.id = LQT_COMPRESSION_DV;
}
- else if((codec->decoder->id == CODEC_ID_MPEG4) ||
- (codec->decoder->id == CODEC_ID_H264))
+ else if((codec->decoder->id == AV_CODEC_ID_MPEG4) ||
+ (codec->decoder->id == AV_CODEC_ID_H264))
{
if(vtrack->stream_cmodel == BC_YUV420P)
vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2;
@@ -1299,13 +1299,13 @@ static int lqt_ffmpeg_encode_video(quick
{
if(vtrack->stream_cmodel == BC_YUV420P)
{
- if(codec->encoder->id == CODEC_ID_MPEG4)
+ if(codec->encoder->id == AV_CODEC_ID_MPEG4)
{
vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2;
/* enable interlaced encoding */
vtrack->interlace_mode = LQT_INTERLACE_NONE;
}
- else if(codec->encoder->id == CODEC_ID_DVVIDEO)
+ else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO)
{
vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL;
}
@@ -1340,7 +1340,7 @@ static int lqt_ffmpeg_encode_video(quick
codec->avctx->sample_aspect_ratio.num = pixel_width;
codec->avctx->sample_aspect_ratio.den = pixel_height;
/* Use global headers for mp4v */
- if(codec->encoder->id == CODEC_ID_MPEG4)
+ if(codec->encoder->id == AV_CODEC_ID_MPEG4)
{
if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML)))
{
@@ -1364,12 +1364,12 @@ static int lqt_ffmpeg_encode_video(quick
}
#endif
}
- else if((codec->encoder->id == CODEC_ID_MSMPEG4V3) && (trak->strl) &&
+ else if((codec->encoder->id == AV_CODEC_ID_MSMPEG4V3) && (trak->strl) &&
!strncmp(trak->strl->strf.bh.biCompression, "DIV3", 4))
{
strncpy(trak->strl->strh.fccHandler, "div3", 4);
}
- else if((codec->encoder->id == CODEC_ID_H263) &&
+ else if((codec->encoder->id == AV_CODEC_ID_H263) &&
(file->file_type & (LQT_FILE_MP4|LQT_FILE_3GP)))
{
uint8_t d263_data[] =
@@ -1383,7 +1383,7 @@ static int lqt_ffmpeg_encode_video(quick
strncpy(trak->mdia.minf.stbl.stsd.table[0].format,
"s263", 4);
}
- else if(codec->encoder->id == CODEC_ID_FFVHUFF)
+ else if(codec->encoder->id == AV_CODEC_ID_FFVHUFF)
{
if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML)))
{
@@ -1391,7 +1391,7 @@ static int lqt_ffmpeg_encode_video(quick
codec->write_global_header = 1;
}
}
- else if(codec->encoder->id == CODEC_ID_QTRLE)
+ else if(codec->encoder->id == AV_CODEC_ID_QTRLE)
{
if(vtrack->stream_cmodel == BC_RGBA8888)
{
@@ -1402,11 +1402,11 @@ static int lqt_ffmpeg_encode_video(quick
vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32;
}
}
- else if(codec->encoder->id == CODEC_ID_DVVIDEO)
+ else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO)
{
set_dv_fourcc(width, height, vtrack->stream_cmodel, trak);
}
- else if(codec->encoder->id == CODEC_ID_DNXHD)
+ else if(codec->encoder->id == AV_CODEC_ID_DNXHD)
{
if(vtrack->interlace_mode != LQT_INTERLACE_NONE)
{
@@ -1558,12 +1558,12 @@ static int lqt_ffmpeg_encode_video(quick
#endif
- if(!was_initialized && codec->encoder->id == CODEC_ID_DNXHD)
+ if(!was_initialized && codec->encoder->id == AV_CODEC_ID_DNXHD)
setup_avid_atoms(file, vtrack, codec->buffer, bytes_encoded);
if(bytes_encoded)
{
- if (pts == AV_NOPTS_VALUE || (codec->encoder->id == CODEC_ID_DNXHD && pts == 0))
+ if (pts == AV_NOPTS_VALUE || (codec->encoder->id == AV_CODEC_ID_DNXHD && pts == 0))
{
/* Some codecs don't bother generating presentation timestamps.
FFMpeg's DNxHD encoder doesn't even bother to set it to AV_NOPTS_VALUE. */
@@ -1590,13 +1590,13 @@ static int lqt_ffmpeg_encode_video(quick
if(codec->write_global_header && !codec->global_header_written)
{
- if(codec->encoder->id == CODEC_ID_FFVHUFF)
+ if(codec->encoder->id == AV_CODEC_ID_FFVHUFF)
{
quicktime_user_atoms_add_atom(&trak->mdia.minf.stbl.stsd.table[0].user_atoms,
"glbl",
codec->avctx->extradata, codec->avctx->extradata_size );
}
- else if(codec->encoder->id == CODEC_ID_MPEG4)
+ else if(codec->encoder->id == AV_CODEC_ID_MPEG4)
{
int advanced = 0;
if(codec->avctx->max_b_frames ||
@@ -1903,18 +1903,18 @@ void quicktime_init_video_codec_ffmpeg(q
codec_base->encode_video = lqt_ffmpeg_encode_video;
codec_base->set_pass = set_pass_ffmpeg;
- if(encoder->id == CODEC_ID_MPEG4)
+ if(encoder->id == AV_CODEC_ID_MPEG4)
{
codec_base->writes_compressed = writes_compressed_mpeg4;
codec_base->init_compressed = init_compressed_mpeg4;
codec_base->write_packet = write_packet_mpeg4;
}
- else if(encoder->id == CODEC_ID_MPEG2VIDEO)
+ else if(encoder->id == AV_CODEC_ID_MPEG2VIDEO)
{
codec_base->writes_compressed = writes_compressed_imx;
codec_base->init_compressed = init_compressed_imx;
}
- else if(encoder->id == CODEC_ID_DVVIDEO)
+ else if(encoder->id == AV_CODEC_ID_DVVIDEO)
{
codec_base->init_compressed = init_compressed_dv;
}
@@ -1922,7 +1922,7 @@ void quicktime_init_video_codec_ffmpeg(q
}
if(decoder)
{
- if(decoder->id == CODEC_ID_H264)
+ if(decoder->id == AV_CODEC_ID_H264)
codec_base->read_packet = read_packet_h264;
codec_base->decode_video = lqt_ffmpeg_decode_video;
}

250
libquicktime-backport.patch
Unescape View File

@ -1,250 +0,0 @@
diff -up libquicktime-1.2.4/plugins/ffmpeg/audio.c.backport libquicktime-1.2.4/plugins/ffmpeg/audio.c
--- libquicktime-1.2.4/plugins/ffmpeg/audio.c.backport 2012-03-29 21:44:28.000000000 +0200
+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c 2013-08-26 12:14:47.099995207 +0200
@@ -45,6 +45,11 @@
#define ENCODE_AUDIO 1
#endif
+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
+/* from libavcodec/avcodec.h dated Dec 23 2012 */
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
+#endif
+
/* The following code was ported from gmerlin_avdecoder (http://gmerlin.sourceforge.net) */
/* MPEG Audio header parsing code */
diff -up libquicktime-1.2.4/plugins/ffmpeg/params.c.backport libquicktime-1.2.4/plugins/ffmpeg/params.c
--- libquicktime-1.2.4/plugins/ffmpeg/params.c.backport 2012-03-07 15:10:41.000000000 +0100
+++ libquicktime-1.2.4/plugins/ffmpeg/params.c 2013-08-26 12:14:47.098995232 +0200
@@ -101,6 +101,17 @@ typedef struct
} \
}
+#define PARAM_DICT_INT(name, dict_name) \
+ { \
+ if(!strcasecmp(name, key)) \
+ { \
+ char buf[128]; \
+ snprintf(buf, sizeof(buf), "%d", *(int*)value); \
+ av_dict_set(options, dict_name, buf, 0); \
+ found = 1; \
+ } \
+ }
+
#define PARAM_DICT_FLAG(name, dict_name) \
{ \
if(!strcasecmp(name, key)) \
@@ -202,8 +213,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
PARAM_INT("ff_max_b_frames",max_b_frames);
PARAM_FLOAT("ff_b_quant_factor",b_quant_factor);
PARAM_INT("ff_b_frame_strategy",b_frame_strategy);
+
+#if LIBAVCODEC_VERSION_MAJOR >= 55
+ PARAM_DICT_INT("ff_luma_elim_threshold","luma_elim_threshold");
+ PARAM_DICT_INT("ff_chroma_elim_threshold","chroma_elim_threshold");
+#else
PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold);
PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold);
+#endif
+
PARAM_INT("ff_strict_std_compliance",strict_std_compliance);
PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset);
PARAM_INT("ff_rc_min_rate",rc_min_rate);
@@ -241,8 +259,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
PARAM_QP2LAMBDA("ff_lmax", lmax);
PARAM_INT("ff_noise_reduction",noise_reduction);
PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000);
+
+#if LIBAVCODEC_VERSION_MAJOR >= 55
+ PARAM_DICT_INT("ff_inter_threshold","inter_threshold");
+ PARAM_DICT_INT("ff_quantizer_noise_shaping","quantizer_noise_shaping");
+#else
PARAM_INT("ff_inter_threshold",inter_threshold);
PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping);
+#endif
+
PARAM_INT("ff_thread_count",thread_count);
PARAM_INT("ff_me_threshold",me_threshold);
PARAM_INT("ff_mb_threshold",mb_threshold);
@@ -272,8 +297,16 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT);
PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED);
// PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused
+
+#if LIBAVCODEC_VERSION_MAJOR >= 55
+ PARAM_DICT_FLAG("ff_flag_cbp_rd","cbp_rd");
+ PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd");
+ PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop");
+#else
PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD);
PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD);
+ PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP);
+#endif
#if LIBAVCODEC_VERSION_MAJOR >= 54
PARAM_DICT_FLAG("ff_flag_h263p_aiv", "aiv");
@@ -288,7 +321,6 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER);
PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP);
PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST);
- PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP);
PARAM_ENUM("ff_coder_type",coder_type,coder_type);
}
diff -up libquicktime-1.2.4/plugins/ffmpeg/video.c.backport libquicktime-1.2.4/plugins/ffmpeg/video.c
--- libquicktime-1.2.4/plugins/ffmpeg/video.c.backport 2012-02-25 20:46:56.000000000 +0100
+++ libquicktime-1.2.4/plugins/ffmpeg/video.c 2013-08-26 12:21:24.272962173 +0200
@@ -400,7 +400,17 @@ static void lqt_ffmpeg_setup_decoding_co
codec->reinterpret_pix_fmt = codec->avctx->pix_fmt;
/* First we try codec-specific colormodel matching. */
- if(codec->decoder->id == CODEC_ID_DNXHD)
+ if(codec->is_imx && quicktime_match_32(vtrack->track->mdia.minf.stbl.stsd.table[0].format, "AVmp"))
+ {
+ if (lqt_ffmpeg_get_avid_yuv_range(vtrack->track) == AVID_FULL_YUV_RANGE)
+ {
+ vtrack->stream_cmodel = BC_YUVJ422P;
+ codec->reinterpret_pix_fmt = PIX_FMT_YUVJ422P;
+ *exact = 1;
+ return;
+ }
+ }
+ else if(codec->decoder->id == CODEC_ID_DNXHD)
{
/* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which
we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */
@@ -662,12 +672,13 @@ static void lqt_ffmpeg_imx_setup_decodin
codec->y_offset = codec->avctx->height - trak->tkhd.track_height;
vtrack->height_extension = 0;
} else {
+ int stsd_height = trak->mdia.minf.stbl.stsd.table[0].height;
codec->y_offset = 0;
- if (vtrack->height_extension == codec->avctx->height - trak->tkhd.track_height) {
+ if (vtrack->height_extension == codec->avctx->height - stsd_height) {
return;
}
- vtrack->height_extension = codec->avctx->height - trak->tkhd.track_height;
+ vtrack->height_extension = codec->avctx->height - stsd_height;
/* Now we need a larger temp_frame */
if (vtrack->temp_frame) {
@@ -883,8 +894,9 @@ static int lqt_ffmpeg_decode_video(quick
&got_pic,
&codec->pkt) < 0)
{
- lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "Skipping corrupted frame");
- continue;
+ lqt_log(file, LQT_LOG_WARNING, LOG_DOMAIN, "Broken frame encountered");
+ codec->decoding_delay--;
+ return 1;
}
#if LIBAVCODEC_VERSION_MAJOR >= 54
@@ -907,15 +919,16 @@ static int lqt_ffmpeg_decode_video(quick
codec->buffer,
buffer_size) < 0)
{
- lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "Skipping corrupted frame");
- continue;
+ lqt_log(file, LQT_LOG_WARNING, LOG_DOMAIN, "Broken frame encountered");
+ codec->decoding_delay--;
+ return 1;
}
#endif
if(got_pic)
codec->decoding_delay--;
if((buffer_size <= 0) && !got_pic)
- return 0;
+ return 1;
}
}
@@ -972,9 +985,11 @@ static int lqt_ffmpeg_decode_video(quick
vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2;
vtrack->ci.id = LQT_COMPRESSION_D10;
- vtrack->ci.bitrate =
- (trak->mdia.minf.stbl.stsd.table[0].format[2] - '0') *
- 10000000;
+ if (quicktime_match_32(trak->mdia.minf.stbl.stsd.table[0].format, "AVmp"))
+ vtrack->ci.bitrate = 50000000;
+ else
+ vtrack->ci.bitrate =
+ (trak->mdia.minf.stbl.stsd.table[0].format[2] - '0') * 10000000;
}
if(codec->avctx->sample_aspect_ratio.num)
@@ -1138,7 +1153,7 @@ static int init_imx_encoder(quicktime_t
codec->avctx->gop_size = 0;
codec->avctx->intra_dc_precision = 2;
codec->avctx->qmin = 1;
- codec->avctx->qmax = 3;
+ codec->avctx->qmax = codec->imx_bitrate == 30 ? 8 : 3;
codec->avctx->rtp_payload_size = 1; // ??
codec->avctx->rc_buffer_aggressivity = 0.25;
codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_LOW_DELAY;
@@ -1294,6 +1309,7 @@ static int lqt_ffmpeg_encode_video(quick
#endif
int64_t pts;
int kf;
+ uint8_t* encoded_data;
if(!row_pointers)
{
@@ -1335,7 +1351,12 @@ static int lqt_ffmpeg_encode_video(quick
codec->avctx->height = height;
lqt_ffmpeg_setup_encoding_colormodel(vtrack);
-
+#if ENCODE_VIDEO2
+ codec->frame->width = width;
+ codec->frame->height = height;
+ codec->frame->format = codec->avctx->pix_fmt;
+#endif
+
lqt_get_pixel_aspect(file, track, &pixel_width, &pixel_height);
codec->avctx->sample_aspect_ratio.num = pixel_width;
codec->avctx->sample_aspect_ratio.den = pixel_height;
@@ -1540,6 +1561,7 @@ static int lqt_ffmpeg_encode_video(quick
else
bytes_encoded = 0;
+ encoded_data = pkt.data; // May be different from codec->buffer!
pts = pkt.pts;
kf = !!(pkt.flags & AV_PKT_FLAG_KEY);
@@ -1553,6 +1575,7 @@ static int lqt_ffmpeg_encode_video(quick
if(bytes_encoded < 0)
return -1;
+ encoded_data = codec->buffer;
pts = codec->avctx->coded_frame->pts;
kf = codec->avctx->coded_frame->key_frame;
@@ -1575,9 +1598,13 @@ static int lqt_ffmpeg_encode_video(quick
kf);
result = !quicktime_write_data(file,
- codec->buffer,
+ encoded_data,
bytes_encoded);
+#if ENCODE_VIDEO2
+ av_free_packet(&pkt);
+#endif
+
lqt_write_frame_footer(file, track);
/* Write stats */
@@ -1959,7 +1986,8 @@ void quicktime_init_video_codec_ffmpeg(q
quicktime_match_32(compressor, "mx5p") ||
quicktime_match_32(compressor, "mx3n") ||
quicktime_match_32(compressor, "mx4n") ||
- quicktime_match_32(compressor, "mx5n"))
+ quicktime_match_32(compressor, "mx5n") ||
+ quicktime_match_32(compressor, "AVmp"))
{
vtrack->stream_cmodel = BC_YUV422P;
codec->is_imx = 1;

33
libquicktime.spec
Unescape View File

@ -1,14 +1,18 @@
%define vers_string 1.2.4-93-g4d45177
%define rel_string .20170926.93.g4d45177
%define githash 4d451774b89fbdd2f53204f92b71837af7b06761
%define shorthash %(c=%{githash}; echo ${c:0:10})
Summary: Library for reading and writing Quicktime files
Name: libquicktime
Version: 1.2.4
Release: 27%{?dist}
Release: 28%{?rel_string}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://libquicktime.sourceforge.net/
Source0: http://downloads.sourceforge.net/libquicktime/%{name}-%{version}.tar.gz
Patch0: libquicktime-backport.patch
Patch1: libav10.patch
Patch2: ffmpeg_2.9.patch
#Source0: http://downloads.sourceforge.net/libquicktime/%{name}-%{version}.tar.gz
Source0: https://github.com/sergiomb2/%{name}/archive/%{githash}/%{name}-%{version}-%{shorthash}.tar.gz
BuildRequires: libdv-devel
BuildRequires: libpng-devel libjpeg-devel libGLU-devel
@ -22,6 +26,9 @@ BuildRequires: schroedinger-devel
BuildRequires: gettext-devel
%{?_with_faac:BuildRequires: faac-devel}
# Packages for re-configuration
BuildRequires: autoconf, automake, libtool
%package utils
Summary: Utilities for working with Quicktime files
Group: Applications/Multimedia
@ -58,15 +65,12 @@ enhancements. This package contains development files for %{name}.
# --------------------------------------------------------------------
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%setup -q -n %{name}-%{githash}
# --------------------------------------------------------------------
%build
./autogen.sh
%configure \
--enable-gpl \
--disable-rpath \
@ -81,12 +85,12 @@ enhancements. This package contains development files for %{name}.
sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
%make_build
# --------------------------------------------------------------------
%install
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%make_install
find $RPM_BUILD_ROOT%{_libdir} -type f -a -name \*.la -exec rm {} \;
@ -126,6 +130,11 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name \*.la -exec rm {} \;
# --------------------------------------------------------------------
%changelog
* Sun Jan 21 2018 Sérgio Basto <sergio@serjux.com> - 1.2.4-28.20170926.93.g4d45177
- Update to 1.2.4-93-g4d45177
- Upstream have the official patches for ffmpeg_2.9.patch libav10.patch libquicktime-backport.patch
- This release have some security fixes
* Wed Jan 17 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.2.4-27
- Rebuilt for ffmpeg-3.5 git

2
sources
Unescape View File

@ -1 +1 @@
81cfcebad9b7ee7e7cfbefc861d6d61b libquicktime-1.2.4.tar.gz
a6d79eb99e6e6e35eead1cdb32cee9ea libquicktime-1.2.4-4d451774b8.tar.gz

31
update_libquicktime.sh
Unescape View File

@ -0,0 +1,31 @@
git clone git://github.com/sergiomb2/libquicktime.git
version=1.2.4
tag=$version
pushd libquicktime
git checkout master
git pull
git log $tag..HEAD > ../ChangeLog
newdescrib=$(git describe --tags)
date=$(git log -1 --format=%cd --date=short | tr -d \-)
relversion=$(echo $newdescrib | sed "s/^[^-]*//; s/-/./g; s/^/.$date/")
githash=$(git rev-parse HEAD)
shorthash=$(echo $githash | cut -b -10)
popd
#git checkout libquicktime.spec
sed -i "s|^%define vers_string .*|%define vers_string $newdescrib|" libquicktime.spec
sed -i "s|^%define rel_string .*|%define rel_string $relversion|" libquicktime.spec
sed -i "s|^%define githash .*|%define githash $githash|" libquicktime.spec
rpmdev-bumpspec -c "Update to $newdescrib from branch $branch" libquicktime.spec
spectool -g libquicktime.spec
echo Press enter to run: rfpkg new-sources libquicktime-${version}-${shorthash}.tar.gz; read dummy;
rfpkg new-sources libquicktime-${version}-${shorthash}.tar.gz
echo Press enter to continue; read dummy;
rfpkg ci -c && git show
echo Press enter to continue; read dummy;
rfpkg push && rfpkg build --nowait
echo Press enter to continue; read dummy;
git checkout f27 && git merge master && git push && rfpkg build --nowait; git checkout master
echo Press enter to continue; read dummy;
git checkout f26 && git merge master && git push && rfpkg build --nowait; git checkout master
echo Press enter to continue; read dummy;
git checkout el7 && git merge master && git push && rfpkg build --nowait; git checkout master
Write Preview
Loading…
Cancel
Save