commit 61f55565fb96158a70ddc56c9e44312ffbd3cce5 Author: Michael Niedermayer Date: Wed Sep 7 16:48:49 2011 +0200 rtpdec_asf: fix memleak Based on a suggestion by Ronald S. Bultje Signed-off-by: Michael Niedermayer (cherry picked from commit a2b66a366d7d9d7dacc217601b5e4406624f91ea) commit b6b46db9e4fac641d2111c63f02b694250a5e90c Author: Michael Niedermayer Date: Wed Sep 7 15:18:29 2011 +0200 Update for 0.7.4 Signed-off-by: Michael Niedermayer commit 21d99be9dc00a03be94bbcc1be0a2ec6a83d9b4e Merge: 7b6b9be c2a2ad1 Author: Michael Niedermayer Date: Wed Sep 7 15:04:56 2011 +0200 Merge branch 'release/0.8' into release/0.7 * release/0.8: (21 commits) rtp: Fix integer underflow that could allow remote code execution. cavsdec: avoid possible crash with crafted input vf_scale: apply the same transform to the aspect during init that is applied per frame Fix memory corruption in case of memory allocation failure in av_probe_input_buffer() Make all option parsing functions match the function pointer type through which they are called. mjpegdec; even better RSTn skiping Fixes Ticket426 jpegdec: better rst skiping Fixes Ticket426 mpeg4: fix another packed divx issue. Fixes getting_stuck.avi mpeg4: adjust dummy frame threashold for packed divx. Fixes Ticket427 configure: add missing CFLAGS to fix building on the HURD cavs: fix some crashes with invalid bitstreams jpegdec: actually search for and parse RSTn Fix compilation with --disable-avfilter. (cherry picked from commit 67a8251690a17f05630eb6f45a73db0f0e806c72) libavfilter: fix --enable-small 0.8.2 cavs: fix oCERT #2011-002 FFmpeg/libavcodec insufficient boundary check Fix possible crash when decoding mpeg streams. Bink: clip AC coefficients during dequantization. ffmpeg: fix passlogfile regression Fix several security issues in matroskadec.c (MSVR-11-0080). ... Conflicts: Doxyfile RELEASE VERSION Merged-by: Michael Niedermayer commit c2a2ad133eb9d42361804a568dee336992349a5e Author: Michael Niedermayer Date: Wed Sep 7 14:12:42 2011 +0200 rtp: Fix integer underflow that could allow remote code execution. Fixes MSVR-11-0088 Credit: Jeong Wook Oh of Microsoft and Microsoft Vulnerability Research (MSVR) Signed-off-by: Michael Niedermayer (cherry picked from commit ba9a7e0d71bd34f8b89ae99322b62a310be163a6) commit b6187e48db484f9fe8437457bcb382c331baf8c5 Author: Michael Niedermayer Date: Wed Aug 10 17:29:51 2011 +0200 cavsdec: avoid possible crash with crafted input Signed-off-by: Michael Niedermayer (cherry picked from commit 9f06c1c61e876e930753da200bfe835817e30a53) commit 8af11e51f22705f37818f0aaded8bbd24dd34aac Author: Michael Niedermayer Date: Sat Aug 27 01:49:55 2011 +0200 vf_scale: apply the same transform to the aspect during init that is applied per frame Signed-off-by: Michael Niedermayer (cherry picked from commit c8868f28e357e7e6ffe3254d0056b3e8033fe8e5) commit f5978250524f03364c4c67f14dab86db66f7a908 Author: Michael Niedermayer Date: Sat Aug 27 21:24:13 2011 +0200 Fix memory corruption in case of memory allocation failure in av_probe_input_buffer() Reported-by: Tanami Ohad Signed-off-by: Michael Niedermayer (cherry picked from commit 941bb552c6e08b40eb7d7842df19285cd650edd0) commit 7d704f5127c8163a04026e3f53d082505c92c851 Author: Jeff Downs Date: Wed Jun 29 12:38:46 2011 -0400 Make all option parsing functions match the function pointer type through which they are called. All option parsing functions now match the function pointer signature through which they are called (int f(const char *, const char *), thereby working reliably on all platforms. Prefix all option processing functions with opt_ commit 7b6b9be8614aa53e79db565c9203b9afaa452d8d Author: Jeff Downs Date: Wed Jun 29 12:38:46 2011 -0400 Make all option parsing functions match the function pointer type through which they are called. All option parsing functions now match the function pointer signature through which they are called (int f(const char *, const char *), thereby working reliably on all platforms. Prefix all option processing functions with opt_ commit 374409eb1a640abde877bb55d2e8a1e65083699a Author: Michael Niedermayer Date: Tue Sep 6 18:20:34 2011 +0200 mjpegdec; even better RSTn skiping Fixes Ticket426 Signed-off-by: Michael Niedermayer (cherry picked from commit be7eed72c89368de70dbf8749eca1dac7443e51a) commit a352fedb2415368a032a348dcd038624637197fa Author: Michael Niedermayer Date: Thu Sep 1 23:43:56 2011 +0200 jpegdec: better rst skiping Fixes Ticket426 Signed-off-by: Michael Niedermayer commit c92068430d33e60e0b860873b174f68106007b14 Author: Michael Niedermayer Date: Tue Sep 6 04:09:43 2011 +0200 mpeg4: fix another packed divx issue. Fixes getting_stuck.avi Signed-off-by: Michael Niedermayer (cherry picked from commit 6dbac85f8d20c77283e3d01f42a7c2154bbf976d) commit 274a5b7cdb4f7199ee8f04117d20459a60199de6 Author: Michael Niedermayer Date: Fri Sep 2 18:00:31 2011 +0200 mpeg4: adjust dummy frame threashold for packed divx. Fixes Ticket427 Signed-off-by: Michael Niedermayer (cherry picked from commit 3e7e1f1509e6a84bd7873586a66de1ee43c8ef88) commit eb975b1c8bfc0d881479a5ba5c4ace4122191687 Author: Michael Niedermayer Date: Tue Sep 6 18:20:34 2011 +0200 mjpegdec; even better RSTn skiping Fixes Ticket426 Signed-off-by: Michael Niedermayer (cherry picked from commit be7eed72c89368de70dbf8749eca1dac7443e51a) commit 84648d33bac2f72dcd3f07fcbb6ef22e013715a3 Author: Michael Niedermayer Date: Thu Sep 1 23:43:56 2011 +0200 jpegdec: better rst skiping Fixes Ticket426 Signed-off-by: Michael Niedermayer (cherry picked from commit 94c2478d90c1b8c007591b8daba13e65d393d2e8) commit 4b8a0b058d05d9198534434d21384a0ee1b5a497 Author: Michael Niedermayer Date: Tue Sep 6 04:09:43 2011 +0200 mpeg4: fix another packed divx issue. Fixes getting_stuck.avi Signed-off-by: Michael Niedermayer (cherry picked from commit 6dbac85f8d20c77283e3d01f42a7c2154bbf976d) commit 1de90fd3758a71c5ff012e9288de07aa1b2915e0 Author: Michael Niedermayer Date: Fri Sep 2 18:00:31 2011 +0200 mpeg4: adjust dummy frame threashold for packed divx. Fixes Ticket427 Signed-off-by: Michael Niedermayer (cherry picked from commit 3e7e1f1509e6a84bd7873586a66de1ee43c8ef88) commit c8b37fd03dd491895f37941e7ab3d1e5611d55ec Merge: 878a7d1 b37131f Author: Michael Niedermayer Date: Fri Aug 26 01:55:08 2011 +0200 Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 * qatar/release/0.7: configure: add missing CFLAGS to fix building on the HURD Merged-by: Michael Niedermayer commit b37131f798941af1eb88e2d550203bdebb8b4324 Author: Pino Toscano Date: Fri Aug 12 14:11:21 2011 +0200 configure: add missing CFLAGS to fix building on the HURD Signed-off-by: Reinhard Tartler Signed-off-by: Luca Barbato (cherry picked from commit f60d13663742d1c695680ede83c4d646bc57d380) commit 95345e942cd5b8be6722d48e3f17782e97d09bde Author: Reimar Döffinger Date: Tue Aug 23 19:39:16 2011 +0200 Avoid crash due to ic being NULL if avformat_open_input fails. This updates the code to match current master. Should fix trac issue #410. Signed-off-by: Reimar Döffinger commit 878a7d1573d2031173a60efba453c558d826a506 Merge: 6a57021 bd968d2 Author: Michael Niedermayer Date: Sun Aug 21 22:44:58 2011 +0200 Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 * qatar/release/0.7: cavs: fix some crashes with invalid bitstreams jpegdec: actually search for and parse RSTn Conflicts: libavcodec/mjpegdec.c Merged-by: Michael Niedermayer commit bd968d260aef322fb32e254a3de0d2036c57bd56 Author: Mans Rullgard Date: Wed Aug 10 18:52:11 2011 +0100 cavs: fix some crashes with invalid bitstreams This removes all valgrind-reported invalid writes with one specific test file. Fixes http://www.ocert.org/advisories/ocert-2011-002.html Signed-off-by: Mans Rullgard (cherry picked from commit 4a71da0f3ab7f5542decd11c81994f849d5b2c78) commit 00c5cf4beb0e45e936544a5766b56e241ae03234 Author: Michael Niedermayer Date: Thu Jun 9 03:35:50 2011 +0200 jpegdec: actually search for and parse RSTn Fixes decoding of MJPEG files produced by some UVC Logitec web cameras, such as "Notebook Pro" and "HD C910". References: http://trac.videolan.org/vlc/ticket/4215 http://ffmpeg.org/trac/ffmpeg/ticket/267 Signed-off-by: Michael Niedermayer Reviewed-by: Kostya (cherry picked from commit 8c0fa61a9713a1306fca7997dd04d72ea1f060ea) commit 87757508abe36dd376093c59f00db41fe15d76a5 Author: Carl Eugen Hoyos Date: Tue Aug 16 23:31:09 2011 +0200 Fix compilation with --disable-avfilter. (cherry picked from commit 67a8251690a17f05630eb6f45a73db0f0e806c72) commit 6a57021cf96dc548b6cc2c97dedb8958225d58e3 Author: Carl Eugen Hoyos Date: Tue Aug 16 23:31:09 2011 +0200 Fix compilation with --disable-avfilter. (cherry picked from commit 67a8251690a17f05630eb6f45a73db0f0e806c72) commit f66418afba4a7fcff33d6421a190a109f574b07b Author: Michael Niedermayer Date: Thu Jul 21 11:00:47 2011 +0200 libavfilter: fix --enable-small Signed-off-by: Michael Niedermayer (cherry picked from commit 633aa01f728b3f67b420e9e34ef21a995578d613) commit f20f79307b837407ea2bdfe08515d45ce96898c8 Author: Michael Niedermayer Date: Thu Jul 21 11:00:47 2011 +0200 libavfilter: fix --enable-small Signed-off-by: Michael Niedermayer (cherry picked from commit 633aa01f728b3f67b420e9e34ef21a995578d613) commit 7371b0ca6fd396cb8c37e626391561c173431a79 Author: Michael Niedermayer Date: Wed Aug 10 13:59:49 2011 +0200 0.7.3 Signed-off-by: Michael Niedermayer commit c5cbda50793e311aa73489d12184ffd6761c9fbf Author: Michael Niedermayer Date: Wed Aug 10 13:28:36 2011 +0200 cavs: fix oCERT #2011-002 FFmpeg/libavcodec insufficient boundary check Signed-off-by: Michael Niedermayer commit d1bc77d86c5c8b013b371c1bf027f7583aef07b3 Author: Michael Niedermayer Date: Wed Aug 10 13:48:30 2011 +0200 0.8.2 Signed-off-by: Michael Niedermayer commit 91d5da9321c52e8197fb14046ebb335f3e6ff4a0 Author: Michael Niedermayer Date: Wed Aug 10 13:28:36 2011 +0200 cavs: fix oCERT #2011-002 FFmpeg/libavcodec insufficient boundary check Signed-off-by: Michael Niedermayer commit 08ddfb77a1aff378345026ba49fea9fb93ff1e70 Author: Carl Eugen Hoyos Date: Thu Aug 4 11:06:43 2011 +0200 Fix possible crash when decoding mpeg streams. This reverts 2cf8355f98681bdd726b739008acd5483f82f8d7, fixes ticket 329. commit a0352d01e95ed084e777d0c259bad1f4cee4f402 Author: Reimar Döffinger Date: Sun Jul 17 13:03:57 2011 +0200 Bink: clip AC coefficients during dequantization. Fixes artefacts with Neverwinter Nights WOTCLogo.bik (http://drmccoy.de/zeugs/WOTCLogo.bik). Fixes trac ticket #352. Signed-off-by: Reimar Döffinger (cherry picked from commit 47b71eea099b3fe2c7e16644878ad9b7067974e3) commit 8893f7d815db4efed797101d7a94718554990706 Author: Carl Eugen Hoyos Date: Thu Aug 4 11:06:43 2011 +0200 Fix possible crash when decoding mpeg streams. This reverts 2cf8355f98681bdd726b739008acd5483f82f8d7, fixes ticket 329. commit 7c772ccd276021fed1f6ea40d150d73337fc3c1b Author: Reimar Döffinger Date: Sun Jul 17 13:03:57 2011 +0200 Bink: clip AC coefficients during dequantization. Fixes artefacts with Neverwinter Nights WOTCLogo.bik (http://drmccoy.de/zeugs/WOTCLogo.bik). Fixes trac ticket #352. Signed-off-by: Reimar Döffinger (cherry picked from commit 47b71eea099b3fe2c7e16644878ad9b7067974e3) commit cf82c5cd5b584ae9ee2b2d10fb1c9f0748446071 Author: Michael Niedermayer Date: Thu Jul 28 18:32:26 2011 +0200 ffmpeg: fix passlogfile regression Signed-off-by: Michael Niedermayer (cherry picked from commit 2ff36ef521a551b99ea69dda0aa82dc9fa49a131) commit 2ff36ef521a551b99ea69dda0aa82dc9fa49a131 Author: Michael Niedermayer Date: Thu Jul 28 18:32:26 2011 +0200 ffmpeg: fix passlogfile regression Signed-off-by: Michael Niedermayer commit cb8577a4dac816f264da294ee354311899b10032 Author: Michael Niedermayer Date: Thu Jul 28 14:59:54 2011 +0200 Fix several security issues in matroskadec.c (MSVR-11-0080). Whitespace of the patch cleaned up by Aurel Some of the issues have been reported by Steve Manzuik / Microsoft Vulnerability Research (MSVR) Signed-off-by: Michael Niedermayer (cherry picked from commit 956c901c68eff78288f40e3c8f41ee2fa081d4a8) commit 7e33a66c0e178c3576c1ba1648be4295809adca8 Author: Michael Niedermayer Date: Thu Jul 28 14:59:54 2011 +0200 Fix several security issues in matroskadec.c (MSVR-11-0080). Whitespace of the patch cleaned up by Aurel Some of the issues have been reported by Steve Manzuik / Microsoft Vulnerability Research (MSVR) Signed-off-by: Michael Niedermayer (cherry picked from commit 956c901c68eff78288f40e3c8f41ee2fa081d4a8) commit b55b34f86218fcd46629b85f27cba3265f2dd62f Author: Baptiste Coudurier Date: Sun Jun 26 14:01:00 2011 -0700 ffmpeg: fix prototypes of functions after the removal of OPT_FUNC2. (cherry picked from commit 90a40b226a5c90e48da8041294c3782de6ee61fc) commit 893cf1b1ae2bc9c7987d5015a421cd2e09d06443 Author: Baptiste Coudurier Date: Sun Jun 26 14:01:00 2011 -0700 ffmpeg: fix prototypes of functions after the removal of OPT_FUNC2. (cherry picked from commit 90a40b226a5c90e48da8041294c3782de6ee61fc) commit 609d299ed06c2b00cc289129e0de7b2d57b2ab3d Author: Michael Niedermayer Date: Wed Jul 27 12:51:28 2011 +0200 update version for 0.7.2 Signed-off-by: Michael Niedermayer commit 01a0612c7081954e2bdeb24230daffff8625777b Merge: dcf1830 a8d89df Author: Michael Niedermayer Date: Wed Jul 27 11:20:13 2011 +0200 Merge branch 'release/0.8' into release/0.7 * release/0.8: (82 commits) Fix version numbers rtp: disable udp fifos, the rtp code cannot work with the fifos in its current form as rtp bypasses the public API. udp: allow fifo size to be tuned seperately riff: Add mpgv MPEG-2 fourcc Update Changelog matroskadec: fix integer underflow if header length < probe length. ffmpeg: fix operation with --disable-avfilter vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h build: Create mlib optimization directories during out-of-tree builds. changelog: misc typo and wording fixes (cherry picked from commit b047941d7da470ba0dcedb1fd0aa828075265ffc) doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support. (cherry picked from commit 5ccbf80963c1cc54aed97b1c81b1657ab91baf6a) matroskadec: matroska_read_seek after after EBML_STOP leads to failure. Update RELEASE file update Changelog mt: proper locking around release_buffer calls. vp8/mt: flush worker thread, not application thread context, on seek. docs: Mention the upstream bugzilla url about the dlltool vs MSVC issue docs: Use proper markup for a literal command line option docs: Don't recommend adding --enable-memalign-hack docs: Remove needless configure options ... Conflicts: VERSION libavcodec/opt.h libavformat/utils.c Merged-by: Michael Niedermayer commit dcf1830a15a1e9ad1e16086369d55d8cb3a14e83 Author: Reimar Döffinger Date: Tue Jul 26 21:58:10 2011 +0200 For FFmpeg 0.7 branch: Treat AV_SAMPLE_FMT_NONE as S16 for encoders. This fixes compatibility with e.g. pcm_a52 ALSA plugin which in previous versions never set sample_fmt. Signed-off-by: Reimar Döffinger commit a8d89df367859e5addd8bdbbebb4d787493397da Author: Michael Niedermayer Date: Tue Jul 26 01:01:06 2011 +0200 Fix version numbers Signed-off-by: Michael Niedermayer commit 095946afa7ae6085ee54ef19cff1d3c10b467cec Merge: 6d75dbe a05219d Author: Michael Niedermayer Date: Tue Jul 26 00:14:04 2011 +0200 Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 * qatar/release/0.7: (65 commits) riff: Add mpgv MPEG-2 fourcc Update Changelog matroskadec: fix integer underflow if header length < probe length. ffmpeg: fix operation with --disable-avfilter vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h build: Create mlib optimization directories during out-of-tree builds. changelog: misc typo and wording fixes (cherry picked from commit b047941d7da470ba0dcedb1fd0aa828075265ffc) doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support. (cherry picked from commit 5ccbf80963c1cc54aed97b1c81b1657ab91baf6a) matroskadec: matroska_read_seek after after EBML_STOP leads to failure. Update RELEASE file update Changelog mt: proper locking around release_buffer calls. vp8/mt: flush worker thread, not application thread context, on seek. docs: Mention the upstream bugzilla url about the dlltool vs MSVC issue docs: Use proper markup for a literal command line option docs: Don't recommend adding --enable-memalign-hack docs: Remove needless configure options oggdec: prevent heap corruption. oggdec: Abort Ogg header parsing when encountering a data packet. Add LGPL license boilerplate to files lacking it. ... Conflicts: Changelog configure doc/developer.texi libavcodec/libvpxenc.c libavcodec/rawdec.c libavfilter/x86/gradfun.c libavformat/Makefile libavformat/isom.c Merged-by: Michael Niedermayer commit 6d75dbebc0b7af64cbac62cf32ee5ac0911cbfaa Author: Michael Niedermayer Date: Mon Jul 25 15:50:56 2011 +0200 rtp: disable udp fifos, the rtp code cannot work with the fifos in its current form as rtp bypasses the public API. Signed-off-by: Michael Niedermayer (cherry picked from commit 158eb8599a2811ad8eed9939878982f172b79a89) commit f54b8f848287e5f3a41e629bc035ff60a31abbbc Author: Michael Niedermayer Date: Mon Jul 25 15:50:13 2011 +0200 udp: allow fifo size to be tuned seperately Signed-off-by: Michael Niedermayer (cherry picked from commit bd652ff66e2062df5a05030f211c23e7d4e0be36) commit a05219d801cdf0fd83301e893301e9f6ba0ab6ed Author: Alex Converse Date: Fri Jul 22 10:13:22 2011 -0700 riff: Add mpgv MPEG-2 fourcc Supported by mplayer and seen in the wild. (cherry picked from commit 505345ed5d180093a44da8d70ac541898c31c22f) commit c02b02d725153e4f5b612d2af256024cf1bb9bd9 Author: Reinhard Tartler Date: Thu Jul 21 09:27:23 2011 +0200 Update Changelog commit 5fab0ccd81df0bc3fd6d16756006c260fdbca6e7 Author: Chris Evans Date: Tue Jul 19 17:51:48 2011 -0700 matroskadec: fix integer underflow if header length < probe length. This fixes a crash with specifically crafted files. Signed-off-by: Ronald S. Bultje (cherry picked from commit 69619a13c3fef940cba545cf0a283ff22771dd71) commit 20829cf8a26a00c840c70f12224843e079c10ee6 Author: Mans Rullgard Date: Sun Jul 17 15:27:14 2011 +0100 ffmpeg: fix operation with --disable-avfilter The width and height must be copied from the input before being used. Signed-off-by: Mans Rullgard (cherry picked from commit e9f98c90229999c0e654bd77af55d7020347440a) commit 0b4840af0c42f96e6057ec56919f16f7fbcae3d9 Author: Stefano Sabatini Date: Fri Jul 15 15:40:31 2011 +0200 vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h cxtypes.h works with version 2.1 and older, cxcore.h works with 2.2 and older. Signed-off-by: Diego Biurrun (cherry picked from commit 9bc8bcddbd4fc394e2268e9849dcbf3bad6de980) commit 896f80f82ced236f35c286ae0b3c700044b6bfb8 Author: Diego Biurrun Date: Mon Jun 20 18:41:11 2011 +0200 build: Create mlib optimization directories during out-of-tree builds. commit b57c6d1a4cc019f2ec899f780b30e7fd1a0dd019 Author: Diego Biurrun Date: Sat Jul 9 17:43:53 2011 +0200 changelog: misc typo and wording fixes (cherry picked from commit b047941d7da470ba0dcedb1fd0aa828075265ffc) commit 3749066dd83abb3aaca748c0ef949e9c3494ba44 Author: Diego Biurrun Date: Sat Jul 9 20:15:29 2011 +0200 doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support. (cherry picked from commit 5ccbf80963c1cc54aed97b1c81b1657ab91baf6a) commit c29c609e0f4bf3fea29104c689c11f7dda499135 Author: John Stebbins Date: Fri Jul 1 08:57:42 2011 -0700 matroskadec: matroska_read_seek after after EBML_STOP leads to failure. EBML_STOP leaves matroska->current_id set. Then matroska_read_seek changes the stream position without resetting current_id. The next matroska_parse_cluster fails due to calculation of incorrect pos. So clear current_id when avio_seek happens in matroska_read_seek. Signed-off-by: Ronald S. Bultje (cherry picked from commit cdc2c1c57616956d975c57b4b69eb73865f513f5) commit 9459390f29ec6df63ff1878f13b7b4343811948a Author: Reinhard Tartler Date: Tue Jul 12 18:31:28 2011 +0200 Update RELEASE file commit 2bbd81fba310aa34f2973f5dcff0f13bac1fd9b1 Author: Reinhard Tartler Date: Mon Jul 4 12:11:40 2011 +0200 update Changelog commit 5e3578893a06644e226bcfefc726b60e2d75a890 Author: Ronald S. Bultje Date: Sun Jul 10 17:28:28 2011 -0700 mt: proper locking around release_buffer calls. This fixes a crash when seeking in some webm files with many threads (e.g. 8). (cherry picked from commit 5eafc8b46644764f8aef1b7b2ecae53ee8034822) commit dc1b670a2c34a0e1c5c0ba9531dfc8f5a6746a0b Author: Ronald S. Bultje Date: Sun Jul 10 21:23:09 2011 -0700 vp8/mt: flush worker thread, not application thread context, on seek. This prevents a crash when seeking. (cherry picked from commit d1cf45911935cc4fed9afd3a37d99616d31eb9da) commit 0156f4f9da2577b32ebbb191047d7ff0ca613c44 Author: Martin Storsjö Date: Fri Jul 8 11:00:01 2011 +0300 docs: Mention the upstream bugzilla url about the dlltool vs MSVC issue Signed-off-by: Martin Storsjö (cherry picked from commit b369f327d5e6b01a4cae9e2726df7c73b2893eba) commit a52c615a421d497614020df4e04d91e18fc8c0a2 Author: Martin Storsjö Date: Fri Jul 8 13:37:54 2011 +0300 docs: Use proper markup for a literal command line option Signed-off-by: Martin Storsjö (cherry picked from commit a3a94e1498685480800c22fc3ffa20d42ccfd527) commit 5c2d7c4dc8b8618f6586e220f4af6e4baae6dac2 Author: Reinhard Tartler Date: Tue Jul 12 18:09:55 2011 +0200 docs: Don't recommend adding --enable-memalign-hack It is enabled automatically when required nowadays. Signed-off-by: Martin Storsjö (cherry picked from commit 9d36139231bfcf155a1b94f61a420768f1771174) commit 004194f465385c743adc2e52cdb726d8f70f6c0e Author: Martin Storsjö Date: Thu Jul 7 09:51:57 2011 +0300 docs: Remove needless configure options Specifying --enable-static --disable-shared isn't necessary, these are the defaults. Signed-off-by: Martin Storsjö commit cd63c32ff6f6a24dc971a0bb2ca8f8a4f57e79da Author: Chris Evans Date: Wed Jun 29 15:44:40 2011 -0700 oggdec: prevent heap corruption. Specifically crafted samples can reinit ogg->streams[] while reading samples, and thus we should not cache old pointers since these may no longer be valid. Signed-off-by: Ronald S. Bultje (cherry picked from commit 4cc3467e7abfea7e8d03b6af511f7719038a5a98) commit 5a33a29a91fe0c3fc30eb89a0675258f538c6af8 Author: Reimar Döffinger Date: Mon Jul 4 02:57:47 2011 +0200 oggdec: Abort Ogg header parsing when encountering a data packet. Fixes Bugzilla #11. Signed-off-by: Diego Biurrun (cherry picked from commit 0a94020b5b073d1abf442e28b6db3be785aa680a) commit 683df9bf548da58e97365d61cf0338c5262ea6cc Author: Diego Biurrun Date: Sun Jul 3 19:40:34 2011 +0200 Add LGPL license boilerplate to files lacking it. (cherry picked from commit e3759c567db42c8dff255ef9f7258326da470755) commit 64e2656f7c6d03c11b8e65202fc803cf58c03e1a Author: Diego Biurrun Date: Sun Jul 3 16:09:37 2011 +0200 doxygen: Fix documentation for some VP8 functions. (cherry picked from commit 3c432e1186443fae474fa4e8613fbc21fd8a6c63) commit 8e3d264fb234db081436ab5b76525a355dc497db Author: Christian Schmidt Date: Mon Jul 4 10:41:04 2011 +0100 libxvid: add missing include of libavutil/mathematics.h Signed-off-by: Mans Rullgard (cherry picked from commit 6c374bc0b40306c84e35a4002ab7fa96ace11c6c) commit 46a2dc91753535ec36e5d743508a7b1b4602243e Author: Robert Swain Date: Mon Jul 4 08:44:49 2011 +0200 vorbis: vpxenc: Add missing include for av_rescale* Signed-off-by: Mans Rullgard (cherry picked from commit 954a6532160b9eac7773613be105fd706d639ade) commit b9e126fbe2510523dece2fe5433cdd00ab52f2f5 Author: Carl Eugen Hoyos Date: Mon Jun 27 07:25:58 2011 +0000 ffmpeg: Fix VDPAU decoding for some H264 samples. (cherry picked from commit a4ab70f92e4d8705434a2fee42a2b69a8bfa6bb1) commit 07dc4a79c701a4fd41d0973df1ab56333895faed Author: Diego Biurrun Date: Sun Jul 3 16:35:10 2011 +0200 RTSP: Doxygen comment cleanup Do not use Doxygen for comments that apply to specific implementation details; merge some duplicated Doxygen comment blocks. (cherry picked from commit f75e3da535f297ddbe501ce866e57ccca7645455) commit 43de5c034fe8d9bf1687faec8865b5967291004b Author: Diego Biurrun Date: Sun Jul 3 16:33:25 2011 +0200 doxygen: Escape '\' in Doxygen documentation. (cherry picked from commit c81a2b9b4f5488c831dc27635152394ab632c46a) commit 2f0a10174efd47f210e4863cb66da54cfb5a898e Author: Loren Merritt Date: Sun Jul 3 22:47:10 2011 +0000 vf_gradfun: relicense x86 asm to LGPL Actually I gave permission for LGPL long ago, but the original import failed to update the license header. (cherry picked from commit 082768f0b189b1706fdcd15b42dcca5fd0822315) commit 0a48a67e57873b938c49ca57b0629e3e33fe37db Author: Reimar Döffinger Date: Tue Jul 5 23:10:44 2011 +0200 Fix av_open_input_stream with uninitialized context pointer. Code would allocate a new context but forget to assign it to the pointer actually passed to avformat_open_input, potentially causing a crash. Even if it was initialized it would cause a memleak. This caused crashes with e.g. mpd, see also http://bugs.gentoo.org/show_bug.cgi?id=373423 Signed-off-by: Reimar Döffinger (cherry picked from commit 4e59c8ecf1433b85b539c5e89bb68cfe8b839866) commit e8baa8eb7f45bb5fdbfcc70ae028cd11238faa88 Author: Reimar Döffinger Date: Tue Jul 5 23:10:44 2011 +0200 Fix av_open_input_stream with uninitialized context pointer. Code would allocate a new context but forget to assign it to the pointer actually passed to avformat_open_input, potentially causing a crash. Even if it was initialized it would cause a memleak. This caused crashes with e.g. mpd, see also http://bugs.gentoo.org/show_bug.cgi?id=373423 Signed-off-by: Reimar Döffinger commit d32b2d4de164d6e2bd4b441c5f2aa0e442fef1f6 Author: Reinhard Tartler Date: Sun Jul 3 19:54:05 2011 +0200 update Changelog commit 924b2ee8f29823877b6b544b48fe153f307d7be7 Author: Reinhard Tartler Date: Sun Jul 3 20:00:31 2011 +0200 Add version number to doxygen config commit f95e5225fe1b94c5c2ee683fa75aafed22c5b3e1 Author: Reinhard Tartler Date: Sun Jul 3 19:00:59 2011 +0200 doxygen: Drop array size declarations from Doxygen parameter names. Adding [] to a Doxygen parameter name clashes with Doxygen syntax. (cherry picked from commit ff993cd7fcdfeffcac10337c0c6b69c599060c2b) commit 8f536408d1a8b6899442fd46a2e70ffb2897f4c2 Author: Diego Biurrun Date: Sun Jul 3 16:11:16 2011 +0200 doxygen: Remove spurious documentation for non-existing function parameters. (cherry picked from commit 01c17c88ede76f8321cf2c59a535dbbc5b5ff989) commit 093f0f13e611c7fd7a8ee6130c4211427033329d Author: Reinhard Tartler Date: Thu Jun 30 23:00:46 2011 +0200 doxygen: fix usage of @file directive in libavutil/{dict,file}.h (cherry picked from commit 134557f3a47697a7b5e5da2bd7e5a4b8f8d56b1c) commit c172eb7925dad8db6ad8fde9cd81a90a5cb06bb6 Author: Gavin Kinsey Date: Tue Jun 21 13:13:37 2011 +0100 Fix segmentation fault in ffprobe (cherry picked from commit c558122e4ee53dc4cb82f87749a9c28c38ca9401) commit 154ea553f672ace5890fd93f8e70d6173aa1ac4a Author: Reinhard Tartler Date: Sun Jul 3 18:58:09 2011 +0200 Update Doxyfile to the format preferred by Doxygen 1.7.1 (via 'doxygen -u'). This is the version available in Debian stable, so it should be a reasonable baseline that can be expected to be present on all developer machines. Moreover, this is the version that is used by the nightly cronjob that generates the online html version. (cherry picked from commit 10dde477c77e0ac0fecda49fdb1dc71329aa7513) commit d734d4ce6ae6e798b17c26ed1cc228891897b34f Author: Stefano Sabatini Date: Sat Jul 2 13:22:35 2011 +0200 suggest to use av_get_bytes_per_sample() in av_get_bits_per_sample_format() doxy The previously suggested replacement - av_get_bits_per_sample_fmt() - was also deprecated. Signed-off-by: Ronald S. Bultje (cherry picked from commit ccfa626db863b6019fd4c316d19d8f7018543bed) commit c445e9dc6284c24a4d527480a8f78fc89d1b56a3 Author: Stefano Sabatini Date: Sat Jul 2 13:22:18 2011 +0200 ffmpeg: use av_get_bytes_per_sample() in place of av_get_bits_per_sample_fmt() av_get_bits_per_sample_fmt() was deprecated. Signed-off-by: Ronald S. Bultje (cherry picked from commit f6d6783a4df127d2ad1cf755ac4f363decbd7fbb) commit c5c265435114ccbfd489a04d8e2f8f3d05d4d858 Author: Reinhard Tartler Date: Fri Jul 1 20:50:33 2011 +0200 libavformat: Add an example how to use the metadata API Also include it into the doxygen documentation (cherry picked from commit 12489443dec228d60fa3dc56695f6ddae08beb37) commit 2fe47b21c825460f01d3cb5546b29b686b909e4d Author: Reinhard Tartler Date: Sun Jul 3 18:55:01 2011 +0200 doxygen: Prefer member groups over grouping into modules Before this, almost all module groups have been used for grouping functions and fields in structures semantically. This causes them to not appear properly in the file documentation and needlessly clutters up the "Modules" index. Additionally, this commit streamlines some spelling and appearances. (cherry picked from commit 21a19b7912fe0622f3d1748ff102fcc7bc7a974a) commit b91ebb60d898510bc131d7ff9157fcbb0302d532 Author: Reinhard Tartler Date: Fri Jul 1 20:53:09 2011 +0200 doxygen: be more permissive when searching for API examples (cherry picked from commit 7655cfb1b8d8a70e8cc4b1ca811bfc3f293768d8) commit f1d1ef810ab4b1d5449b229c4be81321de5dff9c Author: Reinhard Tartler Date: Fri Jul 1 20:49:14 2011 +0200 avformat: doxify the Metadata API convert the comment that documents the metadata API to use the doxygen markup (cherry picked from commit 1a53a438dc04e74628b39f29d3ff81ae4aa086a0) Signed-off-by: Reinhard Tartler commit b263e94f774fa612c8329ddd95b35fdf5dac86d5 Author: Anton Khirnov Date: Fri Jun 24 07:58:16 2011 +0200 lavf: restore old behavior for custom AVIOContex with an AVFMT_NOFILE format. av_open_input_stream used to allow this, even though it makes no sense. Make it just print a warning instead of failing, thus restoring compatibility. Note that avformat_open_input() will still reject this combination. Signed-off-by: Anton Khirnov (cherry picked from commit 4f731c4429e1fe66a5c92ff15feb63253a36d8fb) Signed-off-by: Reinhard Tartler commit 9da3063e1cadf0bb4b910e4d9bcd9f859f2bbec6 Author: Anton Khirnov Date: Fri Jul 1 21:24:17 2011 +0200 lavf: use the correct pointer in av_open_input_stream(). (cherry picked from commit 5001d6ef4a2b70fe903b1d2e3e64c6ad7cc1cfa6) Signed-off-by: Reinhard Tartler commit b6fe44b9db4f204ff0794401e495b73688b50c3d Author: Reimar Döffinger Date: Sun Jun 26 13:29:17 2011 +0200 Add operand size to add instructions. In these cases it can't be guessed from the operands (at least not necessarily), and it seems some clang versions refuse to compile it. Fixes ticket #303. Signed-off-by: Reimar Döffinger (cherry picked from commit 5c13b5bb398c12361732b7b47c71954484f5af1d) commit 72ac64544f9c0529759c0a1dc16d328dd3342b9b Author: Reimar Döffinger Date: Sun Jun 26 13:29:17 2011 +0200 Add operand size to add instructions. In these cases it can't be guessed from the operands (at least not necessarily), and it seems some clang versions refuse to compile it. Fixes ticket #303. Signed-off-by: Reimar Döffinger (cherry picked from commit 5c13b5bb398c12361732b7b47c71954484f5af1d) commit 8f7f3f0453dfe3a14b70bae28301a2ee661fc3f4 Author: Ronald S. Bultje Date: Tue Jun 28 22:24:21 2011 -0700 ogg: fix double free when finding length of small chained oggs. ogg_save() copies streams[], but doesn't keep track of free()'ed struct members. Thus, if in between a call to ogg_save() and ogg_restore(), streams[].private was free()'ed, this would result in a double free -> crash, which happened when e.g. playing small chained ogg fragments. (cherry picked from commit 9ed6cbc3ee2ae3e7472fb25192a7e36fd7b15533) commit 376dfd07abf8a5f493146d818bfb04807dc8bd5a Author: Carl Eugen Hoyos Date: Fri Jul 1 02:38:28 2011 +0200 Fix possible double free when encoding using xvid. (cherry picked from commit 315f0e3fd8dcbd1362276b7407dad2e97cccc4b7) commit b62c0c0bce5c3a203a6e01a4f07d991718c5fac5 Author: Ronald S. Bultje Date: Tue Jun 28 22:24:21 2011 -0700 ogg: fix double free when finding length of small chained oggs. ogg_save() copies streams[], but doesn't keep track of free()'ed struct members. Thus, if in between a call to ogg_save() and ogg_restore(), streams[].private was free()'ed, this would result in a double free -> crash, which happened when e.g. playing small chained ogg fragments. (cherry picked from commit 9ed6cbc3ee2ae3e7472fb25192a7e36fd7b15533) commit 00498a7e59727cfe51703d84ac55e055b47c8872 Author: Carl Eugen Hoyos Date: Fri Jul 1 02:38:28 2011 +0200 Fix possible double free when encoding using xvid. (cherry picked from commit 315f0e3fd8dcbd1362276b7407dad2e97cccc4b7) commit cb66b552700c4fe54f3387eb12207049ff63dfe3 Author: Ronald S. Bultje Date: Tue Jun 28 22:24:21 2011 -0700 ogg: fix double free when finding length of small chained oggs. ogg_save() copies streams[], but doesn't keep track of free()'ed struct members. Thus, if in between a call to ogg_save() and ogg_restore(), streams[].private was free()'ed, this would result in a double free -> crash, which happened when e.g. playing small chained ogg fragments. (cherry picked from commit 9ed6cbc3ee2ae3e7472fb25192a7e36fd7b15533) Signed-off-by: Reinhard Tartler commit 9482dd0d17435c9b5b46d44cdf8af21b1f09235c Author: Kostya Shishkov Date: Tue Jun 28 11:49:32 2011 +0200 wavpack: skip blocks with no samples These blocks don't report audio stream parameters and they are not needed for decoding. Signed-off-by: Mans Rullgard (cherry picked from commit cb7b55b0962f5503f601d6b557f8945444b73395) Signed-off-by: Reinhard Tartler commit 87eedf69433d95a40830a98bb2d656a04dfd4609 Author: Jason Garrett-Glaser Date: Tue Jun 28 18:22:23 2011 -0700 Add new yuv444 pixfmts to avcodec_align_dimensions2 Fixes draw_edges crashes with high-bit-depth 4:4:4 decoding. (cherry picked from commit da55ee6ccc05efdd9006bb8c31db9012a3326857) Signed-off-by: Reinhard Tartler commit f239b91596cc469560227ae2900891d7610f018c Author: Carl Eugen Hoyos Date: Mon Jun 27 09:26:48 2011 +0200 Fix VDPAU decoding for some H264 samples. (cherry picked from commit e747b091cbc6b41f3531cfdf9d1bdd34606b1df3) commit 06107e9605cbdb8a9a06cd9fd30108c483d7a5dc Author: Carl Eugen Hoyos Date: Mon Jun 27 09:26:48 2011 +0200 Fix VDPAU decoding for some H264 samples. (cherry picked from commit e747b091cbc6b41f3531cfdf9d1bdd34606b1df3) commit d052370c1eb5c50ad2dd2cac1b967699f42c62b0 Author: Martin Matuska Date: Tue Jun 28 13:26:56 2011 +0200 pict_type: add a value for unknown/none. In commit bebe72f4a05d338e04ae9ca1e9c6b72749b488aa, the enum AV_PICTURE_TYPE_* was introduced. There are still places in the code where pict_type is used as an integer and there is a case where "pict_type = 0" with the explanation "let ffmpeg decide what to do". The new enum does not know a value of 0 and C++ will fail if compiling such programs anyway as it is refered as an int (and you cannot patch them properly). (cherry picked from commit 512933671409f9f88cc9fdfc8f29525d32240bab) commit ce993ce791cd01916d79e315d1558b016d2770df Author: Martin Matuska Date: Tue Jun 28 13:26:56 2011 +0200 pict_type: add a value for unknown/none. In commit bebe72f4a05d338e04ae9ca1e9c6b72749b488aa, the enum AV_PICTURE_TYPE_* was introduced. There are still places in the code where pict_type is used as an integer and there is a case where "pict_type = 0" with the explanation "let ffmpeg decide what to do". The new enum does not know a value of 0 and C++ will fail if compiling such programs anyway as it is refered as an int (and you cannot patch them properly). (cherry picked from commit 512933671409f9f88cc9fdfc8f29525d32240bab) commit e54fd33848355202c03edb3ebfcdb53b1d71c2ce Author: Jason Garrett-Glaser Date: Sun Jun 26 00:21:54 2011 -0700 H.264: disable 2tap qpel with CODEC_FLAG2_FAST and >8-bit 2tap qpel isn't implemented yet for high bit depth, so it just breaks decoding. (cherry picked from commit 9a0dda8b3ab07fa7be60335715a6c350c907a7b8) Signed-off-by: Reinhard Tartler commit 9b69efc02b6f34fbe50512d4d108ec5559ebb9ec Author: Mans Rullgard Date: Sat Jun 25 18:51:00 2011 +0100 ARM: silence some annoying armcc warnings This silences warnings about pointer target sign mismatches as already done for gcc with -Wno-pointer-sign. Signed-off-by: Mans Rullgard (cherry picked from commit d0ce090ec553c88eb8e9c303156017417d4599cc) Signed-off-by: Reinhard Tartler commit 1bf80a9a144852460d3c10c9461df214292ff82f Author: Stefano Sabatini Date: Fri Jun 24 23:45:15 2011 +0200 configure: select buffersink_filter when ffmpeg is enabled buffersink_filter is a strong requirement for compiling ffmpeg. Fixes ffmpeg compilation with --disable-everything. (cherry picked from commit e65d6e22e300e286bcc27443df8449aaf9d062dd) commit c0b90d40888147b314ca788bba406882c3d25d1a Author: Stefano Sabatini Date: Fri Jun 24 23:45:15 2011 +0200 configure: select buffersink_filter when ffmpeg is enabled buffersink_filter is a strong requirement for compiling ffmpeg. Fixes ffmpeg compilation with --disable-everything. (cherry picked from commit e65d6e22e300e286bcc27443df8449aaf9d062dd) commit 9c709f053474dd74890f32662b7d7010e5cc0b0d Author: Reinhard Tartler Date: Thu Jun 23 09:50:43 2011 +0200 add changelog entries for added fourcc codecs and H.264 fixes commit 4ad56612f94f5e4312ba24155b5c446e151e6ca1 Author: Diego Biurrun Date: Thu Jun 23 12:38:03 2011 +0200 build: Remove dependency and editor backup files also in the doc/ subdirectory. commit acb62e998f4d72bd53cd6837cdcb2ba6f59ab3f1 Author: Carl Eugen Hoyos Date: Thu Apr 14 01:04:18 2011 +0200 alsa: support unsigned variants of already supported signed formats. (cherry picked from commit 2359aeb52d2325ed6c28d4f7579e0999963bcec1) Signed-off-by: Reinhard Tartler commit 180faac637c9b8cd63fc8007a126e55175d415aa Author: Jason Garrett-Glaser Date: Wed Jun 22 02:34:02 2011 -0700 H.264: fix 4:4:4 + deblocking + 8x8dct + cavlc + MBAFF (cherry picked from commit 2702a6f114f996ddfb334f1d8ddfae50e2c7eef7) Signed-off-by: Reinhard Tartler commit 13c943ffb1d0faa6de0de292d196551990e93512 Author: Jason Garrett-Glaser Date: Wed Jun 22 02:05:14 2011 -0700 H.264: fix 4:4:4 + deblocking + MBAFF (cherry picked from commit 7c9079ab4cf0bcf34103fc9c5e49ec1fd7dd390c) Signed-off-by: Reinhard Tartler commit 18052f1df9d5a21ff354c4f70ae35993959d9686 Author: Jason Garrett-Glaser Date: Tue Jun 21 04:16:33 2011 -0700 H.264: fix 4:4:4 cropping warning (cherry picked from commit 932db250243812380640112fd27a59bc0642bc8a) Signed-off-by: Reinhard Tartler commit 4c8b14c37ff292ca9d4a412984e5132a27a83858 Author: Jason Garrett-Glaser Date: Tue Jun 21 01:10:37 2011 -0700 H.264: reference the correct SPS in decode_scaling_matrices (cherry picked from commit 85a88f9c0c0fcc2fc48121db1beb5ada68d24bdc) Signed-off-by: Reinhard Tartler commit e4071fa04c213ab3ddf4f89953daf4e3788a9d0f Author: Jason Garrett-Glaser Date: Mon Jun 20 15:56:35 2011 -0700 H.264: fix bug in lossless 4:4:4 decoding Coefficient test for i16x16 add_pixels4 assumed luma plane. (cherry picked from commit 3b79f2e2e928eb346dbea85cc89393dcdf010ca9) Signed-off-by: Reinhard Tartler commit bf5ed476ba6315daeff83930787cdf02aa3268e0 Author: Carl Eugen Hoyos Date: Mon Jun 13 21:16:30 2011 +0200 alsa: add support for more formats. Specifically, f32, f64, s32, s24, a-law and mu-law. Signed-off-by: Anton Khirnov (cherry picked from commit 921715edffbba5db8deb26b7ad3cb583ba963d03) Signed-off-by: Reinhard Tartler commit fcd26ebc8f371612e56e9f591b578d519e04c4c2 Author: ami_stuff Date: Tue May 24 23:38:01 2011 +0200 rawdec: Fix decoding of QT WRAW files. From some tests it results that: 1. All of the AVI/MOV WRAW files need to be flipped. 2. MOV WRAW files need to use AVI color modes. 3. Assigning PAL8 mode by default to WRAW codec is not correct. (cherry picked from commit 67e7dc54049d9b51a0c2168c8265145a9aef7780) Signed-off-by: Reinhard Tartler commit 6a34f5d4478bf79b452ab90eb47df75b62202d9c Author: Mans Rullgard Date: Sun Jun 19 18:41:14 2011 +0100 configure: report optimization for size separately This removes an unsightly override of the 'optimizations' setting only to make the configure report print 'small' when --enable-small is used. Signed-off-by: Mans Rullgard (cherry picked from commit f082a0fb420f0367bdd00219fd0fe8fe3caf7bc7) Signed-off-by: Reinhard Tartler commit 26f48752fbaa49161eb3454eda68dc043d733567 Author: Carl Eugen Hoyos Date: Fri May 13 01:08:01 2011 +0200 mov: Support Digital Voodoo SD 8 Bit and DTS codec identifiers. (cherry picked from commit 53d5cd2c8225e251826c77f8f69a30250038fbd0) Signed-off-by: Reinhard Tartler commit 1aef8de6d730df7f0a0841939954d12cd604b2d7 Author: ami_stuff Date: Fri May 13 00:49:29 2011 +0200 mov: Support R10g codec identifier. (cherry picked from commit 7ac639654f21aa78e0afa14f6c049ffa2c9078bd) Signed-off-by: Reinhard Tartler commit 9ac3e32b29ae9e4af30ed671e736d1d83b0c7255 Author: Kamil Nowosad Date: Mon May 23 23:13:34 2011 +0200 riff/img2: Add JPEG 2000 codec IDs. (cherry picked from commit a304a833621a793bbf49b796fe1fd11ea1cd54c8) Signed-off-by: Reinhard Tartler commit 5254285636a2d58805152be0f9700f773624879c Author: ami_stuff Date: Wed May 11 22:18:15 2011 +0200 riff: Add DAVC fourcc. This fourcc is used by the "mpegable AVC" codec and files encoded with this codec decode correctly with our H.264 decoder. (cherry picked from commit 2ea1ca1714f655a463b941b115e45a1a2f031f7b) Signed-off-by: Reinhard Tartler commit 137838945fc355207234a0cc846e23d4996bfcc1 Author: Carl Eugen Hoyos Date: Mon Apr 25 00:27:03 2011 +0200 riff: Add M263, XVIX, MMJP, CDV5 fourccs. (cherry picked from commit 682a20114e9ee0272be764c68dc1cf251ff083da) Signed-off-by: Reinhard Tartler commit 6cef3ddbdc354799bc30711766a98ff9082332c6 Author: ami_stuff Date: Mon Apr 25 00:20:27 2011 +0200 rawvideo: Support auv2 fourcc. (cherry picked from commit d352df093169f39631f1ec0017a3f186ef85f83c) Signed-off-by: Reinhard Tartler commit 403eee165c7763c56ba8b51ad91b4b6cf0811b40 Author: Diego Biurrun Date: Tue Jun 21 01:11:28 2011 +0200 h264: Fix assert that failed to compile with -DDEBUG. The assert referenced a variable that no longer exists since 4:4:4 support. (cherry picked from commit 6371ce4b0f0535a7f576b8f109d35345e3d11d7d) Signed-off-by: Reinhard Tartler commit 523b57b331432cce81986ee1fd8370e78655c4f2 Author: Jason Garrett-Glaser Date: Wed Jun 22 02:34:02 2011 -0700 H.264: fix 4:4:4 + deblocking + 8x8dct + cavlc + MBAFF (cherry picked from commit 2702a6f114f996ddfb334f1d8ddfae50e2c7eef7) commit a3589cce81340989247c4c3bf5baa5a8388b6fce Author: Jason Garrett-Glaser Date: Wed Jun 22 02:05:14 2011 -0700 H.264: fix 4:4:4 + deblocking + MBAFF (cherry picked from commit 7c9079ab4cf0bcf34103fc9c5e49ec1fd7dd390c) commit 0820593e645aa0e4527752c17c9404e44042e809 Author: Jason Garrett-Glaser Date: Tue Jun 21 04:16:33 2011 -0700 H.264: fix 4:4:4 cropping warning (cherry picked from commit 932db250243812380640112fd27a59bc0642bc8a) commit 4db2b966be1274983f1af189cce84cabfdab0f49 Author: Jason Garrett-Glaser Date: Tue Jun 21 01:10:37 2011 -0700 H.264: reference the correct SPS in decode_scaling_matrices (cherry picked from commit 85a88f9c0c0fcc2fc48121db1beb5ada68d24bdc) commit b7b61ff6a31d4ffa1fb9a0ebeb1579d84c01c0b7 Author: Jason Garrett-Glaser Date: Wed Jun 22 02:34:02 2011 -0700 H.264: fix 4:4:4 + deblocking + 8x8dct + cavlc + MBAFF (cherry picked from commit 2702a6f114f996ddfb334f1d8ddfae50e2c7eef7) commit 7a6e47b99dfa669fa108058868ba06263e78f801 Author: Jason Garrett-Glaser Date: Wed Jun 22 02:05:14 2011 -0700 H.264: fix 4:4:4 + deblocking + MBAFF (cherry picked from commit 7c9079ab4cf0bcf34103fc9c5e49ec1fd7dd390c) commit f84c349b3b765f8d5c7a79a69ef9f8bb23cbfd83 Author: Jason Garrett-Glaser Date: Tue Jun 21 04:16:33 2011 -0700 H.264: fix 4:4:4 cropping warning (cherry picked from commit 932db250243812380640112fd27a59bc0642bc8a) commit 26f732e21df7f79dbff040737b6030fd9a5ada11 Author: Jason Garrett-Glaser Date: Tue Jun 21 01:10:37 2011 -0700 H.264: reference the correct SPS in decode_scaling_matrices (cherry picked from commit 85a88f9c0c0fcc2fc48121db1beb5ada68d24bdc) commit 82b2dd5ee483c46c7ab26c0ead33b89594c9f6c0 Author: Michael Niedermayer Date: Wed Jun 22 23:21:19 2011 +0200 release_notes: update for 0.7.1 Signed-off-by: Michael Niedermayer commit e82ddde05aaab76984fb8795848afc9125a0fc01 Author: Michael Niedermayer Date: Wed Jun 22 23:19:34 2011 +0200 set VERSION for 0.7.1 Signed-off-by: Michael Niedermayer commit 07f5da61289cd1bfb552ea276368b4cc7a2f010a Author: Clément BÅ“sch Date: Wed Jun 22 10:33:01 2011 +0200 vf_mp: do not add duplicated pixel formats. This avoid a crash with in avfilter_merge_formats() in case one of the filter formats list has multiple time the same entry. Thanks to Mina Nagy Zaki for helping figuring out the issue. (cherry picked from commit 680e47364386038c5039345ef2d9fe6947191a12) commit e845455225110f679127f6a6aa0cac1862789197 Author: Anton Khirnov Date: Thu Jun 9 10:58:23 2011 +0200 ffplay: use new avformat_open_* API. (cherry picked from commit 44e83d0c976dd098455173877fc22b57ed212bed) commit 3fedb3e65c6595c4fd78b03ed9b0d83cf257062c Author: Reimar Döffinger Date: Wed Jun 22 18:25:49 2011 +0200 Revert needless API change in 05e84c95. When providing a custom AVIOContex for a AVFMT_NOFILE format only print a warning instead of erroring out. This allows the code to work with older MPlayer versions that just always set pb out of laziness. Signed-off-by: Reimar Döffinger commit 0b5c2612126773c5c8eb0c0defb77d5310cc93c3 Author: Michael Niedermayer Date: Wed Jun 22 20:24:02 2011 +0200 set for next release of 0.8 Signed-off-by: Michael Niedermayer commit 680e47364386038c5039345ef2d9fe6947191a12 Author: Clément BÅ“sch Date: Wed Jun 22 10:33:01 2011 +0200 vf_mp: do not add duplicated pixel formats. This avoid a crash with in avfilter_merge_formats() in case one of the filter formats list has multiple time the same entry. Thanks to Mina Nagy Zaki for helping figuring out the issue. commit 44e83d0c976dd098455173877fc22b57ed212bed Author: Anton Khirnov Date: Thu Jun 9 10:58:23 2011 +0200 ffplay: use new avformat_open_* API. commit 1986380df2caaa663f63d0a3b9f0413a3d862757 Merge: df3850d 86824c1 Author: Michael Niedermayer Date: Tue Jun 21 21:55:46 2011 +0200 Merge branch 'master' into oldabi * master: ffplay: do not init SDL audio if -an is specified. Fix zero-length gnu_printf format string warning. A cmp instruction with two constants is invalid, thus "g" constraint is not correct but must be "rm" instead. Merged-by: Michael Niedermayer commit 86824c1dcb3eaffc2b143de452e8082dc3c59822 Author: Clément BÅ“sch Date: Tue Jun 21 11:25:25 2011 +0200 ffplay: do not init SDL audio if -an is specified. Signed-off-by: Michael Niedermayer commit 4a34e54b0ecf342903d5ed112540fa832b62a514 Author: Clément BÅ“sch Date: Wed Jun 15 11:24:00 2011 +0200 Fix zero-length gnu_printf format string warning. Signed-off-by: Michael Niedermayer commit 5f654897e325349dacf2546674e0510bb72ecb50 Author: Reimar Döffinger Date: Tue Jun 21 21:41:04 2011 +0200 A cmp instruction with two constants is invalid, thus "g" constraint is not correct but must be "rm" instead. Signed-off-by: Reimar Döffinger Signed-off-by: Michael Niedermayer commit df3850db4958c44e8e4d5aa0fece71c03a51372b Merge: 082b4f8 250cebe Author: Michael Niedermayer Date: Tue Jun 21 21:13:49 2011 +0200 Merge branch 'master' into oldabi * master: release_notes: document not fully understood mingw-sdl issue release_notes: some updates presets: forgotten libvpx presets release_notes: fix version release_notes: mention more codecs Signed-off-by: Michael Niedermayer release_notes: there will be 2 releases each for one ABI/API. release_notes: suggest git log instead of the poorly maintained APIChanges release_notes: we do support releases build system: disable memalign on haiku, its not reliable there. ffprobe: remove duplicate avformat_alloc_context() Fix segmentation fault in ffprobe wma: fix infinite loop Fix H.264 4:4:4 lossless decoding. Merged-by: Michael Niedermayer commit 250cebeb3b348c3da71f9972eb500d6005dc01f1 Author: Michael Niedermayer Date: Tue Jun 21 20:58:39 2011 +0200 release_notes: document not fully understood mingw-sdl issue Signed-off-by: Michael Niedermayer commit 0452f77f49e92bc67cc2aea5b9c4470cd457ca1d Author: Michael Niedermayer Date: Tue Jun 21 18:16:16 2011 +0200 release_notes: some updates Signed-off-by: Michael Niedermayer commit e1674d7ef7e25d9c37b8f6a6fdac2bba93692fef Author: Michael Niedermayer Date: Tue Jun 21 17:52:16 2011 +0200 presets: forgotten libvpx presets Signed-off-by: Michael Niedermayer commit 9b80c510665bce4b4acd8521443f619ccaa109c6 Author: Michael Niedermayer Date: Tue Jun 21 17:08:01 2011 +0200 release_notes: fix version Signed-off-by: Michael Niedermayer commit c0c5053587487fc066c0e8adac30568b5fdcf15c Author: Michael Niedermayer Date: Tue Jun 21 17:06:35 2011 +0200 release_notes: mention more codecs Signed-off-by: Michael Niedermayer commit 5114e36d0860a9056da005d95dd0a3cf74124340 Author: Michael Niedermayer Date: Tue Jun 21 17:02:14 2011 +0200 release_notes: there will be 2 releases each for one ABI/API. Signed-off-by: Michael Niedermayer commit 6324a5a4a2f4486ad7089bad4812f6ed688c4a2e Author: Michael Niedermayer Date: Tue Jun 21 16:43:45 2011 +0200 release_notes: suggest git log instead of the poorly maintained APIChanges Signed-off-by: Michael Niedermayer commit 3afc647eda5cdad8407c43ce36aa2241e17f96e7 Author: Michael Niedermayer Date: Tue Jun 21 16:37:11 2011 +0200 release_notes: we do support releases Signed-off-by: Michael Niedermayer commit ad3ac1d507a9c99795f4f2a0c468fc4658f44788 Author: Michael Niedermayer Date: Tue Jun 21 16:36:23 2011 +0200 build system: disable memalign on haiku, its not reliable there. Signed-off-by: Michael Niedermayer commit 06724c5f5d07c4fee271832349d8f562db8b409b Author: Michael Niedermayer Date: Tue Jun 21 14:38:58 2011 +0200 ffprobe: remove duplicate avformat_alloc_context() Signed-off-by: Michael Niedermayer commit df1768d0a261900c8fbb6c29c7f351779c4c2735 Author: Gavin Kinsey Date: Tue Jun 21 13:13:37 2011 +0100 Fix segmentation fault in ffprobe commit 3cb64e327a9861f2c8fff0b3850fcd5d14acdbe3 Author: Michael Niedermayer Date: Tue Jun 21 13:17:10 2011 +0200 wma: fix infinite loop Signed-off-by: Michael Niedermayer commit da0dadb936f101b8a7a111fd255e12063c3af9f3 Author: Jason Garrett-Glaser Date: Tue Jun 21 10:45:22 2011 +0200 Fix H.264 4:4:4 lossless decoding. The coefficient test for i16x16 add_pixels4 assumed luma plane. commit 082b4f8348c6d8fc110969692c2a2ccf81f4e20c Author: Michael Niedermayer Date: Tue Jun 21 06:26:38 2011 +0200 swscale: undo version upgrade that git merged in and that i missed Signed-off-by: Michael Niedermayer commit 788c313b5091d47aa801fc64f62e971c5b38e140 Author: Michael Niedermayer Date: Tue Jun 21 05:47:44 2011 +0200 swscale: revert ABI breaking long->int chnage that touch public ABI Signed-off-by: Michael Niedermayer commit 779d7610c71d267a88c787affd91000b826e812e Merge: 56629aa d39b33c Author: Michael Niedermayer Date: Tue Jun 21 05:22:40 2011 +0200 Merge branch 'master' into oldabi * master: (109 commits) libx264: fix open gop default. Please use -x264opts to force open gop This fixes Ticket268 avfilter picture pool: double free hotfix mpegaudio_parser: be less picky on the start position ppc32: Fix movrel Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample(). x86: cabac: fix register constraints for 32-bit mode cabac: move x86 asm to libavcodec/x86/cabac.h x86: h264: cast pointers to intptr_t rather than int x86: h264: remove hardcoded edi in decode_significance_8x8_x86() x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86() x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86() x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86() x86: cabac: change 'a' constraint to 'r' in get_cabac_inline() x86: cabac: remove hardcoded esi in get_cabac_inline() x86: cabac: remove hardcoded edx in get_cabac_inline() x86: cabac: remove unused macro parameter x86: cabac: remove hardcoded ebx in inline asm x86: cabac: remove hardcoded struct offsets from inline asm cabac: remove inline asm under #if 0 cabac: remove BRANCHLESS_CABAC_DECODER switch ... Conflicts: cmdutils.c ffserver.c libavfilter/avfilter.h libavformat/avformat.h libavformat/utils.c libavformat/version.h libavutil/avutil.h Merged-by: Michael Niedermayer commit d39b33c63bc080231d8d6e79c6301a60b86150de Author: Michael Niedermayer Date: Tue Jun 21 04:45:29 2011 +0200 libx264: fix open gop default. Please use -x264opts to force open gop This fixes Ticket268 Signed-off-by: Michael Niedermayer commit 90c6963daea9210d7d2104e2ece94dd4e2fffc17 Author: Michael Niedermayer Date: Tue Jun 21 04:24:03 2011 +0200 avfilter picture pool: double free hotfix This fix introduces a small memleak Signed-off-by: Michael Niedermayer commit 6cbe81999b07862895515fcbdae7bc3a320ca29c Merge: b37dfe1 e6c52ce Author: Michael Niedermayer Date: Tue Jun 21 03:38:25 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: (28 commits) Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample(). x86: cabac: fix register constraints for 32-bit mode cabac: move x86 asm to libavcodec/x86/cabac.h x86: h264: cast pointers to intptr_t rather than int x86: h264: remove hardcoded edi in decode_significance_8x8_x86() x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86() x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86() x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86() x86: cabac: change 'a' constraint to 'r' in get_cabac_inline() x86: cabac: remove hardcoded esi in get_cabac_inline() x86: cabac: remove hardcoded edx in get_cabac_inline() x86: cabac: remove unused macro parameter x86: cabac: remove hardcoded ebx in inline asm x86: cabac: remove hardcoded struct offsets from inline asm cabac: remove inline asm under #if 0 cabac: remove BRANCHLESS_CABAC_DECODER switch cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLED document libswscale bump error_resilience: skip last-MV predictor step if MVs are not available. error_resilience: actually add counter when adding a MV predictor. ... Conflicts: Changelog libavcodec/error_resilience.c libavfilter/defaults.c libavfilter/vf_drawtext.c libswscale/swscale.h tests/ref/vsynth1/error tests/ref/vsynth2/error Merged-by: Michael Niedermayer commit b37dfe181cc34ea76155cf449d168c385f32f061 Author: Michael Niedermayer Date: Tue Jun 21 02:49:20 2011 +0200 mpegaudio_parser: be less picky on the start position Signed-off-by: Michael Niedermayer commit 2d16394f972dca8cc5e5b5bf9ab0b343a6239b76 Author: Kim Nguyen Date: Tue Jun 21 00:18:54 2011 +0200 ppc32: Fix movrel Fixes ticket272 commit e6c52cee541ba23a7aec525f72dff73c188dad06 Author: Justin Ruggles Date: Tue Jun 7 13:40:22 2011 -0400 Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample(). av_get_bits_per_sample_fmt() is deprecated. commit c5ee740745596941b84b738cc528ec85b0e6f0a3 Author: Mans Rullgard Date: Mon Jun 20 23:10:26 2011 +0100 x86: cabac: fix register constraints for 32-bit mode Some operands need to be accessed in byte mode, which restricts the available registers in 32-bit mode. Using the 'q' constraint selects a suitable register. Signed-off-by: Mans Rullgard commit 2143d69bddf42c8c2cf9f45e1f0ce7750e96aad3 Author: Mans Rullgard Date: Mon Jun 20 10:53:41 2011 +0100 cabac: move x86 asm to libavcodec/x86/cabac.h Signed-off-by: Mans Rullgard commit d075e7d5405d716170476a2fea707dfe3330093c Author: Mans Rullgard Date: Mon Jun 20 10:24:26 2011 +0100 x86: h264: cast pointers to intptr_t rather than int Only the low-order bits are used here so the type is not important, but this avoids a compiler warning. Signed-off-by: Mans Rullgard commit 3a4edb76d697cfa341ee060647732e5c1400da3a Author: Mans Rullgard Date: Mon Jun 20 10:20:15 2011 +0100 x86: h264: remove hardcoded edi in decode_significance_8x8_x86() Signed-off-by: Mans Rullgard commit b92c1a6d2630e46b6e7c6ceca467e7f56fae5218 Author: Mans Rullgard Date: Mon Jun 20 10:12:29 2011 +0100 x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86() Signed-off-by: Mans Rullgard commit 3fc4e36c78004b37b6179423231e3e0daa3c7e74 Author: Mans Rullgard Date: Mon Jun 20 10:06:07 2011 +0100 x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86() Signed-off-by: Mans Rullgard commit e4b5a204aa2269cc249771fd49a89e7b4af32215 Author: Mans Rullgard Date: Mon Jun 20 09:23:26 2011 +0100 x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86() Signed-off-by: Mans Rullgard commit 3146a30e612729e4a70dd10361c8a38750fa6d53 Author: Mans Rullgard Date: Mon Jun 20 09:28:19 2011 +0100 x86: cabac: change 'a' constraint to 'r' in get_cabac_inline() Nothing requires this value in %eax. Signed-off-by: Mans Rullgard commit f743595e87aecc090cf6884fc681c0adf3a03cbb Author: Mans Rullgard Date: Mon Jun 20 09:19:27 2011 +0100 x86: cabac: remove hardcoded esi in get_cabac_inline() Signed-off-by: Mans Rullgard commit da3af4db6151775a851c181c8aba802db07ce033 Author: Mans Rullgard Date: Mon Jun 20 03:39:45 2011 +0100 x86: cabac: remove hardcoded edx in get_cabac_inline() Signed-off-by: Mans Rullgard commit 51f16a9bf22ee81116df2a02d3107c6f3ad17402 Author: Mans Rullgard Date: Mon Jun 20 03:19:20 2011 +0100 x86: cabac: remove unused macro parameter Signed-off-by: Mans Rullgard commit 018c33838eeb41944af46287e7d8be82c5c427d8 Author: Mans Rullgard Date: Mon Jun 20 02:31:53 2011 +0100 x86: cabac: remove hardcoded ebx in inline asm Signed-off-by: Mans Rullgard commit 6b712acc0e4face7e913fbffd03123fc24672654 Author: Mans Rullgard Date: Mon Jun 20 01:54:32 2011 +0100 x86: cabac: remove hardcoded struct offsets from inline asm Signed-off-by: Mans Rullgard commit 34ee43fc0fa7f40a280f4f93a3c6aa5bf7a2704b Author: Mans Rullgard Date: Mon Jun 20 01:58:36 2011 +0100 cabac: remove inline asm under #if 0 A comment says it's not faster than the C code. Signed-off-by: Mans Rullgard commit 8fcc0e7978e03cbf7e6d872d34ca1ea4a7d97b87 Author: Mans Rullgard Date: Mon Jun 20 01:49:38 2011 +0100 cabac: remove BRANCHLESS_CABAC_DECODER switch The code does not compile without this set. Signed-off-by: Mans Rullgard commit eaa2d5a90a208fff0662b62da67b7b090b9fff8c Author: Mans Rullgard Date: Mon Jun 20 00:59:35 2011 +0100 cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLED Signed-off-by: Mans Rullgard commit 093768c9a4855b82c13124f835b655dd70883012 Author: Ivan Kalvachev Date: Thu Jun 16 19:35:33 2011 +0300 Fix bink audio playback outside of FFmpeg. There are 2 known Bink audio codecs. Additionally they have a different flavor if they are found inside Bink-b "BIKb" file. In order to guess the correct flavor, the demuxer sets the audio codec_tag to be the same as the file format tag. This causes problem because same tag is used for both audio codecs. The hack works in FFmpeg because audio codecs are identified by their codec_id, but other players rely on standard behavior. This fix removes the codec_tag hack and instead uses artificial extradata format to signal the codec flavor. This would also allow proper embedding of Bink audio in other containers. Signed-off-by: Ivan Kalvachev Signed-off-by: Michael Niedermayer commit dea22a1a912d5e6214db5c6a4addbc7b26881817 Author: Reinhard Tartler Date: Mon Jun 20 22:40:31 2011 +0200 document libswscale bump commit 20153fb8f6ce7f482298170d2700befe898fa1cd Author: Ronald Bultje Date: Mon Jun 20 15:07:56 2011 +0000 error_resilience: skip last-MV predictor step if MVs are not available. Fixes crashes when playing broken MPEG2-TS streams. commit d42aaa802e2b74dcb83d426001557f8229b1b484 Author: Ronald Bultje Date: Mon Jun 20 15:07:55 2011 +0000 error_resilience: actually add counter when adding a MV predictor. Without, the predictor isn't actually used. commit 3a07f5a47a16bef86faab99bc02d2fd0f396afe8 Author: Michael Niedermayer Date: Sat Jun 18 02:44:17 2011 +0200 qdm2: Fix alignment of local array. Fixes ticket270 Signed-off-by: Michael Niedermayer Signed-off-by: Anton Khirnov commit 5a0a6ae639ac791ddebce64e2c316186d1db575c Author: Stefano Sabatini Date: Thu Apr 21 10:31:48 2011 +0200 ocv: replace FF_INTERNAL_MEM_TYPE_MAX_VALUE with SIZE_MAX Fix compilatin after removal of FF_INTERNAL_MEM_TYPE_MAX_VALUE. Signed-off-by: Stefano Sabatini Signed-off-by: Anton Khirnov commit 702a62a1c6b97a8befa114da4ab4aa2b541352af Author: Stefano Sabatini Date: Mon May 16 23:44:35 2011 +0200 drawtext: add braces around initialisers for option defaults Fix warnings of the type: vf_drawtext.c:NNN: warning: missing braces around initializer vf_drawtext.c:NNN: warning: (near initialization for ‘drawtext_options[X].default_val’) Signed-off-by: Anton Khirnov commit 53a715f576bb4618f91a2f6caba995c48239a5f5 Author: Stefano Sabatini Date: Mon May 16 23:48:00 2011 +0200 drawtext: reindent after the previous commit Signed-off-by: Anton Khirnov commit 3fd53defaa64e1a9295e88767088542b148616bd Author: Stefano Sabatini Date: Mon May 16 20:11:50 2011 +0200 drawtext: fix strftime() text expansion The feature was dropped after the filter was partially rewritten and recommitted. Signed-off-by: Anton Khirnov commit cfbaeb311d906099bd9b8fbf0fa38cdb1b08f23e Author: Michael Niedermayer Date: Mon Jun 20 20:13:26 2011 +0200 ffmpeg: print warning if encoding would duplicate massive amounts of frames Signed-off-by: Michael Niedermayer commit 07935318598722e6ffe0f9980010a96f076d7152 Author: Reinhard Tartler Date: Mon Jun 20 12:20:54 2011 +0200 Bump major version for b8e893399ff8755721dc117695ec5ff183c1e07b On architectures such as x86 (both 32 bit and 64bit), the stack element size is fixed, which maintains alignment. Here, this change does not break anything. However, we also support also other architectures where this property is not maintained and therefore, applications will crash horribly. This change effectively forces all applications to be recompiled against libswscale. commit ea6331f8bbaf3343faec6ffe77a6218a016a3af5 Author: Ronald S. Bultje Date: Mon Jun 20 10:24:33 2011 -0400 h264-mt: fix deadlock in packets with multiple slices (e.g. MP4). commit 54dd50d14dc3a3952f7d85165142d02f6ea578d7 Author: Michael Niedermayer Date: Mon Jun 20 13:22:23 2011 +0200 cmdutils: remove outcommented merge trash Signed-off-by: Michael Niedermayer commit 56e11d230525bb9659e79d3253351b94ec3f8478 Merge: 4aeb776 8d3d343 Author: Michael Niedermayer Date: Mon Jun 20 03:49:51 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: Drop git- prefix from version labels Use the contents of RELEASE as version fallback instead of 'UNKNOWN' path64/open64: filter out unsupported flags Add Release Notes sipr: Drop unused DSPContext sipr: include string.h for mem*() sipr: Use memmove() to copy overlapped buffers. h264: drop some ugly casts Conflicts: version.sh Merged-by: Michael Niedermayer commit ae88e9cf99837e5eec811c817a17b2cbc9724a01 Author: Yusuke Nakamura Date: Sun Jun 5 01:28:43 2011 +0900 mov: Fix empty edit detection. commit 4aeb7769136ae60586d88d17fcce05be9669e72a Author: Michael Niedermayer Date: Sun Jun 19 20:32:37 2011 +0200 dump_metadata: Fix 0xd in metadata Fixed ticket245 Signed-off-by: Michael Niedermayer commit 867b10679c0ea761ce423c104d8b1b8792d92fb9 Author: Michael Niedermayer Date: Sun Jun 19 20:02:30 2011 +0200 Attempt to fix ticket266 Signed-off-by: Michael Niedermayer commit 940a55ccf4898c641d0b3b7138d679943611e1d6 Author: Michael Niedermayer Date: Sun Jun 19 17:57:51 2011 +0200 eval: Fix 32bit unsigned parsing Fixes ticket264 Signed-off-by: Michael Niedermayer commit a7e4342fc1a0e962b829a9a194d034fa38590951 Author: Michael Niedermayer Date: Sun Jun 19 13:09:16 2011 +0200 avidec: consider non video to contain only keyframes when seeking. Fixes Ticket271 Signed-off-by: Michael Niedermayer commit 6c0f5172f6735c0b185721ff0f456f53ef7ac677 Author: Michael Niedermayer Date: Sun Jun 19 05:55:12 2011 +0200 ffplay: dont drop frames by default when there is no audio stream Signed-off-by: Michael Niedermayer commit fd2c0a5db242a3c89a89f1dd2ae9e3155e48f9e2 Author: Mina Nagy Zaki Date: Sun Jun 19 20:31:24 2011 +0200 lavfi: add layout negotiation fields and helper functions. commit 527ca3985c736ffe077a82fdf3616f0fd571b923 Author: Mina Nagy Zaki Date: Tue Jun 7 21:17:23 2011 +0300 lavfi: use int64_t lists in AVFilteFormats The list type was changed to int64_t to be able to hold channel layouts. avfilter_make_format_list() still takes a int32_t array and converts it to int64_t. A new function, avfilter_make_format64_list, that takes int64_t arrays has been added. commit 8f349b64813b348634042d96b9d104ada94dc538 Author: Stefano Sabatini Date: Sun Jun 19 22:07:18 2011 +0200 lavfi: fix realloc size computation in avfilter_add_format() Replace sizeof((*avff)->formats) with sizeof(*(*avff)->formats) as the size of the array element is given by the pointed element rather than by its pointer. In particular fix computation with the pending patch when sizeof(int64_t) != sizeof(int64_t *). commit c6e288a7cd3f92d09a59671f81119c9643d8589c Author: Stefano Sabatini Date: Sun Jun 19 22:42:09 2011 +0200 lavfi: fix Makefile HEADERS Add a missing space between vsink_buffer.h and vsrc_buffer.h. 1000l. commit 8d3d3436e2596e27571b86eb97c66971a1a7431b Author: Mans Rullgard Date: Sun Jun 19 19:31:56 2011 +0100 Drop git- prefix from version labels Signed-off-by: Mans Rullgard commit 8fab4007c83349e5dbaacca735ce698cf94bf8e4 Author: Reinhard Tartler Date: Sun Jun 19 19:51:20 2011 +0200 Use the contents of RELEASE as version fallback instead of 'UNKNOWN' This makes binaries produced by source tarballs identify themselves with the version number of the corresponding release series, unless overriden by a 'VERSION' file. commit 7b2d219045330494a2391beb6571ee1b25fc422d Author: Mans Rullgard Date: Sun Jun 19 18:03:21 2011 +0100 path64/open64: filter out unsupported flags These flags are accepted without error but produce an annoying warning. Filtering them out makes the build less noisy. Signed-off-by: Mans Rullgard commit 72da9888b0f1c0f6a74f6fdfa5f5f31d20bb0099 Author: Reinhard Tartler Date: Sun Jun 19 19:45:36 2011 +0200 Add Release Notes commit 44f669e7bc4f7f064e3f81d3596637a0e043b501 Author: Stefano Sabatini Date: Sat Jun 11 18:43:11 2011 +0200 lavfi: add vsink_buffer, and use it in ff* tools Also add the public interface libavfilter/vsink_buffer.h. commit e89ba76a59ce31320083b74f41e26bf4f64df8dd Author: Stefano Sabatini Date: Sat Jun 18 01:52:40 2011 +0200 vsrc_color: use internal timebase Avoid timescale conversion, simplify. commit 141f03541b39e131a5e8aa776a88abe77b70618e Author: Stefano Sabatini Date: Sun Jun 19 02:49:04 2011 +0200 opt: do not crash in av_set_options_string() if opts == NULL Add missing NULL check, and update documentation accordingly. commit 15f03725ced37e3b99e76f63f52cb92e10f134e2 Author: Stefano Sabatini Date: Sat May 28 22:00:26 2011 +0200 lavfi: add negate filter This filter is a simple wrapper around the LUT filter. commit dd2793c880ea72c9aacda8245596694d9b4f378c Author: Stefano Sabatini Date: Sat May 28 21:51:03 2011 +0200 lavfi: add LUT (LookUp Table) generic filters commit 4b84d5114d760627a990e66724e3a1e9e1d1286f Author: Alex Converse Date: Sat Jun 18 15:45:45 2011 -0700 sipr: Drop unused DSPContext commit 1e3d5eec8e758cfdd76370c80b9d0cc76c2c7b84 Author: Alex Converse Date: Sat Jun 18 15:44:31 2011 -0700 sipr: include string.h for mem*() commit cb372931ff3e55e47965db7b02c01df1e1b6a043 Author: Alex Converse Date: Sat Jun 18 15:42:57 2011 -0700 sipr: Use memmove() to copy overlapped buffers. commit 0c17beba97c600b38926f98e11f0436e20445261 Author: Alex Converse Date: Fri Jun 17 22:03:24 2011 -0700 h264: drop some ugly casts commit 83f9bc8aeece0d7c5b1fadaf91118ee6a97a0390 Merge: 15b4f64 dbafb0e Author: Michael Niedermayer Date: Sun Jun 19 04:02:06 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: lavf: prevent crash in av_open_input_file() if ap == NULL. more Changelog additions lavf: add a forgotten NULL check in convert_format_parameters(). Fix build if yasm is not available. H.264: Add x86 assembly for 10-bit MC Chroma H.264 functions. Conflicts: Changelog Merged-by: Michael Niedermayer commit 15b4f6449ddb1f52ae82dee3f94a5b56b636cbea Author: Michael Niedermayer Date: Sun Jun 19 03:33:15 2011 +0200 swscale: fix mono input for width%8 Fixes ticket193 Signed-off-by: Michael Niedermayer commit 799a87d749b473a2ab2494daef905e5129c5c056 Author: ami_stuff Date: Sun Jun 19 01:47:25 2011 +0200 avidec: Ignore unknown stream types Improves ticket131 Signed-off-by: Michael Niedermayer commit a4233d1f95bfc5b9b0fd08f0aaafdd20b1c4dae0 Author: Michael Niedermayer Date: Sun Jun 19 00:02:55 2011 +0200 h264: print actual slice number in "Too many slices" warning Signed-off-by: Michael Niedermayer commit 9291faeb6754787cd7f32feb8560219726a4da11 Author: Michael Niedermayer Date: Sun Jun 19 00:00:52 2011 +0200 jpegdec: include mjpb_skiptosod in debug output Signed-off-by: Michael Niedermayer commit a09a3e8213c74be18855bab8aee4a7c44a05bdfe Author: Michael Niedermayer Date: Sat Jun 18 23:59:27 2011 +0200 jpegdec: fix CJPG decoding. Fixes ticket133 Signed-off-by: Michael Niedermayer commit 0aed4f81fe5b9b15ab9b35baa4300f29ab03d65f Author: Michael Niedermayer Date: Sat Jun 18 21:59:11 2011 +0200 w32threads: with only 1 thread there cant be a active threading mode. Fixes ticket284 Signed-off-by: Michael Niedermayer commit 035c13e307daeb2a250b86f0ddef3b783a6393e5 Author: Michael Niedermayer Date: Sat Jun 18 21:54:11 2011 +0200 ffmpeg: warn if samples need to be converted in a lossy way for lossless encoders. Signed-off-by: Michael Niedermayer commit 7ba262527fa87b3e6556b905a1b3cb0ad6ac2043 Author: Michael Niedermayer Date: Sat Jun 18 21:53:54 2011 +0200 flacenc: mark as lossless codec Signed-off-by: Michael Niedermayer commit 34dc7aa82b3dcd95048b89a59730fbadf3ab3175 Author: Michael Niedermayer Date: Sat Jun 18 21:53:20 2011 +0200 libavcodec: add CODEC_CAP_LOSSLESS Signed-off-by: Michael Niedermayer commit dbafb0e06faa092f60e53d845957fbab7f2a3f2d Author: Ronald S. Bultje Date: Sat Jun 18 15:33:49 2011 -0400 lavf: prevent crash in av_open_input_file() if ap == NULL. Needed for proper behaviour in our old API compatibility code. commit bed31c7e3c530f9237bbb9fb96507be5977d9f65 Author: Reinhard Tartler Date: Thu Jun 16 19:59:47 2011 +0200 more Changelog additions commit 84bd2b4bf5ca544e29c48634ac8b2899c58b0d9d Author: Anton Khirnov Date: Sat Jun 18 17:26:40 2011 +0200 lavf: add a forgotten NULL check in convert_format_parameters(). commit ed63f527f28d1d73589a9e0bac3aed2197f14887 Author: Ronald S. Bultje Date: Sat Jun 18 08:34:14 2011 -0400 Fix build if yasm is not available. commit f188a1e0ca12822fd6c607924169d678c7254838 Author: Daniel Kang Date: Sun Jun 5 18:33:23 2011 -0400 H.264: Add x86 assembly for 10-bit MC Chroma H.264 functions. Mainly ported from 8-bit H.264 MC Chroma. Signed-off-by: Ronald S. Bultje commit bde8055963ff3831091bf58a7b866e9eaaf7b3f5 Author: Clément BÅ“sch Date: Wed Jun 15 20:26:57 2011 +0200 dcaenc: small quantization simplification. commit 47a8243c0db3fe497c490dfe2727a7a8422596cb Author: Carl Eugen Hoyos Date: Sat Jun 18 09:36:07 2011 +0200 Fix -s documentation. commit 2905e3ff6462431d55f89614b24e2a407707c82a Merge: 44d1b40 78440c0 Author: Michael Niedermayer Date: Sat Jun 18 04:40:18 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: lavc: add opt_find to AVCodecContext class. h264: Complexify frame num gap shortening code intreadwrite.h: fix AV_RL32/AV_RB32 signedness. Fix decoding of mpegts streams with h264 video that does *NOT* have b frames Add minor bumps and APIChanges entries for lavf private options. ffmpeg: deprecate -vc and -tvstd ffmpeg: use new avformat_open_* API. ffserver: use new avformat_open_* API. ffprobe: use new avformat_open_* API. ffplay: use new avformat_open_* API. cmdutils: add opt_default2(). dict: add AV_DICT_APPEND flag. lavf: add avformat_write_header() as a replacement for av_write_header(). Deprecate av_open_input_* and remove their uses. lavf: add avformat_open_input() as a replacement for av_open_input_* AVOptions: add av_opt_find() as a replacement for av_find_opt. AVOptions: add av_opt_set_dict() mapping a dictionary struct to a context. ffmpeg: don't abuse a global for passing frame size from input to output ffmpeg: don't abuse a global for passing pixel format from input to output ffmpeg: initialise encoders earlier. Conflicts: cmdutils.c doc/APIchanges ffmpeg.c ffplay.c ffprobe.c libavcodec/h264.c libavformat/avformat.h libavformat/utils.c libavformat/version.h libavutil/avutil.h Merged-by: Michael Niedermayer commit 44d1b4088f2959912a27ffbffc5884db1b35a645 Author: Michael Niedermayer Date: Sat Jun 18 02:44:17 2011 +0200 qdm2: Fix alignment of local array. Fixes ticket270 Signed-off-by: Michael Niedermayer commit 0c6cf3fa7cc7a9e01a5b78fd11f10f81c4b49b77 Author: Stefano Sabatini Date: Sat Jun 18 01:47:37 2011 +0200 vsrc_color: set output pos values to -1 -1 is more correct than 0, as the position in the file is undefined. commit bb3a2b723ab2f94d24cac86b692c52c781338e7d Author: Stefano Sabatini Date: Sat Jun 18 01:46:27 2011 +0200 vsrc_color: add @file doxy Also remove outdated reference to color in vf_pad.c. commit 8055433b492fe971a145a07470119ef8c2c71571 Author: Stefano Sabatini Date: Sat Jun 18 02:02:31 2011 +0200 graphparser: add missing NULL check in avfilter_graph_parse() Fix a crash occurring when open_inputs is NULL and *open_inputs is checked, the crash was introduced by the recent avfilter_graph_parse() syntax change. In particular, fix graph2dot crash. commit 369c68c4e121d9f883e240604050daf7fac1b870 Author: Carl Eugen Hoyos Date: Thu Jun 16 23:45:38 2011 +0200 Support DTS in mp4/mov. commit 78440c007cd310bb27ac2af5fb7ea5b7555efc84 Author: Anton Khirnov Date: Fri Jun 17 06:39:42 2011 +0200 lavc: add opt_find to AVCodecContext class. Fixes encoder private options, which are broken now in ffmpeg, because opt_default2() can't find them, thus making opt_default() to fail. commit 4f643430f295a8376ca51f127a23b0f8ce92068b Merge: d8ee777 9446d75 Author: Michael Niedermayer Date: Fri Jun 17 05:49:41 2011 +0200 Merge commit '9446d75941d639f19cfa9ae007eb4c5ca041f200' * commit '9446d75941d639f19cfa9ae007eb4c5ca041f200': ffmpeg: merge output_codecs array into AVOutputStream members. rtpenc_latm: Consistently use "Libav" in license boilerplate. rtsp: Don't pass string pointer as format string to ff_url_join mmsh: fixed printf injection bug in mmsh request codec-regression: remove pointless -r options for dnxhd Merged-by: Michael Niedermayer commit d8ee777021ac251c48274e7fd9864acb9e19a5cb Author: Carl Eugen Hoyos Date: Thu Jun 16 23:21:19 2011 +0200 Do not crash if SDL_SetVideoMode() fails. commit d5708923c2882b704db48f8a2f6b6afbb9cc7f34 Author: Carl Eugen Hoyos Date: Thu Jun 16 23:20:29 2011 +0200 Move do_exit() and stream_close() up. commit 5ad05dd500ba5dd46370808025951c55811a49bf Author: Carl Eugen Hoyos Date: Thu Jun 16 23:16:58 2011 +0200 Fix documentation for -ar and -ac. commit 5fb67d8039e15a34c5aef8a1c87c8e252296938b Author: Carl Eugen Hoyos Date: Thu Jun 16 23:14:17 2011 +0200 Fix compilation with old yasm. commit f6e2af4f5aed088d4926c2ceb320bb4bf514132b Author: Michael Niedermayer Date: Thu Jun 16 23:06:27 2011 +0200 ffmpeg: Force 420 with target dvd and svcd. Fixes ticket283 Signed-off-by: Michael Niedermayer commit 3803af22d8e1092e658110e77db093922ce63e80 Author: Alexander Strange Date: Sun Jun 12 20:40:00 2011 +0000 h264: Complexify frame num gap shortening code By observation it did not seem to handle prev_frame_num > frame_num. This does not affect any files I have. Signed-off-by: Ronald S. Bultje Signed-off-by: Anton Khirnov commit c98b928fa7dea6418c24a163e7bcd36b0eb922a3 Author: Uoti Urpala Date: Tue Jun 14 21:53:30 2011 +0000 intreadwrite.h: fix AV_RL32/AV_RB32 signedness. The output type of the AV_RL32/AV_RB32 macros was signed int. The resulting overflow broke at least some ASF streams with large timestamps. Fix by adding a cast to uint32_t. Signed-off-by: Ronald S. Bultje Signed-off-by: Anton Khirnov commit aa15e68721b15f8020da9d392954b343f195f22c Author: Mike Scheutzow Date: Thu Apr 28 10:14:26 2011 -0400 Fix decoding of mpegts streams with h264 video that does *NOT* have b frames One of the causes of this bug is that the h264 parser defaults low_delay to 1, but the h264 codec defaults low_delay to 0. Really Ugly. After many hours of looking at this, I'm still not sure how has_b_frames is *intended* to behave, but to me the implementation appears way more complicated than it ought to be. My patch relies on the encoder to set an optional field in the SPS. This works for libx264 streams, but I'm not sure that all h264 encoders will set it. Signed-off-by: Anton Khirnov commit 7c44d716e76cbd1c29369563a8b384addd5e7c03 Author: Anton Khirnov Date: Thu Jun 16 17:21:46 2011 +0200 Add minor bumps and APIChanges entries for lavf private options. commit 55ba12e3009fd6c8f78102f7c747496d500d0bac Author: Anton Khirnov Date: Wed Jun 15 07:34:12 2011 +0200 ffmpeg: deprecate -vc and -tvstd They've been replaced by demuxer private options. commit 8035f429684e368fe54af8ccedc2d4776a2d6154 Author: Anton Khirnov Date: Thu Jun 9 10:58:23 2011 +0200 ffmpeg: use new avformat_open_* API. commit 50f2dfad679747d417879d6b49c929286aff69b1 Author: Anton Khirnov Date: Thu Jun 9 10:58:23 2011 +0200 ffserver: use new avformat_open_* API. commit e0518705c8f575488a50407eee3edcc94c905973 Author: Anton Khirnov Date: Thu Jun 9 10:58:23 2011 +0200 ffprobe: use new avformat_open_* API. commit d0e142bb68fdc817fb84f2395ae416d43ca141ce Author: Anton Khirnov Date: Thu Jun 9 10:58:23 2011 +0200 ffplay: use new avformat_open_* API. commit 9ba38229e5bd0cf6201a8206b2d8be6335f45f46 Author: Anton Khirnov Date: Wed May 25 16:42:41 2011 +0200 cmdutils: add opt_default2(). It stores options in a dictionary to be passed to new open calls. It will replace opt_default once all the pieces are in place. commit 1b9b37b8a416e77b4c6425dcdcee21cf8a1f5d67 Author: Anton Khirnov Date: Sat Jun 4 18:43:05 2011 +0200 dict: add AV_DICT_APPEND flag. commit 25de5958c8fd727777ebf8c4f7a9df6f9b8eb82d Author: Anton Khirnov Date: Sun May 22 13:53:33 2011 +0200 lavf: add avformat_write_header() as a replacement for av_write_header(). It supports more convenient setting of AVOptions. commit 603b8bc2a109978c8499b06d2556f1433306eca7 Author: Anton Khirnov Date: Sat Jun 4 17:36:30 2011 +0200 Deprecate av_open_input_* and remove their uses. Deprecate the last remaining member of AVFormatParameters. commit 05e84c95c7f0543553af8f0ebd50fb5604e7e2ff Author: Anton Khirnov Date: Sun May 22 08:37:25 2011 +0200 lavf: add avformat_open_input() as a replacement for av_open_input_* Add support for demuxer private options. commit dc59ec5e79d813228e3dfbc8942a5fe424b399a0 Author: Anton Khirnov Date: Sun May 22 13:25:19 2011 +0200 AVOptions: add av_opt_find() as a replacement for av_find_opt. commit 7e83e1c511baf0d02f3af75b6180d6af4d50aa99 Author: Anton Khirnov Date: Sun May 22 12:52:50 2011 +0200 AVOptions: add av_opt_set_dict() mapping a dictionary struct to a context. This way the caller can pass all the options in one nice package. commit 0b7ccad6bf79cebe5cd8392105276a4ba19d19f9 Author: Anton Khirnov Date: Wed Jun 15 08:00:03 2011 +0200 ffmpeg: don't abuse a global for passing frame size from input to output It's broken with multiple files or video streams. commit 10de86b882f980a7e856a903bcb45a8fa7816cfd Author: Anton Khirnov Date: Wed Jun 15 08:00:03 2011 +0200 ffmpeg: don't abuse a global for passing pixel format from input to output It's broken with multiple files or video streams. commit 6ec2fd5f77d5c5a3d569978cc6f099af15d25fba Author: Kirill Zorin Date: Thu Jun 16 20:15:53 2011 +0200 mmsh: fix 400 bad request There is no need to write two HTTP newlines (\r\n) into "headers", because http_connect (in http.c) already appends one HTTP newline at the end of the given headers chunk, which would result in sending three HTTP newlines after the headers. Most of the time it's okay (although not RFC-conforming), but many proxy servers and the occasional strict httpd will puke with a "400 bad request". commit 9446d75941d639f19cfa9ae007eb4c5ca041f200 Author: Anton Khirnov Date: Thu Jun 16 18:04:56 2011 +0200 ffmpeg: merge output_codecs array into AVOutputStream members. There's no point in keeping them separate. commit 62940bb42f39b98c45105b036055dacdbe47a175 Author: Anton Khirnov Date: Thu Jun 16 06:24:54 2011 +0200 ffmpeg: initialise encoders earlier. Fixes choosing supported samplerate and framerate. commit 1d076f46a0db987e3cde0914277473f18f1ba03e Author: Diego Biurrun Date: Thu Jun 16 17:04:06 2011 +0200 rtpenc_latm: Consistently use "Libav" in license boilerplate. commit d840733937a3f00dcedbf20507077a4891173516 Author: Martin Storsjö Date: Thu Jun 16 11:04:27 2011 +0300 rtsp: Don't pass string pointer as format string to ff_url_join In this case, the string that was passed couldn't contain user-defined data and thus there was no risk for injection bugs, but it's safer this way, if we later change the content of the options string. Signed-off-by: Martin Storsjö commit 6095388812ce1b2a95e9917b89e5857639208f88 Author: Kirill Zorin Date: Wed Jun 15 19:18:29 2011 +0200 mmsh: fixed printf injection bug in mmsh request Signed-off-by: Martin Storsjö commit 7cbc2e60af72e2154ddc160b1bfce200a95a6532 Author: Anton Khirnov Date: Thu Jun 16 07:24:14 2011 +0200 codec-regression: remove pointless -r options for dnxhd commit 56629aa0127e7f8f2f5dad3ebe794424b51afd64 Merge: 33651e3 7a02527 Author: Michael Niedermayer Date: Thu Jun 16 05:25:18 2011 +0200 Merge branch 'master' into oldabi * master: mmsh: fixed printf injection bug in mmsh request ac3enc: use correct alignment and length in channel coupling dsp functions. ffmpeg: don't abuse a global for passing framerate from input to output ffmpeg: don't abuse a global for passing channels from input to output ffmpeg: don't abuse a global for passing samplerate from input to output Make buffer size check consistent and avoid a possible overflow. Fix spelling. Full support for sending H.264 in RTP ARM: update ff_h264_idct8_add4_neon for 4:4:4 changes swscale: use SwsContext for av_log when available Support reading chan atoms with empty channel descriptions. Reindent after last commit. Fix multi-channel AAC encoding. Fix "redundant redeclaration" warning. Fix compilation with --disable-everything --enable-encoder=ac3/ac3_fixed. vf_mp: Fix large memleak. swscale: Remove HAVE_MMX from files that are only compiled with MMX enabled. swscale: Fix compilation with --disable-mmx2. mjpegenc: Fix JFIF version swscale: remove misplaced comment. ffmpeg: fix streaming to ffserver. swscale: split out RGB48 output functions from yuv2packed[12X]_c(). build: move vpath directives to main Makefile swscale: fix JPEG-range YUV scaling artifacts. build: move ALLFFLIBS to a more logical place ARM: factor some repetitive code into macros CrystalHD: Use mp4toannexb bitstream filter. CrystalHD: Keep mp4toannexb filter around for entire decoder lifetime. Fix SVQ3 after adding 4:4:4 H.264 support H.264: fix CODEC_FLAG_GRAY 4:4:4 H.264 decoding support matroskadec: properly decode color space in an endian neutral way matroskadec: use a temporary fourcc variable matroskaenc: ensure the written colorspace don't depend on host endianness ac3enc: fix allocation of floating point samples. utils: Drop pointless '#if 1' preprocessor directive. ac3enc: remove empty ac3_float function that is never called ac3enc: split templated float vs. fixed functions into a separate file. ac3enc: dynamically allocate AC3EncodeContext fields windowed_samples and mdct ac3enc: use function pointer to choose between AC-3 and E-AC-3 header output functions. Roll back 4:4:4 H.264 for now Needs some ARM/PPC asm modifications. Fix SVQ3 after adding 4:4:4 H.264 support H.264: fix CODEC_FLAG_GRAY 4:4:4 H.264 decoding support h264_parser: Fix whitespace after previous change. h264_parser: Fix behaviour when PARSER_FLAG_COMPLETE_FRAMES is set. wav: remove an invalid free(). lavf: initialise reference_dts in av_estimate_timings_from_pts. h264: don't be so picky on decoding pps in extradata. avcodec.h: add or elaborate on some documentation comments. h264: change a few comments into error messages ac3dec: fix doxy-style for comment ("///>" should be "///<" instead). img2: add .dpx to the list of supported file extensions. ffv1: fix undefined behavior with insane widths. replace remaining usage of deprecated av_metadata_set2() by av_dict_set() matroskaenc: write colourspace element for rawvideo tracks nsv: simplify probe function nsv: return error code instead of discarding it in read_header() ARM: jrevdct_arm: simplify stack usage ARM: jrevdct_arm: use push/pop mnemonics ARM: jrevdct_arm: misc cleanup ARM: optimised mpadsp_apply_window_fixed Add some (important) changelog entries H264: Reduce pointless diffs to qatar Revert "H264: Split out hl_motion and template it, this seems a bit faster" libavfilter: implement avfilter_fill_frame_from_video_buffer_ref() avfiltergraph: make the AVFilterInOut alloc/free API public avfiltergraph: change the syntax of avfilter_graph_parse() graphparser: prefer void * over AVClass * for log contexts h264: Complexify frame num gap shortening code Update todo mpeg12: replace 2 asserts by av_assert0 cmdutils: add missing NULL check in parse_options() x11grab: remove a memory allocation and the associated memcpy. Fix --disable-everything build: fix "make install" with documentation disabled build: simplify some conditional targets resample: clarify supported resampling. lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config() avfiltergraph: use meaningful error codes Revert "ac3: there was no libav in 2010 thus this code cannot be from libav." Fix -t option for formats which holds dts and no pts dnxhd: Renama tables Extract rotation in MOV metadata bitstream: Properly promote av_reverse values before shifting. pixfmt: Replace 9/10bit deprecation by a technical explanation. libavutil/swscale: YUV444P10/YUV444P9 support. H.264: Fix high bit depth explicit biweight h264: Fix 10-bit H.264 x86 chroma v loopfilter asm. Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog. Update copyright year for ac3enc_opts_template.c. adts: Adjust frame size mask to follow the specification. APIchanges: fill hash for the avfilter_get_audio_buffer_ref_from_arrays addition lavfi: avfilter_merge_formats: handle case where inputs are same lavfi: use avfilter_get_audio_buffer_ref_from_arrays() in defaults.c lavfi: implement avfilter_get_audio_buffer_ref_from_arrays() APIchanges: remove duplicated entry APIchanges: fill in dates and numbers APIchanges: remove duplicated entry APIchanges: correctly interleave entries APIchanges: add entry for av_force_cpu_flags() addition lavf: bump minor after the addition of fps_probe_size to AVFormatContext lavc: bump minor after the addition of AVCodecContext.request_sample_fmt movenc: Add RTP muxer/hinter options movenc: Pass the RTP AVFormatContext to the SDP generation rtspenc: Add RTP muxer options rtspenc: Add an AVClass for setting muxer specific options rtpenc_chain: Pass the rtpflags options through to the chained muxer rtpenc: Declare the rtp flags private AVOptions in rtpenc.h sdp: Reindent after the previous commit rtpenc: MP4A-LATM payload support avoptions: Add an av_opt_flag_is_set function for inspecting flag fields sdp: Allow passing an AVFormatContext to the SDP generation mov: Fix wrong timestamp generation for fragmented movies that have time offset caused by the first edit list entry. mpeg12: more advanced ffmpeg mpeg2 aspect guessing code. ac3: there was no libav in 2010 thus this code cannot be from libav. swscale: split YUYV output out of yuv2packed[12X]_c(). dict: This code was developed in ffmpeg and not libav, nor by libav developers. Correct copyright notices. lavf: make compute_pkt_fields2() return meaningful error values matroskadec: set timestamps for RealAudio packets. intelh263dec: aspect ratio processing fix. intelh263dec: fix "Strict H.263 compliance" file playback oss,sndio: simplify by using FFMIN. swscale: extract monowhite/black output from yuv2packed[12X]_c(). swscale: de-macro'ify RGB15/16/32 input functions. swscale: rearrange code. movdec: Add support for the 'wfex' atom. ffmpeg.c: Add a necessary const qualifier riff: Fix potential memleak. swscale: change 48bit RGB input macros to inline functions. swscale: change 9/10bit YUV input macros to inline functions. swscale: extract gray16 output functions from yuv2packed[12X](). swscale: use standard clipping functions. swscale: merge macros that are used only once. swscale: fix function declarations in swscale.c. swscale: fix function declaration keywords in x86/swscale_template.c. jpegdec: actually search for and parse RSTn crypto: Use av_freep instead of av_free Revert "crypto: fix potential double free" Revert "build: remove empty $(OBJS) target" crypto: Use av_freep instead of av_free aac: fix adts frame size mask, fix demuxer probing for some files. lavf: don't try to free private options if priv_data is NULL. lavfi: handle NULL lists in avfilter_make_format_list swscale: fix types of assembly arguments. swscale: move two macros that are only used once into caller. swscale: remove unused function. Fix "mixed declarations and code" warnings. options: Add missing braces around struct initializer. mov: Remove leftover crufty debug statement with references to a local file. dvbsubdec: Fix compilation of debug code. Remove all uses of now deprecated metadata functions. Move metadata API from lavf to lavu. crypto: fix potential double free libx264: fix double free ffplay: remove -debug option ffplay: remove -vismv option mpegvideo: use av_get_picture_type_char() in ff_print_debug_info() Remove some non-compiling debug messages. ffplay: Fix non-compiling debug printf and replace it by av_dlog. H264: x86 predict init cosmetics. ac3enc: Fix linking of AC-3 encoder without the E-AC-3 encoder. Move E-AC-3 encoder functions to a separate eac3enc.c file. ac3enc: remove convenience macro, #define DEBUG ac3enc: remove unused #define vc1: re-initialize tables after width/height change. APIchanges: fill-in git commit hash for av_get_bytes_per_sample() addition samplefmt: add av_get_bytes_per_sample() libvpxenc: add forgotten AVClass. iirfilter: fix biquad filter coefficients. swscale: remove duplicate conversion routine in swScale(). swscale: add yuv2planar/packed function typedefs. swscale: integrate yuv2nv12X_C into yuv2yuvX() function pointers. swscale: reindent x86 init code. swscale: extract SWS_FULL_CHR_H_INT conditional into init code. swscale: cosmetics. swscale: remove alp/chr/lumSrcOffset. swscale: un-special-case yuv2yuvX16_c(). shorten: Remove stray DEBUG #define and corresponding av_dlog statement. vorbisdec: Restore mistakenly removed debug output. v4l2: set default standard to NULL sws: make dither_scale const configure: Document --enable-vdpau. Replace some av_log/printf + #ifdef combinations by av_dlog. Replace some nonstandard DEBUG_* preprocessor directives by plain DEBUG. svq1dec: Fix debug statements that referenced non-existing context. Replace some printf instances in debug code by av_log. showfiltfmts: use av_get_pix_fmt_name() inverse.c: Replace unnecessary intmath.h header by necessary stdint.h. Drop unnecessary directory prefixes from #include directives. Makefile: critical build fix after the merge. make fate passed locally due to ffmpeg/ffmpeg_g being there from before ffplay: Fix -vismv mem: Trying to workaround posix_memalign() bug on OSX build: remove empty $(OBJS) target build: make rule for linking ff* apply only to these targets eval: add support for pow() function build: rearrange some lines in a more logical way s302m: fix resampling for 16 and 24bits. ARM: remove MUL64 and MAC64 inline asm build: clean up .PHONY lists build: move all (un)install* target aliases to toplevel Makefile flvenc: propagate error properly build: remove stale dependency build: do not add CFLAGS-yes to CFLAGS utils.c: fix crash with threading enabled. configure: simplify source_path setup configure: remove --source-path option pixdesc: remove duplicated header inclusion lavfi: use av_samples_alloc() in avfilter_default_get_audio_buffer() lavfi: prefer nb_samples over size in AVFilterBufferRefAudioProps samplefmt: switch nb_channels/nb_samples params order in av_samples_alloc() samplefmt: change layout for arrays created by av_samples_alloc() and _fill_arrays() lavf: deprecate AVFormatParameters.time_base. img2: add framerate private option. img2: add video_size private option. img2: add pixel_format private option. tty: add framerate private option. Move code for "ffmpeg: fix massive leak occurring when seeking" / e4841a404bdabfeafb917454d510b60d888cb761 elsewhere lavf: remove reference to output-example in Makefile vsrc_buffer: add flags param to av_vsrc_buffer_add_video_buffer_ref Remove some unused scripts from tools/. Add x86 assembly for some 10-bit H.264 intra predict functions. v4l2: do not force NTSC as standard Add const to avfilter_get_video_buffer_ref_from_arrays arguments. Skip tableprint.h during 'make checkheaders'. Remove unnecessary LIBAVFORMAT_BUILD #ifdef. Drop explicit filenames from @file Doxygen tags. Skip generated table headers during 'make checkheaders'. lavf,lavc: free avoptions in a generic way. AVOptions: add av_opt_free convenience function. sdl: align option fields after last commit ffmpeg: fix massive leak occurring when seeking ffprobe: implement -i FILE option tableprint: Restore mistakenly deleted common.h #include for FF_ARRAY_ELEMS. ffplay.texi: document -i FILE option cmdutils: remove unnecessary OPT_DUMMY implementation cmdutils: change the signature of the function argument in parse_options() sdl: use the filename for defining the window title, if not specified tiff: print log in case of unknown / unsupported tag. tiff: fix linesize for mono-white/black formats. Fix build of eval-test program configure: Document --enable-vaapi swscale: override the lack of the accurate rounding flag when needed for dither. swscale: factor should_dither out ac3enc: extract all exponents for the frame at once ARM: remove MULL inline asm mathops: use MUL64 macro where it forms part of other ops tty: factorise returning error codes. rawdec: add framerate private option. x11grab: add framerate private option. fbdev,v4l2: remove some forgotten uses of AVFormatParameters.time_base. bktr: don't error when AVFormatParameters.time_base isn't set. cmdutils: add missing const qualifier Skip headers not designed to work standalone during 'make checkheaders'. Add missing #includes to make headers self-contained. musepack: remove unnecessary #include from mpcdata.h musepack: remove extraneous mpcdata.h inclusions Fix error check in av_file_map() udp: support old, crappy non pthread mode ffmpeg: use opt_acodec when setting audio codec in opt_target. ffmpeg: fix segfault with too many output files ffplay: error out with invalid sample rate or channels. oggdec: fix Ticket185 build: simplify commands for clean target j2kdec: dont fail on non zero cblock style. makefile: fix j2k encoder dependancies udp: fix indention swscale: split swscale.c in unscaled and generic conversion routines. swscale: cosmetics. swscale: integrate (literally) swscale_template.c in swscale.c. swscale: split out x86/swscale_template.c from swscale.c. swscale: enable hScale_altivec_real. swscale: split out ppc _template.c files from main swscale.c. swscale: remove indirections in ppc/swscale_template.c. swscale: split out unscaled altivec YUV converters in their own file. mpegvideoenc: fix multislice fate tests with threading disabled. cmdutils: move "#undef main" from ffplay.c to cmdutils.h wav: update size check for ds64 wav: fix skip size at end of ds64 chunk mpegts: Wrap #ifdef DEBUG and av_hex_dump_log() combination in a macro. build: Simplify texi2html invocation through the --output option. Mark some variables with av_unused Replace avcodec_get_pix_fmt_name() by av_get_pix_fmt_name(). svq3: Check negative mb_type to fix potential crash. svq3: Move svq3-specific fields to their own context. rawdec: initialize return value to 0. Remove unused get_psnr() prototype rawdec: don't leak option strings. bktr: get default framerate from video standard. swscale: remove unused COMPILE_TEMPLATE_ALTIVEC. h264 fill_filter_caches: Dont init chroma nnz_cache. In print_report, print progression time in hours:mins:secs:us ffmpeg: In print_report, use int64_t for pts to check for 0 and avoid inf value for bitrate. In libswscale, use all lines when converting from 422p to rgb with mmx, improve quality. Replace custom DEBUG preprocessor trickery by the standard one. vorbis: Remove non-compiling debug statement. vorbis: Remove pointless DEBUG #ifdef around debug output macros. cook: Remove non-compiling debug output. Remove pointless #ifdefs around function declarations in a header. Replace #ifdef + av_log() combinations by av_dlog(). Replace custom debug output functions by av_dlog(). cook: Remove unused debug functions. lavfi: add avfilter_link_free() function swscale: reintroduce sws_format_name() symbol Remove stray extra arguments from av_dlog() invocations. targa: fix big-endian build v4l2: remove one forgotten use of AVFormatParameters.pix_fmt. vfwcap: add a framerate private option. v4l2: add a framerate private option. libdc1394: add a framerate private option. fbdev: add a framerate private option. bktr: add a framerate private option. oma: check avio_read() return value nutdec: remove unused variable Remove unused variables swscale: dither for planar yuv outputs swscale: Fix use of uninitialized values (bug probably introduced from a marge of libav) cpudetect: add av_force_cpu_flags() swscale: allocate larger buffer to handle altivec overreads. H264/MPEG frame-level multi-threading. vsrc_buffer: propagate error code in av_vsrc_buffer_add_frame() lavfi: reindent after the previous commit lavfi: add braces around the block of an if() expression in avfilter_default_get_video_buffer lavfi: clarify the context of a comment in avfilter_default_get_video_buffer() lavfi: apply misc style fixes Cosmetic changes to h264_idct_10bit.asm. 2x faster h264_idct_add8_10. aacenc: Add stereo_mode option. h264: remove CONFIG_GPL from x86 intra prediction code. doc: cosmetics: libx264 typos postprocess: Remove test for impossible condition (was: Re: postprocess.c: replace check for p==NULL with *p==0) Fix various uninitialized variable warnings Port remove of get_sws_cpuflags from MPlayer's libmpcodecs. Replace "vector const" by "const vector" otherwise gcc 4.6.0 fails. Port recent changes to MPlayer libmpcodecs. Replace non-existent HAVE_SSE2 with HAVE_SSE. Simplify code and avoid compiler warning about incompatible types. Fix type of out[] variable, it should not be const. ARM: ac3dsp: optimised update_bap_counts() mpegaudiodec: Fix av_dlog() invocation. swscale: fix compilation of bfin due to missing pixdesc.h header lavf: tag dump_format() as @deprecated yuv4mpeg: complain and exit if a non-rawvideo stream is selected ffmpeg: handle copy of packets for AVFMT_RAWPICTURE output formats doc/examples: give meaningful names to the example files h264/10bit: add HAVE_ALIGNED_STACK checks. swscale: More accurate rounding in YSCALE_YUV_2_PACKEDX_FULL_C() Update 8-bit H.264 IDCT function names to reflect bit-depth. Add IDCT functions for 10-bit H.264. mpegaudioenc: Fix broken av_dlog statement. Employ correct printf format specifiers, mostly in debug output. ARM: fix MUL64 inline asm for pre-armv6 doc: add libvpx encoder section vf_drawtext: Replace FFmpeg by Libav in license boilerplate. mpegaudiodec: remove unusued code and variables postprocess.c: filter name needs to be double 0 terminated improved 'edts' atom writing support mpegaudio: clean up compute_antialias() definition vp8: fix segmentation race during frame-threading. Port libmpcodec fixes from MPlayer. Merge remote-tracking branch 'ffmpeg-mt/master' swscale: Remove unused variable. ARM: simplify inline asm with 64-bit operands Add "const" to avoid "initialization discards qualifiers" warning. Add const to fix "cast discards qualifiers" warnings. Include pixdesc.h for av_get_pix_fmt_name. wav: Don't avio_seek() if we know we'll run into EOF api-example: uppercase first letter in "copyright" output-example: create @file doxy from text in the copyright header examples: move API examples to a dedicated dir in doc ffmpeg: simplify opt_*_codec() options v4l2: rewrite code iterating the supported standards v4l2: perform minor style fixes v4l2: replace memset() with explicit struct initialization rawdec: fail in case of unknow pixel format swscale: remove sws_format_name() error.c: fix compile flags TCP: change default timeout to 5sec Revert "Timeout TCP open() after 5 seconds." Fix various unused variable warnings Fix various bad printf format warnings ARM: enable UAL syntax in asm.S Remove now unused nb_istreams variable. Add const to vector types for input in altivec code. Remove unused variable, avoiding compiler warning. Cast pointers to uintptr_t rather than unsigned int. v4l2: don't leak video standard string on error. swscale: Remove disabled code. avfilter: Surround function only used in debug mode by appropriate #ifdef. vf_crop: Replace #ifdef DEBUG + av_log() by av_dlog(). build: remove BUILD_ROOT variable vp8: use av_clip_uintp2() where possible swscale: Commits that could not be pulled earlier due to bugs #2 Commits that could not be pulled earlier due to bugs. Revert 1a5e4fd8c5b99478b4e08a69261930bb12aa948b for postproc. This broke the code doc: correct AC-3 option subsection placement ac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits() ac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits. swscale: use av_clip_uint8() in yuv2yuv1_c(). swscale: replace formatConvBuffer[VOF] by allocated array. v4l2: create file @doxy from text in the copyright header v4l2: remove pointless empty lines v4l2: set default standard to NULL v4l2: use OFFSET macro when setting options ac3dsp: fix loop condition in ac3_update_bap_counts_c() ARM: unbreak build lavdev: add SDL output device ac3enc: modify mantissa bit counting to keep bap counts for all values of bap instead of just 0 to 4. ac3enc: split mantissa bit counting into a separate function. ac3enc: store per-block/channel bap pointers by reference block in a 2D array rather than in the AC3Block struct. lavu: add av_get_pix_fmt_name() convenience function iff: remove duplicated file description cmdutils: remove OPT_FUNC2 get_bits: add av_unused tag to cache variable sws: replace all long with int. ARM: aacdec: fix constraints on inline asm ARM: remove unnecessary volatile from inline asm ARM: add "cc" clobbers to inline asm where needed ARM: improve FASTDIV asm ac3enc: use LOCAL_ALIGNED macro APIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7). lavu: add av_get_pix_fmt_name() convenience function cmdutils: remove OPT_FUNC2 swscale: fix crash in bilinear scaling. vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping webm: support stereo videos in matroska/webm muxer rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions. swscale: reindent h[cy]scale_fast() and updateDitherTables(). swscale: reformat x86/swscale_template.c. swscale: remove duplicate mmx/mmx2 functions if they are identical. swscale: remove if (c->dstFormat) branch from yuv2packed[12X](). swscale: remove if(full_chr_int) from yuv2packed1(). swscale: remove if(accurate_rnd) branch from functions. swscale: revive SWS_CPU_CAPS until next major bump. swscale: Remove commented-out printf cruft. Export PCR pid Export more transport stream information. Output MPEG-TS stream identifiers. lavf: deprecate AVFormatParameters.pix_fmt. rawdec: add a pixel_format private option. v4l2: add a pixel_format private option. libdc1394: add a pixel_format private option. cosmetics: indentation and alignment after previous commit ac3enc: add support for E-AC-3 encoding. ac3enc: Move AC-3 AVOptions array to a separate file to make it easier to use only selected options for the different AC-3 encoder types. ARM: disable ff_vector_fmul_vfp on VFPv3 systems ARM: check for VFPv3 swscale: Remove unused variables in x86 code. doc: Drop DJGPP section, Libav now compiles out-of-the-box on FreeDOS. x86: Add appropriate ifdefs around certain AVX functions. cmdutils: use sws_freeContext() instead of av_freep(). swscale: delay allocation of formatConvBuffer(). swscale: fix build with --disable-swscale-alpha. movenc: Deprecate the global RTP hinting flag, use a private AVOption instead movenc: Add an AVClass for setting muxer specific options libdc1394: choose best video mode and rate based on camera capabilities. Remove support for libdc1394 < 2.0. avopt: fix segfault swscale: fix non-bitexact yuv2yuv[X2]() MMX/MMX2 functions. swscale: dont loose precission on RGB/BGR48 input, that is dont drop half the bits. patch checklist: suggest --disable-yasm test. lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h lavdev: include libavformat/avformat.h in avdevice.h fate.txt: replace FATE rsync command with a make command configure: report yasm/nasm presence properly tcp: make connect() timeout properly rawdec: factor video demuxer definitions into a macro. rtspdec: add initial_pause private option. lavf: deprecate AVFormatParameters.width/height. tty: add video_size private option. rawdec: add video_size private option. x11grab: add video_size private option. x11grab: factorize returning error codes. vfwcap: add video_size private option. v4l2: add video_size private option. v4l2: factorize returning error codes. libdc1394: add video_size private option. libdc1394: return meaninful error codes. bktr: add video_size private option. bktr: factorize returning error codes. Fix memleak Fix typo Remove specific note when not specific Minor cleanup in libx264.c Add metadata conversion table to the wav demuxer Fix 32bit rawvideo in avi on big-endian. id3v2: Check malloc result. ID3v2 tags can be very large. id3v2: Initialize tflags for version 2.2. webm: Additional options/presets for VP8 encodes under FFmpeg muxers: Add a flag to mark muxers that allow (non strict) monotone timestamps. swscale: Do not loose precission on yuv values after rgb->yuv. libx264: support aspect Ratio Switch ARM: add ARMv6 optimised av_clip_uintp2 ARM: remove volatile from asm statements in libavutil/intmath ARM: fix av_clipl_int32_arm() v4l: include avdevice.h ffserver: move close_connection() call to avoid a temporary string and copy. lavf: initialize demuxer private options. AVOptions: set string default values. Fix compilation with YASM/NASM versions not supporting AVX. lavdevice: mark v4l for removal on next major bump. swscale: fix compile on ppc. swscale: fix compile on x86-32. build: Remove generated .version file on distclean. configure: Add -D_GNU_SOURCE to CPPFLAGS on OS/2. doc: Drop hint at --enable-memalign-hack for MinGW, it is now autodetected. ffplay: Remove disabled code. Mark parameterless function declarations as 'void'. swscale: use av_clip_uint8() in yuv2yuv1_c(). swscale: remove VOF/VOFW. swscale: split chroma buffers into separate U/V planes. swscale: replace formatConvBuffer[VOF] by allocated array. rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions. swscale: reindent h[cy]scale_fast() and updateDitherTables(). swscale: reformat x86/swscale_template.c. swscale: remove duplicate mmx/mmx2 functions if they are identical. swscale: remove if (c->dstFormat) branch from yuv2packed[12X](). swscale: remove if(full_chr_int) from yuv2packed1(). swscale: remove if(accurate_rnd) branch from functions. ffserver: Fix a null pointer dereference as a result of the FF_API_MAX_STREAMS cleanup. libdc1394: fix compilation. swscale: revive SWS_CPU_CAPS until next major bump. swscale: Remove commented-out printf cruft. ac3enc: initialize all coefficients to zero. ffv1: fix 16bits multithreading doc: create separate section for audio encoders swscale: Remove orphaned, commented-out function declaration. swscale: Eliminate rgb24toyv12_c() duplication. mpegvideo_enc: use AV_LOG_ERROR instead of AV_LOG_INFO for two error messages Fail when lowres value is lower than 0 Remove h263_msmpeg4 from MpegEncContext. APIchanges: Fill in git hash for fps_probe_size (30315a8) avformat: Add fpsprobesize as an AVOption. swscale: document SWS_CPU_CAPS* Revert removial of SWS flags from e66149e714006d099d1ebfcca3f22ca74fc7dcf4 avoptions: Return explicitly NAN or {0,0} if the option isn't found rtmp: Reindent rtmp: Don't try to do av_malloc(0) swscale: remove duplicatiopn of rgb24toyv12_c() Return -1 on invalid input instead of crashing. vf_mp: fix name of the remove-logo filter referenced in filters.texi tty: replace AVFormatParameters.sample_rate abuse with a private option. Fix end time of last chapter in compute_chapters_end ffmpeg: get rid of useless AVInputStream.nb_streams. ffmpeg: simplify managing input files and streams ffmpeg: purge redundant AVInputStream.index. lavf: deprecate AVFormatParameters.channel. libdc1394: add a private option for channel. dv1394: add a private option for channel. v4l2: reindent. v4l2: add a private option for channel. lavf: deprecate AVFormatParameters.standard. v4l2: add a private option for video standard. v4l: add a private option for video standard. dv1394: add a private option for video standard. bktr: add a private option for video standard. lavf: deprecate AVFormatParameters.{channels,sample_rate}. rawdec: add sample_rate/channels private options. ALSA: add channels and sample_rate private options. oss: add channels and sample_rate private options. sndio: add channels and sample_rate private options. lavf: deprecate AVFormatParameters.mpeg2ts_raw. mpegts: add compute_pcr option. lavf: add priv_class field to AVInputFormat. lavfi: add select filter eval: implement not() expression vsrc_buffer: return an error code if no frames are available ffmpeg: handle the case when get_filtered_frame() fails indeo3: add out-of-buffer write check Add reading of disc number to mov.c Fix end time of last chapter in compute_chapters_end(). Do not reset channel_layout to 0. vsrc_buffer: remove duplicated file description Merge swscale bloatup This will be cleaned up in the next merge swscale: MMX optim of hscale16() swscale: dont loose bits on planar >8bit yuv ind gray nput. swscale: Switch to ronalds yuv2yuvX16inC_template() its very similar to baptsites and supports alpha configure: enable memalign_hack automatically when needed rawdec: fix decoding of QT WRAW files matroska: improve declaration of video_stereo_* constant tables matroskadec: fix reverted condition to accept combine_plane operation Fix register types for LOAD_AB arguments, fixes compilation with NASM. swscale: unbreak the build on non-x86 systems. swscale: remove if(bitexact) branch from functions. swscale: remove if(canMMX2BeUsed) conditional. swscale: remove swScale_{c,MMX,MMX2} duplication. swscale: use emms_c(). Move emms_c() from libavcodec to libavutil. tiff: set palette in the context when specified in TIFF_PAL tag rtsp: use strtoul to parse rtptime and seq values. pgssubdec: fix incorrect colors. dvdsubdec: fix incorrect colors. ape: Allow demuxing of files with metadata tags. swscale: remove dead macro WRITEBGR24OLD. swscale: remove AMD3DNOW "optimizations". swscale: remove duplicate code in ppc/ subdirectory. swscale: remove duplicated x86/ functions. swscale: force --enable-runtime-cpudetect and remove SWS_CPU_CAPS_*. vsrc_buffer.h: add file doxy vsrc_buffer: tweak error message in init() wav: fix various printf warnings related to wrong argument type wav: propagate ff_get_wav_header() error code in w64_read_header() msmpeg4: reindent. lavc: remove msmpeg4v1 encoder. Remove avconfig.h and INCINSTDIRs on uninstall. ac3enc: add channel coupling support partial revert of 01d3ebaf219d83c0a70cdf9696ecb6b868e8a165 fate: reenable frext-pph10i4_panasonic_a after the bitstream has been fixed avcodec_find_decoder: prefer non experimental decoders. j2kdec: mark as CODEC_CAP_EXPERIMENTAL j2k[c/h] j2kdec.c: Implement 2 code block styles j2k: Add void as the parameter of function ff_j2k_init_tier1_luts Add Kamil Nowosads j2k code. matroska: cleanup handling of video stereo mode oggdec: use av_dlog() mem: define the MAX_MALLOC_SIZE constant and use it in place of INT_MAX configure: Add -U__STRICT_ANSI__ to CPPFLAGS on Cygwin and DOS. muxers.texi changes for mkv/webm options aacdec: fix typo in scalefactor clipping check mpegaudio: Correct license header add 5.1 to stereo downmix to resample.c this is based on previous 6to2channel-resample.patch from ffmpeg2theora but updated to work with trunk and using av_clip_int16. fate: fix fate-h264-conformance-frext-pph10i4-panasonic-a crcs. fate: update 9/10bit refs. h264: Properly set coded_{width, height} when parsing H.264. x86 asm: Add SECTION_TEXT to dct32_sse.asm. Fix 9/10 bit in swscale. Do not ask for samples if a specific channel layout was requested. libx264: specify field for default union values in options movdec: dont divide by zero when stts_data[0].duration = 0. Fix ticket127 dct32: Replacing libav by ffmpeg in the license header with the authors permission. Signed-off-by: Michael Niedermayer ffmpeg: Don't trigger url_interrupt_cb on the first signal avoptions: Check the return value from av_get_number lavf: fix style for avformat_alloc_output_context2() lavf: deprecate avformat_alloc_output_context() in favor of avformat_alloc_output_context2() lavfi: make vsrc_buffer.h header public dct32_sse: eliminate some spills Fix compilation with --disable-yasm. Fix dct32() compilation with --disable-yasm mpeg2dec: Fix lowres 3 lavfi: bump minor and add changelog entry after the split filter addition vf_split: add documentation to filters.texi vf_split: give more meaningful names to the output pads vf_split: define draw_slice() before end_frame() vf_split: add description vf_split: fix various nits wmadec: avoid infinit loop. DirectShow capture: Fix build ffmpeg: get rid of the -vglobal option. dct32: Add AVX implementation of 32-point DCT dct32: Change pass 6 permutation to allow for AVX implementation dct32: port SSE 32-point DCT to YASM matroska: switch stereo mode from int to string and add support in the demuxer too matroska: cosmetics Create a stereo_mode metadata tag to specify the stereo 3d video layout using the StereoMode tag in a matroska/webm video track. libavfilter: vf_split from soc. DirectShow capture support Signed-off-by: Michael Niedermayer multiple inclusion guard cleanup avio: document buffer must created with av_malloc() and friends avio: check AVIOContext malloc failure swscale: point out an alternative to sws_getContext svq3: Do initialization after parsing the extradata Fix channel_layout documentation. add changelog entries for 0.7_beta2 ffserver: dont just crash fix ffserver's SIGSEGV avoptions: Support getting flag values using av_get_int preset dir for win32 Merge remote-tracking branch 'ffmpeg-mt/master' Add a flag to disable side data merging. Merge/split side data. Encoding alac with more than two channels is not supported. mp3lame: add #include required for AV_RB32 macro. configure: make executable again LATM/AAC: Free previously initialized context on reinit. configure: Do not unconditionally add -Wall to host CFLAGS. configure: Set OS/2 objformat to a.out. Add support for a.out object format to assembler macros. fate: disable threading for encoding fate: add comment field fate: allow overriding default build and install dirs mpegtsenc: Add an AVClass pointer to the private data mpegaudio: clean up #includes mpegaudio: move all header parsing to mpegaudiodecheader.[ch] vf_libopencv: prefer opencv/cxcore.h over cxtypes.h decoders.texi: fix typos in rawvideo section cmdutils: use const AVClass * when senseful encoders.texi: add documentation for the libx264 encoder decoders.texi: add documentation for rawvideo decoder and options doc: add decoders.texi file encoders.texi: decrease level for audio encoders section ffprobe.texi: remove inclusion of muxers section indeo3: release buffer in indeo3_decode_end() indeo3: remove unnecessary includes indeo3: add @file doxy and a link to multimedia wiki documentation cmdutils: reset *picref_ptr to NULL in get_filtered_frame() ffmpeg: remove useless NULL-check on avfilter_unref_buffer libmp3lame: include "libavutil/intreadwrite.h" header qdm2: Use floating point synthesis filter. h264: correct border check. h264: fix loopfilter with threading at slice boundaries. Fix ff_mpa_synth_filter_fixed() prototype Reindent rtpenc_chain: Pass the MP4A_LATM flag to chained muxers rtpenc: MP4A-LATM payload support movenc: Pass AVFormatContext flags to the SDP generation sdp: Allow passing AVFormatContext flags to the SDP generation vsrc_buffer: document av_vsrc_buffer_add_video_buffer_ref() vsrc_buffer: add av_vsrc_buffer_add_frame() vsrc_buffer: fix example in docs, add mandatory parameters vsrc_buffer: make the source accept sws_param in init vsrc_buffer: propagate avfilter_open() error code vsrc_buffer: fix style lavfi: add avfilter_get_video_buffer_ref_from_frame to avcodec.h vsrc_buffer: remove dependency on AVFrame Rename costablegen.c ---> cos_tablegen.c. Collapse tableprint.c into tableprint.h. Simplify trig table rules Remove potentially unstable filenames from comments in generated files. Ignore generated tables and generated table generator programs. Simplify CLEANFILES make variable by using wildcards. Remove silly insults from avformat_version() Doxygen documentation. mpegaudiodsp: fix x86 and ppc makefiles configure: Adjust AVX assembler check. mpegaudio: remove unused version of SAME_HEADER_MASK mpegaudio: remove useless #undef at end of file asfdec: add missing #include for av_bswap32() mpegaudio: merge two #if CONFIG_FLOAT blocks mpegaudio: move some struct definitions from mpegaudio.h Move some mpegaudio functions to new mpegaudiodsp subsystem Clean up #includes in cmdutils.h. g729: Merge g729.h into g729dec.c. av_find_stream_info: Print more details about max anaylize duration failures. 10l: wrap float_interleave functions in HAVE_YASM. Add little description for -rc_override APIchanges: fill in date and commit for request_sample_fmt Add floating-point sample format support to the ac3, eac3, dca, aac, and vorbis decoders. Add support for request_sample_format in ffmpeg and ffplay. Add APIchanges entry for request_sample_fmt. Add request_sample_fmt field to AVCodecContext. Add float_interleave() to FmtConvertContext with x86-optimized versions. Remove unused make variable SEEK_REFFILE fate: remove redundant aref and vref references Parse 'bext' metadata in the wav demuxer Cosmetics: indent Keep parsing wav until EOF if the input is seekable and we know the size of the data tag Refactor the tag checking into a switch statement Use avio_tell() instead of url_ftell() add x264opts entry to docs cleaned up the udp.c, removed some variables and an av_log configure: favor pkg_config over sdl_config libx264: support passing arbitrary parameters. ffmpeg: dont show_banner() on verbose<0 fate: remove do_ffmpeg_nocheck function fate: do not collect -benchmark output mpegaudiodec: remove decode_end() function fate: run aref and vref as regular tests mpegaudio: sanitise compute_antialias_* names mpeg12: add slice-threading checks to slice-threading initializers. h264: copy pixel_shift between slice threading contexts. mdec: enable frame-level multithreading. mdec.c: fix overread. id3v2: prevent unsigned integer overflow in ff_id3v2_parse() id3v2: add @file doxy and link to format documentation configure: opensolaris install is not compatible with ffmpeg, allow overriding it. Fix compilation of iirfilter-test. eval: opensolaris strtod() cannot handle 0x1234 libx264: handle closed GOP codec flag lavf: remove duplicate assignment in avformat_alloc_context. lavf: use designated initializers for AVClasses. Make sure neither data_size nor sample_count is negative Refactor the 'fmt ' tag search and parsing flvdec: clenup debug code asfdec: fix possible overread on broken files. asfdec: do not fall back to binary/generic search asfdec: reindent after previous commit c7bd5ed asfdec: fallback to binary search internally mpegaudio: add _fixed suffix to some names Modify x86util.asm to ease transitioning to 10-bit H.264 assembly. ffmpeg: reset top_field_first in opt_input_file(). dct: build dct32 as separate object files qdm2: include correct header for rdft Ogg demuxer: give meaningful error codes and warnings. update changelog with 9/10 bit H264 and FFV1 changes Add some forgotten const to function arguments in libavfilter & libavformat. Write channel_layout for multichannel aif files. Fix ff_mov_write_chan() so it can be used by other muxers. Fix some mov files with little endian audio (tickets 201 - 203). iff/8svx: redesign 8SVX demuxing and decoding for handling stereo samples correctly iff: compact code setting metadata tags iff: fix bitrate computation for compressed audio stream iff: distinguish fields for audio and video compression imgutils: introduce internal image_get_linesize() and use it imgutils: make av_image_get_linesize() return AVERROR(EINVAL) for invalid pixel formats drawtext: specify union type for setting default options drawtext: reindent after the previous commit drawtext: fix strftime() text expansion ffmpeg: fix -aspect cli option Restructure video filter implementation in ffmpeg.c. ffplay: remove audio_write_get_buf_size() forward declaration lavfi: print key-frame and picture type information in ff_dlog_ref() mathops: remove ancient confusing comment rawdec: Allow overriding top field first. ffmpeg: initialize input_codec array earlier. cmdutils: Allocate private decoder context if its not allocated yet. cws2fws: Improve error message wording. tools: Check the return value of write(). mpegaudio: move OUT_FMT macro to mpegaudiodec.c mpegaudio: remove OUT_MIN/MAX macros Add missing #includes to mp3_header_(de)compress bsf dct: fix indentation dct: bypass table allocation for DCT_II of size 32 pngdec: relax condition for setting monoblack pixel format h264dsp_mmx: Add #ifdefs around some mmxext functions on x86_64. Remove unused header mpegaudio3.h. Support decoding of 1bpp rawvideo in avi (ticket 205). Support decoding of 2bpp rawvideo in avi (ticket 206). Bump minor after adding a caf muxer. configure: another try on fixing osx/mingw SDL aacdec: Use float instead of int16_t for ltp_state to avoid needless rounding. av_picture_crop(): Support simple cases with packed pixels too. acelp: Remove unused gray_decode table. dfa: Remove unused variable. configure: Include AVX availability in summary output. rawdec: propagate pict_type information to the output frame showinfo: replace "CRC" by "checksum" showinfo: fix vertical align nit showinfo: fix computation of Adler checksum imgutils: generalize linesize computation for bitstream formats configure: use same CPPFLAGS in kFreeBSD as Linux Conflicts: ffserver.c libavcodec/avcodec.h libavcodec/opt.h libavcodec/version.h libavdevice/avdevice.h libavfilter/avfilter.h libavformat/avformat.h libavformat/metadata.c libavformat/metadata.h libavformat/utils.c libavformat/version.h libavutil/avutil.h libavutil/mem.c Merged-by: Michael Niedermayer commit 7a02527b05e2ae5ffab579062dbe3c888758335f Merge: a0bafaa b203f65 Author: Michael Niedermayer Date: Thu Jun 16 03:53:58 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: ac3enc: use correct alignment and length in channel coupling dsp functions. ffmpeg: don't abuse a global for passing framerate from input to output ffmpeg: don't abuse a global for passing channels from input to output ffmpeg: don't abuse a global for passing samplerate from input to output ARM: update ff_h264_idct8_add4_neon for 4:4:4 changes swscale: use SwsContext for av_log when available swscale: Remove HAVE_MMX from files that are only compiled with MMX enabled. swscale: Fix compilation with --disable-mmx2. Conflicts: ffmpeg.c libswscale/utils.c Merged-by: Michael Niedermayer commit a0bafaabb0656ca3bb3591beba0de79f6153fdac Author: Kirill Zorin Date: Wed Jun 15 19:18:29 2011 +0200 mmsh: fixed printf injection bug in mmsh request commit b203f65451646b1555d458a3601159f7d89a3397 Author: Justin Ruggles Date: Tue Jun 14 13:45:38 2011 -0400 ac3enc: use correct alignment and length in channel coupling dsp functions. This fixes a segfault when using the C version of ac3dsp.float_to_fixed24(). commit a6286bda0956bfe15b4e1a9f96e1689666e1d866 Author: Anton Khirnov Date: Wed Jun 15 08:00:03 2011 +0200 ffmpeg: don't abuse a global for passing framerate from input to output It's broken with multiple files or video streams. commit 8f3e999736b7bad956becb3705661f52d986eb2d Author: Anton Khirnov Date: Wed Jun 15 08:00:03 2011 +0200 ffmpeg: don't abuse a global for passing channels from input to output It's broken with multiple files or audio streams. commit d7ee44024c96ebdbcd718885a77e9a07779df54c Author: Anton Khirnov Date: Wed Jun 15 08:00:03 2011 +0200 ffmpeg: don't abuse a global for passing samplerate from input to output It's broken with multiple files or audio streams. This removes the default samplerate of 44100 for raw input, hence all the FATE changes. commit 7f2228dbfec0268b8b486573041043c0de1aa381 Author: Reimar Döffinger Date: Wed Jun 15 20:21:33 2011 +0200 Make buffer size check consistent and avoid a possible overflow. commit c940c31c88494c6accbdb0df3b715bd1f161368f Author: Reimar Döffinger Date: Wed Jun 15 20:20:47 2011 +0200 Fix spelling. commit e7c7b2d87842c689ae7da4d6d636a08cb1e9ce88 Author: Luca Abeni Date: Wed Jun 15 17:59:03 2011 +0200 Full support for sending H.264 in RTP This implements support for the "MP4" syntax of H.264 bitstreams. Signed-off-by: Michael Niedermayer commit 88ff180ad66d5b12f5ee0ffbda891b467725a8d3 Author: Mans Rullgard Date: Wed Jun 15 12:58:00 2011 +0100 ARM: update ff_h264_idct8_add4_neon for 4:4:4 changes Signed-off-by: Mans Rullgard commit 3636e791ec295dcea3c1ce0206d944cd5c76a650 Author: Janne Grunau Date: Tue Apr 26 00:27:48 2011 +0200 swscale: use SwsContext for av_log when available Signed-off-by: Diego Biurrun commit 4f4d1358ae30c2b8588f4dc6b3ef964a048004e8 Author: Andrew Wason Date: Wed Jun 15 11:09:17 2011 +0200 Support reading chan atoms with empty channel descriptions. Fixes ticket 263. commit dbf23d191a808734679bd7d0c8737c082ad24a72 Author: Carl Eugen Hoyos Date: Wed Jun 15 10:58:25 2011 +0200 Reindent after last commit. commit b3452771c4550b46ea54d15be6cfe8cc10585199 Author: Carl Eugen Hoyos Date: Wed Jun 15 10:57:26 2011 +0200 Fix multi-channel AAC encoding. Fixes ticket 55. commit b1c450be49d9896ce4c96d04944f5f15e2ced028 Author: Carl Eugen Hoyos Date: Wed Jun 15 10:53:18 2011 +0200 Fix "redundant redeclaration" warning. commit 19b8c988286cbc827d6c0d2569ee88af323262f1 Author: Carl Eugen Hoyos Date: Wed Jun 15 10:47:46 2011 +0200 Fix compilation with --disable-everything --enable-encoder=ac3/ac3_fixed. commit c137fdd778e1bb82c2f0d7fa4a88adc97058d6d4 Merge: 9e2f448 4e05830 Author: Michael Niedermayer Date: Wed Jun 15 02:15:25 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: swscale: remove misplaced comment. ffmpeg: fix streaming to ffserver. swscale: split out RGB48 output functions from yuv2packed[12X]_c(). build: move vpath directives to main Makefile swscale: fix JPEG-range YUV scaling artifacts. build: move ALLFFLIBS to a more logical place ARM: factor some repetitive code into macros Fix SVQ3 after adding 4:4:4 H.264 support H.264: fix CODEC_FLAG_GRAY 4:4:4 H.264 decoding support ac3enc: fix allocation of floating point samples. Conflicts: ffmpeg.c libavcodec/dsputil_template.c libavcodec/h264.c libavcodec/mpegvideo.c libavcodec/snow.c libswscale/swscale.c libswscale/swscale_internal.h Merged-by: Michael Niedermayer commit 9e2f448d68d9df7ad79d968db315c6b0cc79c4df Author: Michael Niedermayer Date: Wed Jun 15 01:36:12 2011 +0200 vf_mp: Fix large memleak. Signed-off-by: Michael Niedermayer commit a60466dbc3aededb0a1fab96d7fe2286f4c1a8f7 Author: Diego Biurrun Date: Wed Jun 15 00:56:31 2011 +0200 swscale: Remove HAVE_MMX from files that are only compiled with MMX enabled. commit 97e057ff814c253c770f011736e33c0b65c9c663 Author: Diego Biurrun Date: Wed Jun 15 00:52:43 2011 +0200 swscale: Fix compilation with --disable-mmx2. Some MMX2 functions were being referenced without proper #ifdefs. commit b19313218c32fa9446d474cbddb11c0776868cd3 Author: William Yu Date: Tue Jun 14 17:16:51 2011 +0200 mjpegenc: Fix JFIF version commit 4e0583020567dd2062a908fe59aacba484e68049 Author: Ronald S. Bultje Date: Tue Jun 14 16:55:24 2011 -0400 swscale: remove misplaced comment. The comment should have been placed only in yuv2rgb48_X_c_template, not yuv2rgb48_1_c_template. commit 0be3736796b1651ad785c9ba68d26c2276cc074c Author: Ronald S. Bultje Date: Tue Jun 14 15:35:05 2011 -0400 ffmpeg: fix streaming to ffserver. commit 9f6321117565f9e673c8c6dbfb4104c09272704e Author: Ronald S. Bultje Date: Tue Jun 14 15:02:24 2011 -0400 swscale: split out RGB48 output functions from yuv2packed[12X]_c(). This is part of the Great Evil Plan to simplify swscale. Note that you'll see some code duplication between the output functions for different RGB variants, and even between packed-YUV and RGB variants. This is intentional because it improves readability. commit d530e5794475887d5d2b1f05dfd60ba4542b0f82 Author: Mans Rullgard Date: Sun Jun 5 22:00:54 2011 +0100 build: move vpath directives to main Makefile Signed-off-by: Mans Rullgard commit 0af8a71d66305874bd6f0ebc84ebf99339b6a5d3 Author: Michael Niedermayer Date: Sun Jun 12 21:53:22 2011 -0400 swscale: fix JPEG-range YUV scaling artifacts. YUV planes were marked as uint16_t, but they contained signed data. Fixes issue 1108 and 675. Signed-off-by: Ronald S. Bultje commit cf53c48615658a6019ffb7e8453913bbfd38cb27 Author: Mans Rullgard Date: Sun Jun 5 22:18:06 2011 +0100 build: move ALLFFLIBS to a more logical place Signed-off-by: Mans Rullgard commit e897a633cded0a8f283114e22766790f48ae8fa7 Author: Mans Rullgard Date: Mon Jun 13 00:33:19 2011 +0100 ARM: factor some repetitive code into macros Signed-off-by: Mans Rullgard commit 4ac5dffc5a4daf315fb908ec689366e179a59ad3 Author: Philip Langdale Date: Sun Jun 12 20:22:20 2011 -0700 CrystalHD: Use mp4toannexb bitstream filter. The H.264 parser that we use to detect interlacing can only handle an Annex B stream, so we need to actually use the filter. This is unfortunate as the crystalhd library is already doing this conversion internally. A future change will reorganise the decode path more completely so that we can feed the converted stream into libcrystalhd and avoid the second conversion. Signed-off-by: Philip Langdale commit 7d2714d1abb432575e667870e0248e2ee77ed9a4 Author: Philip Langdale Date: Sun Jun 12 20:21:28 2011 -0700 CrystalHD: Keep mp4toannexb filter around for entire decoder lifetime. In preparation for using the filter on the actual bitstream, we need to extend it's lifetime to match that of the decoder. Signed-off-by: Philip Langdale commit 11177a4d82da8f4987bf6dc755461be6a4e750c5 Author: Jason Garrett-Glaser Date: Mon Jun 13 10:21:46 2011 -0700 Fix SVQ3 after adding 4:4:4 H.264 support commit 7b442ad918bfbd1597f94b0a8e00c41468402236 Author: Jason Garrett-Glaser Date: Thu Jun 9 16:17:41 2011 -0700 H.264: fix CODEC_FLAG_GRAY It was broken in 4:4:4, and still did chroma deblocking for no reason in 4:2:0. commit c90b94424cd4953a095d6d6648ba8d499e306b35 Author: Jason Garrett-Glaser Date: Fri Jun 3 01:12:28 2011 -0700 4:4:4 H.264 decoding support Note: this is 4:4:4 from the 2007 spec revision, not the previous (now deprecated) 4:4:4 mode in H.264. commit 173cd695cbb79a50a0738ce7bcc966cb40f4a28a Merge: fdb5e02 35bdaf3 Author: Michael Niedermayer Date: Tue Jun 14 04:55:27 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: (24 commits) utils: Drop pointless '#if 1' preprocessor directive. ac3enc: remove empty ac3_float function that is never called ac3enc: split templated float vs. fixed functions into a separate file. ac3enc: dynamically allocate AC3EncodeContext fields windowed_samples and mdct ac3enc: use function pointer to choose between AC-3 and E-AC-3 header output functions. Roll back 4:4:4 H.264 for now Needs some ARM/PPC asm modifications. Fix SVQ3 after adding 4:4:4 H.264 support H.264: fix CODEC_FLAG_GRAY 4:4:4 H.264 decoding support h264_parser: Fix whitespace after previous change. h264_parser: Fix behaviour when PARSER_FLAG_COMPLETE_FRAMES is set. wav: remove an invalid free(). lavf: initialise reference_dts in av_estimate_timings_from_pts. h264: don't be so picky on decoding pps in extradata. avcodec.h: add or elaborate on some documentation comments. h264: change a few comments into error messages ac3dec: fix doxy-style for comment ("///>" should be "///<" instead). img2: add .dpx to the list of supported file extensions. ffv1: fix undefined behavior with insane widths. ARM: jrevdct_arm: simplify stack usage ... Merged-by: Michael Niedermayer commit fdb5e02901111a6a53f8386d82afae0aa2d746a7 Author: Aurelien Jacobs Date: Tue Jun 14 02:00:06 2011 +0200 matroskadec: properly decode color space in an endian neutral way commit 5fec3a2539b7c94a94fe891c3f7d92e6d5291682 Author: Aurelien Jacobs Date: Tue Jun 14 01:58:11 2011 +0200 matroskadec: use a temporary fourcc variable commit f440f742052256a854ce2f81a52fa5cf305a895c Author: Aurelien Jacobs Date: Tue Jun 14 01:53:40 2011 +0200 matroskaenc: ensure the written colorspace don't depend on host endianness commit 99477adc31c0569b3cebe8004dd584aa4726a2d1 Author: Justin Ruggles Date: Mon Jun 13 17:44:50 2011 -0400 ac3enc: fix allocation of floating point samples. sizeof(SampleType) is different for fixed and float encoders. commit 35bdaf3d427b6856df01d41ee826bd515440ec46 Author: Diego Biurrun Date: Fri Jun 10 20:27:50 2011 +0200 utils: Drop pointless '#if 1' preprocessor directive. commit 38c304addd978410956c8ff02ea83a6ffb9a606a Author: Justin Ruggles Date: Fri Jun 10 15:17:55 2011 -0400 ac3enc: remove empty ac3_float function that is never called commit e0cc66df61664bb6f9271d9aae3c778e1f906b4c Author: Justin Ruggles Date: Fri Jun 10 14:57:19 2011 -0400 ac3enc: split templated float vs. fixed functions into a separate file. Function pointers are used for templated functions instead of needlessly duplicating many functions. commit e754dfc0bba4f81fe797f240fca94fea5dfd925e Author: Justin Ruggles Date: Fri Jun 10 12:42:36 2011 -0400 ac3enc: dynamically allocate AC3EncodeContext fields windowed_samples and mdct This will allow the same struct to be used for both the fixed and float ac3 encoders. commit 36151b3e3112cd7d8ae0e02e850dee16bd966696 Author: Justin Ruggles Date: Fri Jun 10 11:45:03 2011 -0400 ac3enc: use function pointer to choose between AC-3 and E-AC-3 header output functions. commit 504811baeacf8bac400962e84fca678b79068ceb Author: Jason Garrett-Glaser Date: Mon Jun 13 13:38:46 2011 -0700 Roll back 4:4:4 H.264 for now Needs some ARM/PPC asm modifications. commit 295f0a2503550088a5ffddc5754b9fba2fa6ee60 Author: Jason Garrett-Glaser Date: Mon Jun 13 10:21:46 2011 -0700 Fix SVQ3 after adding 4:4:4 H.264 support commit c177cfb4fb2430f4d43d27ba3c3476176f17d006 Author: Jason Garrett-Glaser Date: Thu Jun 9 16:17:41 2011 -0700 H.264: fix CODEC_FLAG_GRAY It was broken in 4:4:4, and still did chroma deblocking for no reason in 4:2:0. commit c9c493872c385cff304438ee404e38e55f04af28 Author: Jason Garrett-Glaser Date: Fri Jun 3 01:12:28 2011 -0700 4:4:4 H.264 decoding support Note: this is 4:4:4 from the 2007 spec revision, not the previous (now deprecated) 4:4:4 mode in H.264. commit 25f05ddb1af4bd398fa92cd135e48fafe23bd92a Author: Philip Langdale Date: Mon Mar 28 21:43:23 2011 -0700 h264_parser: Fix whitespace after previous change. Signed-off-by: Philip Langdale Signed-off-by: Anton Khirnov commit a26ce1e2df102ad085cf1a7891722ef64b80ea24 Author: Philip Langdale Date: Mon Mar 28 21:42:02 2011 -0700 h264_parser: Fix behaviour when PARSER_FLAG_COMPLETE_FRAMES is set. Currently, the parser is buggy and only processes the stream extradata when the flag is set. This fixes it to actually inspect the frames. Whitespce will be fixed in a separate change. Signed-off-by: Philip Langdale Signed-off-by: Anton Khirnov commit 8d0786ec6d066f892f29da6593e99e73a7dfd014 Author: Carl Eugen Hoyos Date: Sun Apr 3 22:45:16 2011 +0200 wav: remove an invalid free(). Signed-off-by: Anton Khirnov commit a8fd2f4e0238d6ddde0db28c5bb4b39d2f98d4ed Author: Michael Niedermayer Date: Tue Mar 8 22:39:14 2011 +0100 lavf: initialise reference_dts in av_estimate_timings_from_pts. Fixes issue2437. Signed-off-by: Anton Khirnov commit 108f318d908c552d88bc7570515e4ddb9ea45e3d Author: Michael Niedermayer Date: Tue Mar 1 15:59:00 2011 +0100 h264: don't be so picky on decoding pps in extradata. Fixes issue2517 Signed-off-by: Michael Niedermayer Signed-off-by: Anton Khirnov commit 3de33b00de219a749f3e5c9d1f1f68d7cfa58502 Author: Wim Lewis Date: Sat Apr 2 15:30:24 2011 -0700 avcodec.h: add or elaborate on some documentation comments. Signed-off-by: Michael Niedermayer Signed-off-by: Anton Khirnov commit 33aec3f402c07e417ac1492717ab746927253727 Author: Michael Niedermayer Date: Sat Apr 2 17:57:53 2011 +0200 h264: change a few comments into error messages Signed-off-by: Michael Niedermayer Signed-off-by: Anton Khirnov commit 86961eeabf06ba4ef920789cb7596e8590e82713 Author: Reimar Döffinger Date: Fri Apr 1 19:42:31 2011 +0200 ac3dec: fix doxy-style for comment ("///>" should be "///<" instead). Signed-off-by: Anton Khirnov commit a31d4b3a9929e31eb2df949cab09422267f5a5e3 Author: Peter Ross Date: Fri Apr 1 23:11:24 2011 +1100 img2: add .dpx to the list of supported file extensions. Signed-off-by: Anton Khirnov commit 294e5475c2cf4bb7a0db34931515fddc5732c266 Author: Michael Niedermayer Date: Fri Apr 1 12:46:36 2011 +0200 ffv1: fix undefined behavior with insane widths. The new tables is large enough to prevent this together with our image size checks. Signed-off-by: Michael Niedermayer Signed-off-by: Anton Khirnov commit e6ba3d428105edbd3c1a468ece619f801151eea2 Author: Aurelien Jacobs Date: Mon Jun 13 19:02:50 2011 +0200 replace remaining usage of deprecated av_metadata_set2() by av_dict_set() commit 7ebaa967a2c5b038023409179ca3c56f5b4f4ed3 Author: Aurelien Jacobs Date: Mon Jun 13 18:37:32 2011 +0200 matroskaenc: write colourspace element for rawvideo tracks commit eb8de45c3c55721f0fc02cefcf1d08980b7ab67d Author: Aurelien Jacobs Date: Mon Jun 13 18:30:55 2011 +0200 nsv: simplify probe function commit 223694b404e63211ad7d1bd2916c070a0b587703 Author: Aurelien Jacobs Date: Mon Jun 13 18:28:54 2011 +0200 nsv: return error code instead of discarding it in read_header() commit 9776e25db9a43e77e9b091c012bf16267d9559d7 Author: Mans Rullgard Date: Mon Jun 13 09:33:20 2011 +0100 ARM: jrevdct_arm: simplify stack usage Signed-off-by: Mans Rullgard commit 13743c7ab00be270a3a38c8ee6442336774e335c Author: Mans Rullgard Date: Mon Jun 13 09:30:42 2011 +0100 ARM: jrevdct_arm: use push/pop mnemonics Use push/pop instead of stmdb/ldmia for stack operations. This is the preferred syntax. Signed-off-by: Mans Rullgard commit 77cdfde73e91cdbcc82cdec6b8fec6f646b02782 Author: Mans Rullgard Date: Mon Jun 13 09:24:27 2011 +0100 ARM: jrevdct_arm: misc cleanup - use 'const' macro to define coeff table - add missing endfunc - remove superflous directives Signed-off-by: Mans Rullgard commit 5c46ad1da049f16e670d2549161c244c6ddd68ec Author: Mans Rullgard Date: Sat Jun 11 22:53:32 2011 +0100 ARM: optimised mpadsp_apply_window_fixed Signed-off-by: Mans Rullgard commit b95d19b02022ea9590bee571aa245ab93f37d152 Author: Reinhard Tartler Date: Mon Jun 13 08:56:54 2011 +0200 Add some (important) changelog entries commit 058d03631afcaa4eb8f61c80c920a192b27d1ca2 Merge: 21d5de9 de85935 Author: Michael Niedermayer Date: Mon Jun 13 04:25:36 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: cmdutils: add missing NULL check in parse_options() x11grab: remove a memory allocation and the associated memcpy. Merged-by: Michael Niedermayer commit 21d5de930360bb29482aabd869074b9fd7b74ce3 Author: Michael Niedermayer Date: Mon Jun 13 03:30:56 2011 +0200 H264: Reduce pointless diffs to qatar Signed-off-by: Michael Niedermayer commit f0e9ee8d9491898bec012f1295d83c6efa937c32 Author: Michael Niedermayer Date: Mon Jun 13 03:00:53 2011 +0200 Revert "H264: Split out hl_motion and template it, this seems a bit faster" This reverts commit a50f0bea25a3da605cd547fe3bdfd36c8764b847. This has been implemented differently in qatar and its better they maintain it for me instead of me having to spend an average 5sec more per merge Conflicts: libavcodec/h264.c Signed-off-by: Michael Niedermayer commit 3fe6bbd5dcdf603a8dac78b48adf6f0b6604143c Author: Stefano Sabatini Date: Sat Jun 11 18:21:53 2011 +0200 libavfilter: implement avfilter_fill_frame_from_video_buffer_ref() commit c535494268069282cc1147c4d61d4a88ce39e078 Author: Stefano Sabatini Date: Sat Jun 11 15:30:46 2011 +0200 avfiltergraph: make the AVFilterInOut alloc/free API public This is required for letting applications to create and destroy AVFilterInOut structs in a convenient way. commit 6119b23a3662d1e106cdf69ef3171b2e7e1d495c Author: Stefano Sabatini Date: Sat Jun 11 15:16:02 2011 +0200 avfiltergraph: change the syntax of avfilter_graph_parse() Make it returns the list of open inputs and outputs, so it can be reused by applications. Breaks API/ABI. commit 86909dd5f7cbc3d2446fad58268553ac06f65e37 Author: Stefano Sabatini Date: Sat Jun 11 14:33:09 2011 +0200 graphparser: prefer void * over AVClass * for log contexts commit 33eac92a3c1aa0f3d0b5bbc6893ed5f646ee527c Author: Alexander Strange Date: Thu Jun 2 01:39:56 2011 -0700 h264: Complexify frame num gap shortening code By observation it did not seem to handle prev_frame_num > frame_num. This does not affect any files I have. (cherry picked from commit 43c0092a80f8212cbb783260bafa157f7b85126e) commit 53781bf13e47d15f4d9964001af3894a72c513ee Author: Alexander Strange Date: Thu Jun 2 01:41:38 2011 -0700 Update todo All the known bugs in h264 are fixed so I'm calling it done. (cherry picked from commit 9cec36a6845c17e90a8d0c2cf9b03a00987c31f0) commit 225083ac0a2feead04ddd7485b8693dd9c742379 Author: Michael Niedermayer Date: Sun Jun 12 17:59:23 2011 +0200 mpeg12: replace 2 asserts by av_assert0 Signed-off-by: Michael Niedermayer commit de859358830cfd1daffb1773f6bb069659027321 Author: Stefano Sabatini Date: Sun Jun 12 13:54:22 2011 +0200 cmdutils: add missing NULL check in parse_options() Fix ffplay -i FILE, which was recently broken. Signed-off-by: Anton Khirnov commit 2f2c60400a4e383b6aa7db64d6032a42c2725882 Author: Sven C. Dack Date: Wed Mar 30 17:02:29 2011 +0200 x11grab: remove a memory allocation and the associated memcpy. Signed-off-by: Anton Khirnov commit d127d26997ff046a9f112643eebd1007590b4fa2 Merge: 2291e18 151c584 Author: Michael Niedermayer Date: Sun Jun 12 03:26:38 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: build: fix "make install" with documentation disabled build: simplify some conditional targets Merged-by: Michael Niedermayer commit 2291e18e4891066bbcbcd1a4e468a59a40e9cb5c Author: Michael Niedermayer Date: Sat Jun 11 13:40:46 2011 +0200 Fix --disable-everything Breakage was due to ff_find_pix_fmt() usage. Signed-off-by: Michael Niedermayer commit 151c5841881591552be685b7fd50b488f128ba5b Author: Mans Rullgard Date: Sat Jun 11 19:54:23 2011 +0100 build: fix "make install" with documentation disabled Signed-off-by: Mans Rullgard commit 623ffe8c82c3194e4eff469add76b1478025cd22 Author: Mans Rullgard Date: Tue Jun 7 10:11:21 2011 +0100 build: simplify some conditional targets Use intermediate targets instead of variables for conditional parts of "all" and "install" targets. Signed-off-by: Mans Rullgard commit e8876902a9021ec185ca785653067dd34f24c5ce Author: Clément BÅ“sch Date: Wed Jun 8 11:26:43 2011 +0200 resample: clarify supported resampling. This also fix a crash on 8ch → 2ch requested resampling. commit d468ed032169c8007ed24cb2adfbee3a842eb742 Author: Stefano Sabatini Date: Sat Jun 11 11:41:49 2011 +0200 lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config() Require "void *" rather than "AVClass *" for the log context type. commit f5901fd392889dabe0d2eb9005e62ac667655b2f Author: Stefano Sabatini Date: Sat Jun 11 11:15:40 2011 +0200 avfiltergraph: use meaningful error codes commit 7aa59471813f49f434fbc6460475c0871e80cef6 Author: Michael Niedermayer Date: Sat Jun 11 04:18:00 2011 +0200 Revert "ac3: there was no libav in 2010 thus this code cannot be from libav." This reverts commit 7b8ec38d28cc99c4017471c6981fc1206732b468. The copyright date was wrong. commit 45fb64749584ed07ea88549a3e06ae70e1d736e9 Merge: 39dbe9b 19d824e Author: Michael Niedermayer Date: Sat Jun 11 03:51:36 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: bitstream: Properly promote av_reverse values before shifting. libavutil/swscale: YUV444P10/YUV444P9 support. H.264: Fix high bit depth explicit biweight h264: Fix 10-bit H.264 x86 chroma v loopfilter asm. Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog. Update copyright year for ac3enc_opts_template.c. adts: Adjust frame size mask to follow the specification. movenc: Add RTP muxer/hinter options movenc: Pass the RTP AVFormatContext to the SDP generation rtspenc: Add RTP muxer options rtspenc: Add an AVClass for setting muxer specific options rtpenc_chain: Pass the rtpflags options through to the chained muxer rtpenc: Declare the rtp flags private AVOptions in rtpenc.h sdp: Reindent after the previous commit rtpenc: MP4A-LATM payload support avoptions: Add an av_opt_flag_is_set function for inspecting flag fields sdp: Allow passing an AVFormatContext to the SDP generation mov: Fix wrong timestamp generation for fragmented movies that have time offset caused by the first edit list entry. mpeg12: more advanced ffmpeg mpeg2 aspect guessing code. swscale: split YUYV output out of yuv2packed[12X]_c(). Conflicts: doc/APIchanges libavcodec/Makefile libavcodec/h264dsp_template.c libavcodec/mpeg12.c libavformat/aacdec.c libavformat/avidec.c libavformat/internal.h libavformat/movenc.c libavformat/rtpenc.c libavformat/rtpenc_latm.c libavformat/sdp.c libavformat/version.h libavutil/avutil.h libavutil/pixfmt.h libswscale/swscale.c Merged-by: Michael Niedermayer commit 39dbe9b6b8fdd587793583c8296fecf94b3aee58 Author: Etienne Buira Date: Sat Jun 11 00:04:40 2011 +0200 Fix -t option for formats which holds dts and no pts Signed-off-by: Michael Niedermayer commit 36204ed88e6c5eb54f36df2dea94b20e786b215f Author: Joseph Artsimovich Date: Fri Jun 10 21:38:14 2011 +0200 dnxhd: Renama tables commit d3cef0a85b7d3fd133a3349341646fe15aeb0030 Author: Dave Badia Date: Fri Jun 10 21:18:26 2011 +0200 Extract rotation in MOV metadata commit 19d824e47373594739bb9a05cd4e7edbc441b173 Author: Alex Converse Date: Tue Apr 26 09:08:26 2011 -0700 bitstream: Properly promote av_reverse values before shifting. commit 0fd82fedc9b279cd12f71dd7de954cfb60fa9dea Author: Michael Niedermayer Date: Fri Jun 10 20:25:49 2011 +0200 pixfmt: Replace 9/10bit deprecation by a technical explanation. Signed-off-by: Michael Niedermayer commit 103278f7b0b037a4a6184865ca9b8d021ec9be85 Author: Ronald S. Bultje Date: Wed Jun 8 19:16:39 2011 -0700 libavutil/swscale: YUV444P10/YUV444P9 support. Also add missing glue code for recently added YUV422P10 formats to swscale. Signed-off-by: Ronald S. Bultje commit c149843b5a484e73baffa0e070cfa08fe05943dd Author: Jason Garrett-Glaser Date: Thu Jun 9 18:20:19 2011 -0700 H.264: Fix high bit depth explicit biweight Signed-off-by: Ronald S. Bultje commit 6c031a3338d49dd61cf34fd703631f5a47205912 Author: Oskar Arvidsson Date: Fri Jun 10 02:40:10 2011 +0200 h264: Fix 10-bit H.264 x86 chroma v loopfilter asm. The tc variable was not splatted correctly. Signed-off-by: Ronald S. Bultje commit 919d7a345a7e9044c3cdc89cf06dc521a1b01c6c Author: Diego Biurrun Date: Tue Jun 7 13:18:12 2011 +0200 Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog. commit aecc596a651b981256f91ee619aaf282e455d99e Author: Justin Ruggles Date: Fri Jun 10 12:58:08 2011 -0400 Update copyright year for ac3enc_opts_template.c. The code was originally committed to Libav on March 25, 2011. commit f74e5b76b1033e5224d6a7b5906e05cecd2b3302 Author: Kieran Kunhya Date: Wed Jun 8 01:26:20 2011 -0500 adts: Adjust frame size mask to follow the specification. This fixes ADTS detection for at least one sample. Signed-off-by: Diego Biurrun commit 16c9e6717e8b9524bf9126153e336db2f386514c Author: Stefano Sabatini Date: Fri Jun 10 13:03:22 2011 +0200 APIchanges: fill hash for the avfilter_get_audio_buffer_ref_from_arrays addition commit 79a0ec1af4817bb7b989803b9f460d1e4acaf7b7 Author: Mina Nagy Zaki Date: Wed Jun 8 19:24:25 2011 +0300 lavfi: avfilter_merge_formats: handle case where inputs are same This fixes a double-free crash if lists are the same due to the two merge_ref() calls at the end of the (useless) merging that happens. commit 989184fea4854720caef35347992499ba8033195 Author: Stefano Sabatini Date: Sat Feb 12 17:56:50 2011 +0100 lavfi: use avfilter_get_audio_buffer_ref_from_arrays() in defaults.c Use avfilter_get_audio_buffer_ref_from_arrays() in avfilter_default_get_audio_buffer(), simplify. commit c3819600e2975cb5dc8ca07e0ea41f8204324e4a Author: Stefano Sabatini Date: Mon Jan 31 00:07:41 2011 +0100 lavfi: implement avfilter_get_audio_buffer_ref_from_arrays() commit c6d7fc276ac07d53027d9dbd8bb4d0a33820a6aa Author: Stefano Sabatini Date: Fri Jun 10 12:32:25 2011 +0200 APIchanges: remove duplicated entry commit 2caaa791a0d6e4a10bd4e9bbd5b88985f6a81454 Author: Stefano Sabatini Date: Fri Jun 10 11:15:42 2011 +0200 APIchanges: fill in dates and numbers Since some minor bump were not done, some entries present the same libavutil minor (which represent the next bump after the corresponding change). commit a5825b22a2dc6652c17bf33ebfab2719eed2e569 Author: Stefano Sabatini Date: Fri Jun 10 11:50:55 2011 +0200 APIchanges: remove duplicated entry Remove duplicated entry regarding PIX_FMT_BGR48LE/BE formats. commit e0ce9711aa01be2a1334756c648e569c72fb789f Author: Stefano Sabatini Date: Fri Jun 10 11:08:55 2011 +0200 APIchanges: correctly interleave entries commit bd77a5e27c6701d68f671e702f4b4d57191f7b3c Author: Stefano Sabatini Date: Fri Jun 10 11:06:55 2011 +0200 APIchanges: add entry for av_force_cpu_flags() addition commit ace0a5e236364f5dd6f16195509da899bdd35d8f Author: Stefano Sabatini Date: Fri Jun 10 11:54:54 2011 +0200 lavf: bump minor after the addition of fps_probe_size to AVFormatContext commit 62519c6139bd3d3e7f8004ad4e7d2d67e63b1c87 Author: Stefano Sabatini Date: Fri Jun 10 11:24:04 2011 +0200 lavc: bump minor after the addition of AVCodecContext.request_sample_fmt commit d16cccac98a250d53827fa0c82e429bf17070d0f Author: Martin Storsjö Date: Sat May 21 14:58:43 2011 +0300 movenc: Add RTP muxer/hinter options Signed-off-by: Martin Storsjö commit f3f82296a407d3c4eada161aaec45b21a5334fc3 Author: Martin Storsjö Date: Wed May 18 15:41:38 2011 +0300 movenc: Pass the RTP AVFormatContext to the SDP generation Signed-off-by: Martin Storsjö commit e2e29c62476f7d8f8851d0d51809ce2a152362f5 Author: Martin Storsjö Date: Sat May 21 15:03:48 2011 +0300 rtspenc: Add RTP muxer options Signed-off-by: Martin Storsjö commit 6cf09bb7ef5a52b9d9b589067d94a5c80f9fe848 Author: Martin Storsjö Date: Sat May 21 15:03:35 2011 +0300 rtspenc: Add an AVClass for setting muxer specific options Signed-off-by: Martin Storsjö commit ff0824f72c25787b6ad60b5c90a25473995e68c6 Author: Martin Storsjö Date: Wed May 18 15:42:53 2011 +0300 rtpenc_chain: Pass the rtpflags options through to the chained muxer Signed-off-by: Martin Storsjö commit 635fac9af10092b0d5780a7d1b422b3044f9abd9 Author: Martin Storsjö Date: Fri May 27 22:38:36 2011 +0300 rtpenc: Declare the rtp flags private AVOptions in rtpenc.h This allows other muxers that chain a RTP muxer to declare the same options easily. Signed-off-by: Martin Storsjö commit 9c434ce8263097bd17e6a59461041f846edc2701 Author: Martin Storsjö Date: Wed May 18 15:48:20 2011 +0300 sdp: Reindent after the previous commit Signed-off-by: Martin Storsjö commit 0832122880fa50e66dfd62eb6aa5c814f83f68d9 Author: Juan Carlos Rodriguez Date: Wed May 18 15:00:03 2011 +0300 rtpenc: MP4A-LATM payload support This is enabled with an AVOption on the RTP muxer. The SDP generator looks for a latm flag in the rtpflags field. Signed-off-by: Martin Storsjö commit cb7c11cc9e7e05c819fff487a3f486f11ab4b860 Author: Martin Storsjö Date: Fri May 27 22:21:40 2011 +0300 avoptions: Add an av_opt_flag_is_set function for inspecting flag fields Signed-off-by: Martin Storsjö commit 0558e266a267b5d90d3be1d8d86e60db2c303773 Author: Martin Storsjö Date: Wed May 18 15:41:06 2011 +0300 sdp: Allow passing an AVFormatContext to the SDP generation Options from the AVFormatContext can be read for modifying the generated SDP. Signed-off-by: Martin Storsjö commit f33a6a22b4f2382a5113194335ae2a22ae957fed Author: Yusuke Nakamura Date: Fri May 13 23:46:48 2011 +0900 mov: Fix wrong timestamp generation for fragmented movies that have time offset caused by the first edit list entry. Signed-off-by: Anton Khirnov commit d8999306e516663de2b46aed0c79f7bcc77eb5a1 Author: Michael Niedermayer Date: Fri Mar 25 01:13:08 2011 +0100 mpeg12: more advanced ffmpeg mpeg2 aspect guessing code. Fixes issue1613, 621, 562 simultaneously Signed-off-by: Michael Niedermayer Signed-off-by: Anton Khirnov commit 7b8ec38d28cc99c4017471c6981fc1206732b468 Author: Michael Niedermayer Date: Fri Jun 10 04:54:30 2011 +0200 ac3: there was no libav in 2010 thus this code cannot be from libav. Signed-off-by: Michael Niedermayer commit 2ec77aae6791582b2f8e2502b48fd6d562aa81ce Merge: 6a137dd 996bbdb Author: Michael Niedermayer Date: Fri Jun 10 03:54:27 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: lavf: make compute_pkt_fields2() return meaningful error values matroskadec: set timestamps for RealAudio packets. intelh263dec: aspect ratio processing fix. intelh263dec: fix "Strict H.263 compliance" file playback oss,sndio: simplify by using FFMIN. swscale: extract monowhite/black output from yuv2packed[12X]_c(). swscale: de-macro'ify RGB15/16/32 input functions. swscale: rearrange code. movdec: Add support for the 'wfex' atom. ffmpeg.c: Add a necessary const qualifier riff: Fix potential memleak. swscale: change 48bit RGB input macros to inline functions. swscale: change 9/10bit YUV input macros to inline functions. swscale: extract gray16 output functions from yuv2packed[12X](). swscale: use standard clipping functions. swscale: merge macros that are used only once. swscale: fix function declarations in swscale.c. swscale: fix function declaration keywords in x86/swscale_template.c. Conflicts: ffmpeg.c libavcodec/intelh263dec.c libswscale/swscale.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer commit af2faf2076b96ab85cc51d5e970574079373c396 Author: Ronald S. Bultje Date: Thu Jun 9 18:13:53 2011 -0400 swscale: split YUYV output out of yuv2packed[12X]_c(). This is part of the Great Evil Plan to simplify swscale. commit 6a137dde3ed6d88dc8bfa9de6f29a23e2b384a77 Author: Michael Niedermayer Date: Fri Jun 10 00:19:25 2011 +0200 dict: This code was developed in ffmpeg and not libav, nor by libav developers. Correct copyright notices. Signed-off-by: Michael Niedermayer commit 996bbdbf1f5a031d38e8af3eac432bf8e2c72458 Author: Stefano Sabatini Date: Tue Mar 15 12:34:55 2011 +0100 lavf: make compute_pkt_fields2() return meaningful error values Signed-off-by: Anton Khirnov commit 4654420410da643812b7b90fb39dd42e3a02bc53 Author: Reimar Döffinger Date: Sat Feb 26 12:52:01 2011 +0100 matroskadec: set timestamps for RealAudio packets. Improves seeking in ffplay with http://samples.mplayerhq.hu/Matroska/RA_missing_timestamps.mkv Signed-off-by: Anton Khirnov commit 8e84c072e4e8db33641696555ed73de61ce61442 Author: Anton Khirnov Date: Thu Jun 9 22:36:31 2011 +0200 intelh263dec: aspect ratio processing fix. patch submitted by xvid_fan freenet de commit 95a05030ca73076a8e5127e69596ade5964af60b Author: Anton Khirnov Date: Thu Jun 9 22:29:40 2011 +0200 intelh263dec: fix "Strict H.263 compliance" file playback fixes issue2449 patch submitted by xvid_fan freenet de commit c673c90515ab553c9ed9f4e1997600d1b3e4e2bb Author: Reimar Döffinger Date: Tue Mar 29 20:18:45 2011 +0200 oss,sndio: simplify by using FFMIN. Signed-off-by: Anton Khirnov commit 6b105e3ee607b4d83f894ee0c18bbd1d6f1e996f Author: Ronald S. Bultje Date: Thu Jun 9 16:25:21 2011 -0400 swscale: extract monowhite/black output from yuv2packed[12X]_c(). This is part of the Great Evil Plan to simplify swscale. commit 6d4d483eee04d78ba021e84aec2ff75d9fc3a236 Author: Ronald S. Bultje Date: Thu Jun 9 13:59:21 2011 -0400 swscale: de-macro'ify RGB15/16/32 input functions. Inline functions are easier to read, maintain, modify and test, which justifies the slightly increased source size. This patch also adds support for non-native endianness RGB15/16 and fixes isSupportedOutput() to no longer claim that we support writing non-native RGB565/555/444. commit e2babb9b47072ca586b4414680b8d7abf85a16e5 Author: Ronald S. Bultje Date: Thu Jun 9 10:00:09 2011 -0400 swscale: rearrange code. This way the code in the file is less cluttered all-over-the- place. commit 85e9e3a9fa9c79bb3b4af74d15c7aa62f29515ce Author: Alex Converse Date: Mon Jun 6 10:59:46 2011 -0700 movdec: Add support for the 'wfex' atom. The 'wfex' is just a Microsoft WaveFormatEx struct. commit 9a1b79128c25a5c1004bbd0af85a68c9a2a3e580 Author: Alex Converse Date: Thu Jun 9 09:52:47 2011 -0700 ffmpeg.c: Add a necessary const qualifier commit ed8a50068caacf722b6c7a81f77abcadc134e544 Author: Alex Converse Date: Thu Jun 9 09:50:38 2011 -0700 riff: Fix potential memleak. Make ff_get_wav_header() free existing extradata before allocing a new buffer. commit dbd3183935e252aaf5796638d4711cff27c75934 Author: Ronald S. Bultje Date: Wed Jun 8 15:12:32 2011 -0400 swscale: change 48bit RGB input macros to inline functions. Inline functions are slightly larger in source code, but are easier to handle in source code editors. The binary code generated is the same. commit f30ee65700cc2def6447de09c91afa3f7ecc7639 Author: Ronald S. Bultje Date: Wed Jun 8 14:50:49 2011 -0400 swscale: change 9/10bit YUV input macros to inline functions. Inline functions are slightly larger in source code, but are easier to handle in source code editors. The binary code generated is the same. commit aa39f5f6d61c8c2640dd39520419264ffa1850de Author: Ronald S. Bultje Date: Wed Jun 8 13:29:09 2011 -0400 swscale: extract gray16 output functions from yuv2packed[12X](). This is part of the Great Evil Plan to simplify swscale. commit f1e0b90c640235916d5b2f98a3b2d5a9975b740f Author: Ronald S. Bultje Date: Tue Jun 7 11:22:54 2011 -0400 swscale: use standard clipping functions. This generates better code on some non-x86 architectures. commit e458b536052a35fe3b0f221ca3ccb308faa84f35 Author: Ronald S. Bultje Date: Tue Jun 7 11:06:44 2011 -0400 swscale: merge macros that are used only once. This reduces source code size without affecting the binary. commit 6e5a8d3c9affbb242e39cea29bd44003361504d4 Author: Ronald S. Bultje Date: Wed Jun 8 12:31:11 2011 -0400 swscale: fix function declarations in swscale.c. Remove inline keyword from functions that are never inlined. Use av_always_inline for functions that should be force-inlined for performance reasons. Use av_cold for init functions. commit a27db4c349574d44c581fa484f03fb1ee816aaf9 Author: Ronald S. Bultje Date: Wed Jun 8 12:12:50 2011 -0400 swscale: fix function declaration keywords in x86/swscale_template.c. Remove inline keyword for functions that are only called through their function pointers (and thus cannot be inlined); add av_cold keyword to init function, and use av_always_inline instead of inline for functions that must be inlined for performance reasons. commit f9ecb849ef39bc337d9439b829fe08da5c95cc3d Merge: 7b8ed83 a71bcd1 Author: Michael Niedermayer Date: Thu Jun 9 04:47:19 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: crypto: Use av_freep instead of av_free lavf: don't try to free private options if priv_data is NULL. swscale: fix types of assembly arguments. swscale: move two macros that are only used once into caller. swscale: remove unused function. options: Add missing braces around struct initializer. mov: Remove leftover crufty debug statement with references to a local file. dvbsubdec: Fix compilation of debug code. Remove all uses of now deprecated metadata functions. Move metadata API from lavf to lavu. Conflicts: doc/APIchanges libavformat/aiffdec.c libavformat/asfdec.c libavformat/avformat.h libavformat/avidec.c libavformat/cafdec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/wtv.c libavutil/avutil.h libavutil/internal.h libswscale/swscale.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer commit 7b8ed831eb8432d202dad16dedc1758b018bb1fa Author: Michael Niedermayer Date: Thu Jun 9 03:35:50 2011 +0200 jpegdec: actually search for and parse RSTn Fixes Ticket267 Signed-off-by: Michael Niedermayer commit c8d0d8bc767309d5e8d9ee64addc11117190338e Author: Etienne Buira Date: Wed Jun 8 02:20:53 2011 +0200 crypto: Use av_freep instead of av_free This fixes a potential double free. Signed-off-by: Martin Storsjö commit c1ad93c08ce0b6ea2f4505267fe3aa7584701dca Author: Michael Niedermayer Date: Thu Jun 9 01:39:49 2011 +0200 Revert "crypto: fix potential double free" This reverts commit 7d89f7cbf3ccd98f9a5f58db97effa9afd2d571a. Revert at authors request, and its buggy missing & commit 1fe3bf3e4b4f4a456204cc9512d0f7088231d109 Author: Michael Niedermayer Date: Wed Jun 8 16:14:40 2011 +0200 Revert "build: remove empty $(OBJS) target" This reverts commit b9c6c7cb25932b594fd684a0cb553e439d49fe12. It appears this caused the .o files to be deletec under some circumstances. commit a71bcd1a7f66e210971c44452dc4cdae7bdbd98a Author: Etienne Buira Date: Wed Jun 8 02:20:53 2011 +0200 crypto: Use av_freep instead of av_free This fixes a potential double free. Signed-off-by: Martin Storsjö commit be20528ced76a43aafed032742b3ddd1897bf55e Author: Baptiste Coudurier Date: Tue Jun 7 11:09:58 2011 -0700 aac: fix adts frame size mask, fix demuxer probing for some files. commit dbaba52ed25f79c8be0ce1a478b229bf868f8c11 Author: Anton Khirnov Date: Mon Jun 6 13:14:05 2011 +0200 lavf: don't try to free private options if priv_data is NULL. This might happen if there was an error before priv_data was allocated and result in segfault. commit 47d2ca3205b53665328fe301879c339449db7a1d Author: Mina Nagy Zaki Date: Tue Jun 7 17:42:32 2011 +0300 lavfi: handle NULL lists in avfilter_make_format_list commit 9bcbb250e23959075765edd3cb4c1fcb46736d7d Author: Ronald S. Bultje Date: Wed Jun 8 11:39:26 2011 -0400 swscale: fix types of assembly arguments. This prevents the following compiler warnings: "warning: initialization from incompatible pointer type". Since the variables are only ever used in inline assembly, their type is actually irrelevant (so the part where it was wrong did not invoke any buggy behaviour). commit 496d95c34cbc185c04c37be3cbcef941da53989a Author: Ronald S. Bultje Date: Wed Jun 8 11:33:46 2011 -0400 swscale: move two macros that are only used once into caller. This way, they look like regular code, which is easier to understand. commit 9d84dfce93a8dac7a3b82adab9099312f638b58b Author: Ronald S. Bultje Date: Wed Jun 8 11:03:11 2011 -0400 swscale: remove unused function. Use of this wrapper was removed in a previous patch, but I forgot to actually remove the function itself. commit 9e4cb03a93593f8ddb8b4ea3c7ee3bf8acb7ea21 Author: Carl Eugen Hoyos Date: Wed Jun 8 16:38:37 2011 +0200 Fix "mixed declarations and code" warnings. commit 5bd6ec6d59737db63b12312f20ac0f3f0b89502e Author: Diego Biurrun Date: Wed Jun 8 14:59:47 2011 +0200 options: Add missing braces around struct initializer. This fixes the warning: libavformat/options.c:62:1: warning: missing braces around initializer [-Wmissing-braces] commit b7847a3f2eb56591590ab065b65c335892af6e4c Author: Diego Biurrun Date: Sun Jun 5 16:10:17 2011 +0200 mov: Remove leftover crufty debug statement with references to a local file. commit a4855adc802622d0487c891743f8259c62958338 Author: Diego Biurrun Date: Mon Jun 6 14:10:22 2011 +0200 dvbsubdec: Fix compilation of debug code. commit d2d67e424fa10d883e13709095c80bd3b502ce03 Author: Anton Khirnov Date: Sun May 22 12:46:29 2011 +0200 Remove all uses of now deprecated metadata functions. commit d9f80ea2a7325f9c84307568843512811a99baff Author: Anton Khirnov Date: Sun May 22 12:45:00 2011 +0200 Move metadata API from lavf to lavu. Rename it to AVDictionary, since it will be used as such. Tags documentation and metadata conversion API is lavf-specific, so remains there. commit d552f616a26623e5b593e4d3474c61563f3939fd Merge: 7d89f7c ac4a854 Author: Michael Niedermayer Date: Wed Jun 8 03:56:36 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: (28 commits) Remove some non-compiling debug messages. ffplay: Fix non-compiling debug printf and replace it by av_dlog. H264: x86 predict init cosmetics. ac3enc: Fix linking of AC-3 encoder without the E-AC-3 encoder. Move E-AC-3 encoder functions to a separate eac3enc.c file. ac3enc: remove convenience macro, #define DEBUG ac3enc: remove unused #define vc1: re-initialize tables after width/height change. APIchanges: fill-in git commit hash for av_get_bytes_per_sample() addition samplefmt: add av_get_bytes_per_sample() iirfilter: fix biquad filter coefficients. swscale: remove duplicate conversion routine in swScale(). swscale: add yuv2planar/packed function typedefs. swscale: integrate yuv2nv12X_C into yuv2yuvX() function pointers. swscale: reindent x86 init code. swscale: extract SWS_FULL_CHR_H_INT conditional into init code. swscale: cosmetics. swscale: remove alp/chr/lumSrcOffset. swscale: un-special-case yuv2yuvX16_c(). shorten: Remove stray DEBUG #define and corresponding av_dlog statement. ... Conflicts: doc/APIchanges libavcodec/ac3enc.c libavutil/avutil.h libavutil/samplefmt.c libswscale/swscale.c libswscale/swscale_internal.h libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer commit 7d89f7cbf3ccd98f9a5f58db97effa9afd2d571a Author: Etienne Buira Date: Wed Jun 8 02:20:53 2011 +0200 crypto: fix potential double free commit 1e9b3026908e556d1a2b6afb76d48df9272f8f95 Author: Etienne Buira Date: Tue Jun 7 22:14:18 2011 +0200 libx264: fix double free commit 8f2a2e605165efcbb16c3470d48e61e4a53a0f94 Author: Stefano Sabatini Date: Wed Jun 8 01:28:11 2011 +0200 ffplay: remove -debug option The options -loglevel LEVEL -debug FLAGS can be used for achieving the same objectives, with a finer level of control. commit e77a3095bd7078cca9ee3a868fd0c4ed5bd72578 Author: Stefano Sabatini Date: Wed Jun 8 01:24:42 2011 +0200 ffplay: remove -vismv option Use -vismv 1 instead. Simplify. commit 21bf6d7aab8dd4d0cdda19e33fa4c756fcec467d Author: Stefano Sabatini Date: Sun May 8 20:46:41 2011 +0200 mpegvideo: use av_get_picture_type_char() in ff_print_debug_info() commit ac4a8548110bc180cb67bea6eaf8b8e1081370cf Author: Diego Biurrun Date: Sun Jun 5 15:53:34 2011 +0200 Remove some non-compiling debug messages. commit 8543f0f923eb1d476b14444e1cc8034f08ebcdda Author: Diego Biurrun Date: Wed Jun 8 00:41:12 2011 +0200 ffplay: Fix non-compiling debug printf and replace it by av_dlog. commit 4de83b7b6d3ba321877f69621ef0de497384060c Author: Daniel Kang Date: Tue Jun 7 10:31:51 2011 -0400 H264: x86 predict init cosmetics. Change indentation and whitespace; also move HAVE_YASM blocks. Signed-off-by: Diego Biurrun commit d3778972d854b72685b10e0b4afedcc1af6f5433 Author: Diego Biurrun Date: Wed Jun 8 00:06:19 2011 +0200 ac3enc: Fix linking of AC-3 encoder without the E-AC-3 encoder. The AC-3 encoder unconditionally references some symbols from the E-AC-3 encoder; make those references conditional to fix linking. commit c8e9ea43d004be04e4a9a07736104d099a5bf1f9 Author: Justin Ruggles Date: Tue Jun 7 12:47:09 2011 -0400 Move E-AC-3 encoder functions to a separate eac3enc.c file. commit 787a13535a451b802a23abf211a34840c27bbc23 Author: Justin Ruggles Date: Tue Jun 7 11:50:38 2011 -0400 ac3enc: remove convenience macro, #define DEBUG commit a8bd53402a6d361b3da7c2c206c999b12ea1e5c6 Author: Justin Ruggles Date: Tue Jun 7 10:53:44 2011 -0400 ac3enc: remove unused #define commit 7b20d35a543c6635c348f3b312b5fa24137c0f95 Author: John Stebbins Date: Tue Jun 7 19:53:31 2011 +0200 vc1: re-initialize tables after width/height change. read_sequence_header can change width/height; therefore, re-initialize all tables if width/height changed Signed-off-by: Anton Khirnov commit 1397ac0aa0ac98333b9e88d258b625eec99c011f Author: Justin Ruggles Date: Tue Jun 7 13:04:06 2011 -0400 APIchanges: fill-in git commit hash for av_get_bytes_per_sample() addition commit a6703faa157294efb75619f55c06d7ed5a0aa2bf Author: Stefano Sabatini Date: Mon Jun 6 01:14:50 2011 +0200 samplefmt: add av_get_bytes_per_sample() Deprecate av_get_bits_per_sample_fmt(), which was a misnamed function. For the moment we don't have sample formats with a non-integer number of bytes, in that case we may need to create a new av_get_bits_per_sample() function. In the meanwhile we prefer to adopt this variant, since avoids divisions by 8 all over the place. commit 1929807bef88c3ec3e18434fe82cf04d8f51c7a1 Author: Michael Niedermayer Date: Tue Jun 7 18:22:53 2011 +0200 libvpxenc: add forgotten AVClass. Fixes Ticket269 Signed-off-by: Michael Niedermayer commit 2f37321abcbf9be5f58647b17155c0e257949c0d Author: Justin Ruggles Date: Mon Jun 6 17:10:11 2011 -0400 iirfilter: fix biquad filter coefficients. The current filter implementation should only have the cx coefficients divided by gain in order to give the correct output scale. commit edeb56fa31071841125f723b741858a4187ee748 Author: Ronald S. Bultje Date: Sun Jun 5 22:54:30 2011 -0400 swscale: remove duplicate conversion routine in swScale(). commit b73fe700253f1e93c3ca10f72fc8159d7e12aaa1 Author: Ronald S. Bultje Date: Sun Jun 5 22:31:11 2011 -0400 swscale: add yuv2planar/packed function typedefs. commit df91d091747395384a7c585cee568f9949e6c9f2 Author: Ronald S. Bultje Date: Sun Jun 5 22:27:45 2011 -0400 swscale: integrate yuv2nv12X_C into yuv2yuvX() function pointers. commit 0fb5193156053b820579df9ab4596b950eb05d4d Author: Ronald S. Bultje Date: Sun Jun 5 21:48:51 2011 -0400 swscale: reindent x86 init code. commit ca364a5b43044bc98a7aef001fb1543b7b13411d Author: Ronald S. Bultje Date: Sun Jun 5 21:46:16 2011 -0400 swscale: extract SWS_FULL_CHR_H_INT conditional into init code. commit b3b28b080f588a63d9bcf2714daa7119ece2da61 Author: Ronald S. Bultje Date: Sun Jun 5 21:40:04 2011 -0400 swscale: cosmetics. commit ea281753120f55fc3a3102ac54ba291d0ffcd43d Author: Ronald S. Bultje Date: Sun Jun 5 21:37:59 2011 -0400 swscale: remove alp/chr/lumSrcOffset. They are hacks added to reuse the same scaling function for different formats and they may cause problems when SIMD implementation of the same functions are used along with pure C functions. commit bda9b20fa49975c6b9c39308818e7773eb78b411 Author: Ronald S. Bultje Date: Sun Jun 5 21:15:44 2011 -0400 swscale: un-special-case yuv2yuvX16_c(). Make yuv2yuvX16_c a function pointer for yuv2yuvX(), so that the function pointer becomes bitdepth-independent. commit b9478cfefb408ae1d476555b46893005e2d3bf4c Author: Diego Biurrun Date: Tue Jun 7 10:52:30 2011 +0200 shorten: Remove stray DEBUG #define and corresponding av_dlog statement. commit 2d9570a304054c009b7f3fee60fff1299f25c7f5 Author: Diego Biurrun Date: Tue Jun 7 14:02:38 2011 +0200 vorbisdec: Restore mistakenly removed debug output. commit 3251af90379e69faf7b13e2d0236056c37bb0922 Author: Stefano Sabatini Date: Tue Jun 7 13:36:06 2011 +0200 v4l2: set default standard to NULL It was errouneously changed to "NTSC" by the recent merge commit. commit 7a8228c05e23d85b11a3853bf25a7ddbc662e2e3 Author: Michael Niedermayer Date: Tue Jun 7 13:22:36 2011 +0200 sws: make dither_scale const Signed-off-by: Michael Niedermayer commit e8f6bd4b88405526dea26daaf86e94509e7144df Author: Diego Biurrun Date: Mon Jun 6 13:32:37 2011 +0200 configure: Document --enable-vdpau. The option is disabled by default, so enabling it should be documented. commit 02a8d43adf7063bda2d20039d3e9b19d8469fe69 Author: Diego Biurrun Date: Mon Jun 6 01:25:32 2011 +0200 Replace some av_log/printf + #ifdef combinations by av_dlog. commit 1f6b9cc31d086860c7a7887685bed321fe3843f4 Author: Diego Biurrun Date: Mon Jun 6 00:53:31 2011 +0200 Replace some nonstandard DEBUG_* preprocessor directives by plain DEBUG. commit f8ea0eb6ff5719a3ff2a60454dd0a2b07aa6dbe2 Author: Diego Biurrun Date: Mon Jun 6 00:52:28 2011 +0200 svq1dec: Fix debug statements that referenced non-existing context. commit d7cf5639e727b454896e7d7d8da2abcd4b631eac Author: Diego Biurrun Date: Mon Jun 6 00:39:39 2011 +0200 Replace some printf instances in debug code by av_log. commit 4ae28eb85351528e37ded59336e3f763497813b7 Author: Stefano Sabatini Date: Tue Jun 7 02:18:19 2011 +0200 showfiltfmts: use av_get_pix_fmt_name() Use av_get_pix_fmt_name() rather than access av_pix_fmt_descriptors. Improve readability. commit e01bb264e78385367b716a55df713ae1a6750310 Author: Diego Biurrun Date: Sun Jun 5 15:27:51 2011 +0200 inverse.c: Replace unnecessary intmath.h header by necessary stdint.h. commit dc25d79f4980fb547908f4dd43732ebc0622610c Author: Diego Biurrun Date: Sun Jun 5 01:28:22 2011 +0200 Drop unnecessary directory prefixes from #include directives. commit 40da61eff5acaaaec7d1247f7be4bb10fca30c1c Author: Michael Niedermayer Date: Tue Jun 7 04:43:03 2011 +0200 Makefile: critical build fix after the merge. make fate passed locally due to ffmpeg/ffmpeg_g being there from before Signed-off-by: Michael Niedermayer commit 174df6affc4e2cfdc6c91c1be3c3e1a8a794cf78 Merge: 3a1aaf7 b9c6c7c Author: Michael Niedermayer Date: Tue Jun 7 03:37:57 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: build: remove empty $(OBJS) target build: make rule for linking ff* apply only to these targets build: rearrange some lines in a more logical way s302m: fix resampling for 16 and 24bits. ARM: remove MUL64 and MAC64 inline asm build: clean up .PHONY lists build: move all (un)install* target aliases to toplevel Makefile flvenc: propagate error properly build: remove stale dependency build: do not add CFLAGS-yes to CFLAGS utils.c: fix crash with threading enabled. configure: simplify source_path setup configure: remove --source-path option lavf: deprecate AVFormatParameters.time_base. img2: add framerate private option. img2: add video_size private option. img2: add pixel_format private option. tty: add framerate private option. Conflicts: Makefile configure Merged-by: Michael Niedermayer commit 3a1aaf7b21c7bde9f4c3d5342baa64d3e940d05f Author: Michael Niedermayer Date: Tue Jun 7 03:14:28 2011 +0200 ffplay: Fix -vismv Fixes Ticket164 Signed-off-by: Michael Niedermayer commit a39bd458a0df295df59242a8e18e1e5313bd3318 Author: Michael Niedermayer Date: Mon Jun 6 22:59:23 2011 +0200 mem: Trying to workaround posix_memalign() bug on OSX This patch is based on a patch by John Stebbins Signed-off-by: Michael Niedermayer commit b9c6c7cb25932b594fd684a0cb553e439d49fe12 Author: Mans Rullgard Date: Mon Jun 6 21:46:18 2011 +0100 build: remove empty $(OBJS) target This target was added to prevent some files being deleted by make when using chains of implicit rules. This is no longer required. Signed-off-by: Mans Rullgard commit 6d170962bd611d6336362d5da067d5a757d627f7 Author: Mans Rullgard Date: Mon Jun 6 23:00:26 2011 +0100 build: make rule for linking ff* apply only to these targets This ensures that the special link command using cmdutils.o only applies to the targets it should. Signed-off-by: Mans Rullgard commit d58ed64a8953d07f33259317a2ea5856d0c91dfd Author: Stefano Sabatini Date: Mon Jun 6 15:00:25 2011 +0200 eval: add support for pow() function It is a more search-friendly alternative to the ^ operator. commit d93d7349ceb963150100d3c1b8649d234e396616 Author: Mans Rullgard Date: Mon Jun 6 19:57:10 2011 +0100 build: rearrange some lines in a more logical way Signed-off-by: Mans Rullgard commit 4f8da7e7dc9244342da6c97ca489a8e6f712f3b4 Author: Baptiste Coudurier Date: Sat Jun 4 14:36:30 2011 +0200 s302m: fix resampling for 16 and 24bits. commit 21c65125424ef3dd7e276dea14f8e8ef3292e388 Author: Mans Rullgard Date: Sun Jun 5 13:44:28 2011 +0100 ARM: remove MUL64 and MAC64 inline asm Current GCC versions know how to generate these instructions properly and avoiding inline asm gives better code. The MULH function for ARMv5 uses the same instruction and is also not needed any more. The MLS64 macro remains since negating an input would normally not be allowed as it would fail for INT_MIN. In our uses, the inputs never have this value and thus negating is safe. Signed-off-by: Mans Rullgard commit 0018b7f04378a0ff83c6c6d097fc6bdc97212970 Author: Mans Rullgard Date: Sun Jun 5 21:57:03 2011 +0100 build: clean up .PHONY lists This removes nonexisting targets from phony lists and puts them all in one place. Signed-off-by: Mans Rullgard commit d7a72d250b0deeaed68798f23476be30b28af064 Author: Mans Rullgard Date: Sun Jun 5 21:52:32 2011 +0100 build: move all (un)install* target aliases to toplevel Makefile Signed-off-by: Mans Rullgard commit 0e28e9ca8f0025c34c3c6df8bf699a9a2db43abe Author: Luca Barbato Date: Mon Jun 6 09:13:05 2011 -0500 flvenc: propagate error properly avio_flush can fail, in particular when used with the rtmp/librtmp protocol. commit 171ae1eb0da284dec03c996ac68920823a71644d Author: Mans Rullgard Date: Mon Jun 6 13:21:05 2011 +0100 build: remove stale dependency This dependency is implicitly covered elsewhere. Signed-off-by: Mans Rullgard commit 5eaba041a07a667eabd9a0784ead94e8d83c51fc Author: Mans Rullgard Date: Sun Jun 5 22:16:16 2011 +0100 build: do not add CFLAGS-yes to CFLAGS CFLAGS-yes is never set so this serves no purpose. Signed-off-by: Mans Rullgard commit ceff045dbecb63bbe42da6d7d33f614ae67fbebd Author: Ronald S. Bultje Date: Mon Jun 6 09:27:54 2011 -0400 utils.c: fix crash with threading enabled. commit 8477f2deefbebe7dab9dce4c9ed5f3bc8030206d Author: Mans Rullgard Date: Mon Jun 6 12:56:26 2011 +0100 configure: simplify source_path setup Signed-off-by: Mans Rullgard commit dc435c4e9dfb10c81f177970a14e64a7b232ba54 Author: Mans Rullgard Date: Mon Jun 6 12:37:06 2011 +0100 configure: remove --source-path option This option does not work, and the implied functionality is at best pointless. Signed-off-by: Mans Rullgard commit 263f57c6d76b27e1895c4001f815824a463b1592 Author: Stefano Sabatini Date: Mon Jun 6 11:34:45 2011 +0200 pixdesc: remove duplicated header inclusion commit ef28c7b3a4f4513f7ea7c2f118eb806490d79546 Author: Stefano Sabatini Date: Sat Jan 15 18:48:37 2011 +0100 lavfi: use av_samples_alloc() in avfilter_default_get_audio_buffer() commit 95a0242642e8ee345f6545ea7f9b042989272729 Author: Stefano Sabatini Date: Tue Feb 1 12:34:23 2011 +0100 lavfi: prefer nb_samples over size in AVFilterBufferRefAudioProps Remove AVFilterBufferRefAudioProps.size, and use nb_samples in avfilter_get_audio_buffer() and avfilter_default_get_audio_buffer() in place of size. This is required as the size in the audio buffer may be aligned, so it may not contain a well defined number of samples. commit 0bc2cca12f671010eac171bc22049320a7cd61a3 Author: Stefano Sabatini Date: Thu Jun 2 11:14:24 2011 +0200 samplefmt: switch nb_channels/nb_samples params order in av_samples_alloc() This is consistent with the order of parameters in av_samples_fill_arrays(). commit e1c74148128ebed7c7bc9d36c776f24898267174 Author: Stefano Sabatini Date: Tue Mar 22 13:29:28 2011 +0100 samplefmt: change layout for arrays created by av_samples_alloc() and _fill_arrays() The new layout is consistent with that of the av_image_() API, and simplifies understanding and copy operations, it also preserves alignment information which was lost with the previous layout. This breaks API/ABI, but since the function was never referenced in the code (and it isn't unlikely already used by someone) then this should not be a problem. commit b2592ea42ca0d7c81b6e6ae90189d43e3e3fce59 Author: Anton Khirnov Date: Sat Jun 4 00:23:14 2011 +0200 lavf: deprecate AVFormatParameters.time_base. commit abcedfac60efa679e18a561bce0e93f8535b60e3 Author: Anton Khirnov Date: Sat Jun 4 00:21:26 2011 +0200 img2: add framerate private option. commit a915bf64ccae3b341b7a416d509f7f807ab65777 Author: Anton Khirnov Date: Sat Jun 4 00:17:31 2011 +0200 img2: add video_size private option. commit f33e2a51d9e704a48a7c72333d1d720633eed98a Author: Anton Khirnov Date: Sat Jun 4 00:13:35 2011 +0200 img2: add pixel_format private option. commit c1dcbfddf9d8c484121824f876a1d8faee26d7fa Author: Anton Khirnov Date: Fri Jun 3 20:58:01 2011 +0200 tty: add framerate private option. commit 580817df048fb114529cdb4a82885f551bf62c0c Author: Michael Niedermayer Date: Mon Jun 6 04:03:09 2011 +0200 Move code for "ffmpeg: fix massive leak occurring when seeking" / e4841a404bdabfeafb917454d510b60d888cb761 elsewhere The picture struct is written to in the loop, so this cannot work. Signed-off-by: Michael Niedermayer commit f9569249c274ab71b570d6a462903379e9d414fb Merge: 6700aa8 eb7505e Author: Michael Niedermayer Date: Mon Jun 6 03:02:38 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: Remove some unused scripts from tools/. Add x86 assembly for some 10-bit H.264 intra predict functions. v4l2: do not force NTSC as standard Skip tableprint.h during 'make checkheaders'. Remove unnecessary LIBAVFORMAT_BUILD #ifdef. Drop explicit filenames from @file Doxygen tags. Skip generated table headers during 'make checkheaders'. lavf,lavc: free avoptions in a generic way. AVOptions: add av_opt_free convenience function. tableprint: Restore mistakenly deleted common.h #include for FF_ARRAY_ELEMS. tiff: print log in case of unknown / unsupported tag. tiff: fix linesize for mono-white/black formats. Fix build of eval-test program configure: Document --enable-vaapi ac3enc: extract all exponents for the frame at once Merged-by: Michael Niedermayer commit 6700aa8810d877cb017d977f12638481df459eb1 Author: Stefano Sabatini Date: Mon Jun 6 01:50:27 2011 +0200 lavf: remove reference to output-example in Makefile output-example.c (and renamed to muxing-example.c) has been moved to doc/examples. commit 27bcf55f459e038e81f09c17e72e6d44898b9015 Author: Stefano Sabatini Date: Thu Jun 2 15:43:21 2011 +0200 vsrc_buffer: add flags param to av_vsrc_buffer_add_video_buffer_ref The new flags parameter allows to specify if the video ref to add should overwrite the cache, if the flag is not set vsrc_buffer will complain and abort; otherwise it will clean the already cached video ref before to overwrite it, thus avoiding a leak. commit eb7505e4295dca9c3ab8c01e055a458e07857ef0 Author: Diego Biurrun Date: Sat Jun 4 18:45:28 2011 +0200 Remove some unused scripts from tools/. commit a8d44f9dd5e2b0e65976c586a6185882d673317b Author: Daniel Kang Date: Sun Jun 5 19:20:05 2011 -0400 Add x86 assembly for some 10-bit H.264 intra predict functions. Parts are inspired from the 8-bit H.264 predict code in Libav. Other parts ported from x264 with relicensing permission from author. Signed-off-by: Diego Biurrun commit 2c6fb9f03204d25bee68f1175233c1fff8e77e65 Author: Luca Barbato Date: Sun Jun 5 14:20:56 2011 -0500 v4l2: do not force NTSC as standard Setting a standard is meaningful only for analog capture devices. commit 612d0782fc885aaa0bbb8f8966d425ea91a606cf Author: Reimar Döffinger Date: Wed Jun 1 20:44:08 2011 +0200 Add const to avfilter_get_video_buffer_ref_from_arrays arguments. Avoids warning about discarding qualifiers in avcodec.c Signed-off-by: Reimar Döffinger commit ef5d7e18f4be8f36afc1034369849bff980ad9b1 Author: Diego Biurrun Date: Sun Jun 5 01:59:14 2011 +0200 Skip tableprint.h during 'make checkheaders'. It is only used on the host and may not compile on the target. commit fb8648ad4b94abd119ae75b174f578aaacbbfd55 Author: Diego Biurrun Date: Sun Jun 5 01:54:45 2011 +0200 Remove unnecessary LIBAVFORMAT_BUILD #ifdef. commit f25a2ece76756214da7dcde4a52a0534d9503319 Author: Diego Biurrun Date: Sun Jun 5 00:59:52 2011 +0200 Drop explicit filenames from @file Doxygen tags. The filename is unnecessary and brittle across file renames. commit 29b3de127f332ef7dff863544730f0b4b0741a11 Author: Diego Biurrun Date: Sun Jun 5 02:00:21 2011 +0200 Skip generated table headers during 'make checkheaders'. commit 367732832faaf1bac4ece37cf7fef8c911e16312 Author: Anton Khirnov Date: Sun Jun 5 13:18:17 2011 +0200 lavf,lavc: free avoptions in a generic way. It's simpler and less error-prone. Fixes some memleaks along the way. commit b39b06233dfd69b941a32f29171dfb63abb23c06 Author: Anton Khirnov Date: Sun Jun 5 13:17:26 2011 +0200 AVOptions: add av_opt_free convenience function. commit e844abc4983385567cfca1a638877e19f0f1cfeb Author: Stefano Sabatini Date: Sun Jun 5 13:55:02 2011 +0200 sdl: align option fields after last commit commit e4841a404bdabfeafb917454d510b60d888cb761 Author: Stefano Sabatini Date: Fri Jun 3 19:03:44 2011 +0200 ffmpeg: fix massive leak occurring when seeking Avoid to add frames to the vsrc_buffer in the case ist->pts < start_time, as these frames are unused (and never released). In particular this condition is verified with commands of the kind: ffmpeg -i INPUT -ss TIME OUTPUT Also allow a minor simplification. commit cea87fb2c38f175b9a0bd2a46617c155e67d4794 Author: Stefano Sabatini Date: Sun Jun 5 00:09:04 2011 +0200 ffprobe: implement -i FILE option Useful for mimicking the ffmpeg -i FILE syntax. commit 92b4abc2ad88ac7e89a60480094b8398fe1b8dbf Author: Diego Biurrun Date: Sun Jun 5 01:06:13 2011 +0100 tableprint: Restore mistakenly deleted common.h #include for FF_ARRAY_ELEMS. This fixes the build with hardcoded tables enabled. Signed-off-by: Mans Rullgard commit 9b032c65547a0c396902c101e7a5efdabb3025b9 Author: Stefano Sabatini Date: Sun Jun 5 00:06:20 2011 +0200 ffplay.texi: document -i FILE option commit b4af3cf3470a14626e5d2f40ce3c88bfdd0c8561 Author: Stefano Sabatini Date: Sun Jun 5 00:03:59 2011 +0200 cmdutils: remove unnecessary OPT_DUMMY implementation The -i INPUT option can be implemented more cleanly by using a function option, which can easily be done now that the parse_arg_function passed to parse_options has a standard signature. commit 96f931adf75967dc86fbf3ee21517e539d0a6e50 Author: Stefano Sabatini Date: Sat Jun 4 23:54:19 2011 +0200 cmdutils: change the signature of the function argument in parse_options() This is required for a pending simplification. commit 0d0fdb0ad59c0533fb91dad00379f762573ce541 Author: Stefano Sabatini Date: Sun Jun 5 00:57:05 2011 +0200 sdl: use the filename for defining the window title, if not specified This allows a more efficient use of the commandline. commit 1863a3c7aa897b2077e408ab0bdc57cb3a13d5f3 Author: Stefano Sabatini Date: Mon May 9 21:26:39 2011 +0200 tiff: print log in case of unknown / unsupported tag. Helps debugging. Signed-off-by: Anton Khirnov commit a43458d7eb32c2cc560c58c78949f152a8e95e3d Author: Stefano Sabatini Date: Mon May 9 22:11:57 2011 +0200 tiff: fix linesize for mono-white/black formats. Fix decoding of file Test_1bpp.tif Signed-off-by: Anton Khirnov commit 5a4a71257c0d0b1f4a5b4f0ebd4d96515feea23a Author: Mans Rullgard Date: Sat Jun 4 18:48:46 2011 +0100 Fix build of eval-test program eval.c has moved to libavutil, move the TESTPROGS entry too. Signed-off-by: Mans Rullgard commit dcb73592f4f938eb2fd121f434236d5065ff26b6 Author: Robert Swain Date: Sun Jun 5 10:31:24 2011 +0200 configure: Document --enable-vaapi VAAPI is disabled by default so it should have a --enable-vaapi option documented, not a --disable-vaapi. Signed-off-by: Mans Rullgard commit ba91bf58cd8bab4de55ec31ffcdf6cc71f7e5e42 Author: Michael Niedermayer Date: Sun Jun 5 04:31:36 2011 +0200 swscale: override the lack of the accurate rounding flag when needed for dither. Signed-off-by: Michael Niedermayer commit ec4207c46ae3f9a1add21dbe3eee124bb2b10eee Author: Michael Niedermayer Date: Sun Jun 5 04:24:45 2011 +0200 swscale: factor should_dither out Signed-off-by: Michael Niedermayer commit 46eb300d016b69b5fedb0410df98e3c698090c8c Merge: 124a9ed 594fbe4 Author: Michael Niedermayer Date: Sun Jun 5 02:33:59 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: ARM: remove MULL inline asm mathops: use MUL64 macro where it forms part of other ops tty: factorise returning error codes. rawdec: add framerate private option. x11grab: add framerate private option. fbdev,v4l2: remove some forgotten uses of AVFormatParameters.time_base. bktr: don't error when AVFormatParameters.time_base isn't set. cmdutils: add missing const qualifier Skip headers not designed to work standalone during 'make checkheaders'. Add missing #includes to make headers self-contained. musepack: remove unnecessary #include from mpcdata.h musepack: remove extraneous mpcdata.h inclusions Fix error check in av_file_map() Conflicts: cmdutils.c Merged-by: Michael Niedermayer commit 35d5cb1ab4dab657ef31b845893cf98d885c8add Author: Justin Ruggles Date: Wed Jun 1 12:40:01 2011 -0400 ac3enc: extract all exponents for the frame at once commit 594fbe42c6b21aef76b938ce97524fa92a48e7a0 Author: Mans Rullgard Date: Sat Jun 4 21:16:04 2011 +0100 ARM: remove MULL inline asm Reasonable gcc versions get this one right on their own. Signed-off-by: Mans Rullgard commit 95912731c2eb37b538a767b2ff2b8149b16f0bde Author: Mans Rullgard Date: Sat Jun 4 17:52:30 2011 +0100 mathops: use MUL64 macro where it forms part of other ops Signed-off-by: Mans Rullgard commit 8346f60afbb23b9a3dcef8e6683060f71ec296e2 Author: Anton Khirnov Date: Fri Jun 3 20:43:48 2011 +0200 tty: factorise returning error codes. commit e762b1ce9505511b1ecbbd4868ec6879e32e8831 Author: Anton Khirnov Date: Fri Jun 3 14:13:14 2011 +0200 rawdec: add framerate private option. commit ff494cbdafbaee57275e9227a8a2aff02184c346 Author: Anton Khirnov Date: Fri Jun 3 13:36:36 2011 +0200 x11grab: add framerate private option. commit a3b15e411d9624a37919e91fe81aec9c98457ed8 Author: Anton Khirnov Date: Fri Jun 3 13:29:43 2011 +0200 fbdev,v4l2: remove some forgotten uses of AVFormatParameters.time_base. commit 1572484f62c59da6755fbcebf09821ada8c43728 Author: Anton Khirnov Date: Fri Jun 3 13:11:39 2011 +0200 bktr: don't error when AVFormatParameters.time_base isn't set. There's a private option for it now. commit 42abb9a80da16d33ef7f54c3656b4d9524d03435 Author: Mans Rullgard Date: Sat Jun 4 16:47:15 2011 +0100 cmdutils: add missing const qualifier Signed-off-by: Mans Rullgard commit 61ec024d39cc53672901791923e9cb1bd0fda9f3 Author: Diego Biurrun Date: Sat Jun 4 18:02:40 2011 +0200 Skip headers not designed to work standalone during 'make checkheaders'. commit 8d459acc10d865a82b1646f91a85ae99d998faa7 Author: Diego Biurrun Date: Sat Jun 4 16:58:31 2011 +0200 Add missing #includes to make headers self-contained. This fixes 'make checkheaders'. commit 67ace7f0473ff968c7c615796b7a95c90fde68d2 Author: Mans Rullgard Date: Sat Jun 4 16:45:15 2011 +0100 musepack: remove unnecessary #include from mpcdata.h Signed-off-by: Mans Rullgard commit 91b4941c17bcf6bd4a0cfc7feb6d7c46868db433 Author: Mans Rullgard Date: Sat Jun 4 16:43:41 2011 +0100 musepack: remove extraneous mpcdata.h inclusions Signed-off-by: Mans Rullgard commit d0989bed226578a8f37ca90c78abc97abafb9794 Author: Mans Rullgard Date: Sat Jun 4 13:36:35 2011 +0100 Fix error check in av_file_map() On failure, mmap() returns MAP_FAILED, which may or may not be -1. Signed-off-by: Mans Rullgard commit 124a9edb5f172ce36b11fd0d6ccc9f15cc51f322 Author: Michael Niedermayer Date: Sat Jun 4 16:55:22 2011 +0200 udp: support old, crappy non pthread mode Signed-off-by: Michael Niedermayer commit 87f40364d1a22aff5c9c245fa4ad07275c954248 Merge: e4e2db9 dc6632f Author: Michael Niedermayer Date: Sat Jun 4 06:31:35 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: (21 commits) build: simplify commands for clean target swscale: split swscale.c in unscaled and generic conversion routines. swscale: cosmetics. swscale: integrate (literally) swscale_template.c in swscale.c. swscale: split out x86/swscale_template.c from swscale.c. swscale: enable hScale_altivec_real. swscale: split out ppc _template.c files from main swscale.c. swscale: remove indirections in ppc/swscale_template.c. swscale: split out unscaled altivec YUV converters in their own file. mpegvideoenc: fix multislice fate tests with threading disabled. mpegts: Wrap #ifdef DEBUG and av_hex_dump_log() combination in a macro. build: Simplify texi2html invocation through the --output option. Mark some variables with av_unused Replace avcodec_get_pix_fmt_name() by av_get_pix_fmt_name(). svq3: Check negative mb_type to fix potential crash. svq3: Move svq3-specific fields to their own context. rawdec: initialize return value to 0. Remove unused get_psnr() prototype rawdec: don't leak option strings. bktr: get default framerate from video standard. ... Merged-by: Michael Niedermayer commit e4e2db9c74a10b2342297489edc00e99b10d5eb3 Author: Baptiste Coudurier Date: Fri Jun 3 19:52:27 2011 -0700 ffmpeg: use opt_acodec when setting audio codec in opt_target. commit bfd3b70ac3162f028bbfa5a8cd47d2715d49f77e Author: Michael Niedermayer Date: Sat Jun 4 01:24:00 2011 +0200 ffmpeg: fix segfault with too many output files Fixes Ticket219 Signed-off-by: Michael Niedermayer commit 33af5335fd8e1b411bb1bdfad93b675033866c2c Author: Michael Niedermayer Date: Sat Jun 4 00:16:12 2011 +0200 ffplay: error out with invalid sample rate or channels. Fixes Ticket119 Signed-off-by: Michael Niedermayer commit 49125aeddcfe1990ab4159d1b144b9387182452b Author: Michael Niedermayer Date: Fri Jun 3 21:14:30 2011 +0200 oggdec: fix Ticket185 Signed-off-by: Michael Niedermayer commit dc6632f1195c929a87ddf1b02d12b681c6de79ad Author: Mans Rullgard Date: Fri Jun 3 15:50:14 2011 +0100 build: simplify commands for clean target Signed-off-by: Mans Rullgard commit c1daf0723c49d331deecd63b4a6a328000821950 Author: Michael Niedermayer Date: Fri Jun 3 19:34:43 2011 +0200 j2kdec: dont fail on non zero cblock style. This allows decoding to continue a bit further for some files. Signed-off-by: Michael Niedermayer commit 58149303b3e502199bd663c2c107b7a4771bc314 Author: Rukhsana Ruby Date: Fri Jun 3 18:47:30 2011 +0200 makefile: fix j2k encoder dependancies commit f35761bca20a96c74c3083459643046683a95e42 Author: JULIAN GARDNER Date: Fri Jun 3 16:08:16 2011 +0200 udp: fix indention commit 6af2801088aef6dd7aa688e88073f13bc7a8a4f4 Author: Ronald S. Bultje Date: Thu Jun 2 22:45:16 2011 -0700 swscale: split swscale.c in unscaled and generic conversion routines. This duplicates the function fillPlane(). commit 2762ee30347afd3c1d2795a232c8b78d56a44b0f Author: Ronald S. Bultje Date: Thu Jun 2 22:34:13 2011 -0700 swscale: cosmetics. Remove duplicate "inC" and "_c" functions that do the same thing; give each function that handles data and acts as a function pointer a "_c" suffix; remove "_c" suffix from functions that are inherently not optimizable. Remove inline keyword from functions that are only used through function pointers. commit 1674bd2abe877b857f1be12b152e4ec496307963 Author: Ronald S. Bultje Date: Thu Jun 2 22:34:12 2011 -0700 swscale: integrate (literally) swscale_template.c in swscale.c. commit 983260b0a473f85e3b67a6c64499e409aa5eb67b Author: Ronald S. Bultje Date: Thu Jun 2 22:00:00 2011 -0700 swscale: split out x86/swscale_template.c from swscale.c. commit 075d0ae72c993403bdeb8713f740d1bbb7a1359d Author: Ronald S. Bultje Date: Thu Jun 2 20:33:05 2011 -0700 swscale: enable hScale_altivec_real. commit 67d80a54217f93a50b7a52449fad12215b43c9e8 Author: Ronald S. Bultje Date: Thu Jun 2 20:04:04 2011 -0700 swscale: split out ppc _template.c files from main swscale.c. commit a3e9bb5deed0f43c84ee3006962f7bd27ae4f811 Author: Ronald S. Bultje Date: Thu Jun 2 19:28:56 2011 -0700 swscale: remove indirections in ppc/swscale_template.c. commit 0e5d31b16b39f0b4d2e3307714af592dd65cf123 Author: Ronald S. Bultje Date: Thu Jun 2 20:17:20 2011 -0700 swscale: split out unscaled altivec YUV converters in their own file. commit 83a8b3002f3399c52b3900ca2f068d51e97713ec Author: Ronald S. Bultje Date: Thu Jun 2 14:24:58 2011 -0700 mpegvideoenc: fix multislice fate tests with threading disabled. The MPEG encoding code assumes that n_threads == n_slices, and thus it should use n_slices even if threading itself is disabled. commit 25c32d082b1ab4c3567c09f707e75c8ac582806c Author: Carl Eugen Hoyos Date: Fri Jun 3 13:30:27 2011 +0200 cmdutils: move "#undef main" from ffplay.c to cmdutils.h On Windows/MinGW the SDL cflags re-define the main() function, which results in a linking error if the define is not undeffed. Since the addition of the SDL output device, SDL cflags are used also for compiling ffmpeg and ffprobe, so we need to move this trick from ffplay.c to a common header. Fix trac issue #256. commit c9614bb22c98c513c010e1e14b12349a8cc74d8c Author: Michael Niedermayer Date: Fri Jun 3 15:37:44 2011 +0200 wav: update size check for ds64 Signed-off-by: Michael Niedermayer commit e472f0ea5a025b61b7c208661a4bc31091a3c2c2 Author: Philip de Nier Date: Thu Jun 2 17:04:42 2011 +0100 wav: fix skip size at end of ds64 chunk commit 43b6c3eb182617ff08e72584e1c4635ac20d33e8 Author: Diego Biurrun Date: Fri May 27 20:34:01 2011 +0200 mpegts: Wrap #ifdef DEBUG and av_hex_dump_log() combination in a macro. commit a5514a84748e90adbbfa2661ccea1e004e6ef604 Author: Diego Biurrun Date: Mon May 30 17:28:43 2011 +0200 build: Simplify texi2html invocation through the --output option. The --output option is available in texi2html since at least version 1.78. commit 5e1166b31be45b37cbbd14eecfa1b260190ac651 Author: Mans Rullgard Date: Fri Jun 3 12:52:29 2011 +0100 Mark some variables with av_unused Most of these variables are only used in av_dlog statements, some are required but not used by other macros. Signed-off-by: Mans Rullgard commit 94bed8e582eed1268ddc0d2b88cad21d8c638774 Author: Stefano Sabatini Date: Fri Jun 3 11:42:07 2011 +0200 Replace avcodec_get_pix_fmt_name() by av_get_pix_fmt_name(). This fixes warnings about avcodec_get_pix_fmt_name() being deprecated. Signed-off-by: Diego Biurrun commit 93d06bd1df73861c73bc12c659aecdf404d1de2a Author: Baptiste Coudurier Date: Wed May 4 18:45:36 2011 -0700 svq3: Check negative mb_type to fix potential crash. Signed-off-by: Michael Niedermayer Signed-off-by: Diego Biurrun commit 8dfc6d1f7c33a482aba23e75870076f79b0ea485 Author: Baptiste Coudurier Date: Thu May 5 14:18:33 2011 +0200 svq3: Move svq3-specific fields to their own context. Signed-off-by: Michael Niedermayer Signed-off-by: Diego Biurrun commit 1f94c31f69e6eb7eee80d0a3b42875261a18dcbe Author: Anton Khirnov Date: Fri Jun 3 13:40:54 2011 +0200 rawdec: initialize return value to 0. commit c1dfb72d3563b0e3b7079c9be2d402ab0e48d3f2 Author: Vladimir Pantelic Date: Fri Jun 3 11:00:15 2011 +0200 Remove unused get_psnr() prototype Signed-off-by: Mans Rullgard commit a606aa7570ef71c33569d64cda1b42743eb90682 Author: Anton Khirnov Date: Fri Jun 3 07:37:44 2011 +0200 rawdec: don't leak option strings. commit bd7c1d35a603dd07818d648c08839844bab902ce Author: Anton Khirnov Date: Fri Jun 3 07:36:14 2011 +0200 bktr: get default framerate from video standard. commit 0d793db1b0a4edff37fee8318f5656ffe6fe3951 Author: Ronald S. Bultje Date: Thu Jun 2 19:19:12 2011 -0700 swscale: remove unused COMPILE_TEMPLATE_ALTIVEC. commit 99eb31e263a24bc6c5a7a3f455a2bcb04a60e70e Merge: 9034001 f190f67 Author: Michael Niedermayer Date: Fri Jun 3 05:19:30 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: (25 commits) Replace custom DEBUG preprocessor trickery by the standard one. vorbis: Remove non-compiling debug statement. vorbis: Remove pointless DEBUG #ifdef around debug output macros. cook: Remove non-compiling debug output. Remove pointless #ifdefs around function declarations in a header. Replace #ifdef + av_log() combinations by av_dlog(). Replace custom debug output functions by av_dlog(). cook: Remove unused debug functions. Remove stray extra arguments from av_dlog() invocations. targa: fix big-endian build v4l2: remove one forgotten use of AVFormatParameters.pix_fmt. vfwcap: add a framerate private option. v4l2: add a framerate private option. libdc1394: add a framerate private option. fbdev: add a framerate private option. bktr: add a framerate private option. oma: check avio_read() return value nutdec: remove unused variable Remove unused variables swscale: allocate larger buffer to handle altivec overreads. ... Conflicts: ffmpeg.c libavcodec/dca.c libavcodec/dirac.c libavcodec/error_resilience.c libavcodec/h264.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pthread.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/shorten.c libavcodec/truemotion2.c libavcodec/utils.c libavdevice/dv1394.c libavdevice/fbdev.c libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/4xm.c libavformat/apetag.c libavformat/asfdec.c libavformat/avidec.c libavformat/mmf.c libavformat/mpeg.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/oggdec.c libavformat/oggparseogm.c libavformat/rl2.c libavformat/rmdec.c libavformat/rpl.c libavformat/rtpdec_latm.c libavformat/sauce.c libavformat/sol.c libswscale/utils.c tests/ref/vsynth1/error tests/ref/vsynth2/error Merged-by: Michael Niedermayer commit 9034001b17077e9da5205c4344eb1b88b9882f03 Author: Michael Niedermayer Date: Fri Jun 3 03:43:46 2011 +0200 h264 fill_filter_caches: Dont init chroma nnz_cache. Found-by: Dark Shikari Signed-off-by: Michael Niedermayer commit dd471070215c5ca78f2cb99efc66ea5e33b39808 Author: Baptiste Coudurier Date: Fri Jun 3 00:29:36 2011 +0200 In print_report, print progression time in hours:mins:secs:us Signed-off-by: Michael Niedermayer commit 1212d5b5e45675701071eed47dbad21ee1a61d6f Author: Baptiste Coudurier Date: Fri Jun 3 00:28:52 2011 +0200 ffmpeg: In print_report, use int64_t for pts to check for 0 and avoid inf value for bitrate. Signed-off-by: Michael Niedermayer commit 5aa70309ad236cf7e218cdce913d8290aae04d4a Author: Baptiste Coudurier Date: Fri Jun 3 00:12:43 2011 +0200 In libswscale, use all lines when converting from 422p to rgb with mmx, improve quality. Signed-off-by: Michael Niedermayer commit f190f676bc93a7e80344f2feeb3b9b44604d4717 Author: Diego Biurrun Date: Thu Jun 2 22:45:15 2011 +0200 Replace custom DEBUG preprocessor trickery by the standard one. commit 068aa387128850da488af262d54986d03eebe423 Author: Diego Biurrun Date: Thu Jun 2 23:03:54 2011 +0200 vorbis: Remove non-compiling debug statement. commit ec6313ad866fc04b7b56af4d639182bf595d3829 Author: Diego Biurrun Date: Thu Jun 2 23:02:34 2011 +0200 vorbis: Remove pointless DEBUG #ifdef around debug output macros. commit fb52cf8267984f97dcb18aaf5dcbad42dd6fcacd Author: Diego Biurrun Date: Thu Jun 2 22:59:27 2011 +0200 cook: Remove non-compiling debug output. random_state was changed from an int to a struct and can no longer be printed as easily as before. commit 0fc9c6554e85b601b61367574fec333fb5a074e6 Author: Diego Biurrun Date: Thu Jun 2 22:56:29 2011 +0200 Remove pointless #ifdefs around function declarations in a header. commit 2366462429d9cc7ed9715c037f204fcefeff8ea4 Author: Diego Biurrun Date: Thu Jun 2 22:55:51 2011 +0200 Replace #ifdef + av_log() combinations by av_dlog(). commit df96f22d8f2b0b40d5511cde1c4cbb4a6f824c32 Author: Diego Biurrun Date: Thu Jun 2 22:49:53 2011 +0200 Replace custom debug output functions by av_dlog(). commit 752207e36bd9ee0df0183c5ecb0a53a12caea5df Author: Diego Biurrun Date: Thu Jun 2 22:46:11 2011 +0200 cook: Remove unused debug functions. commit e977ca2645cc6b23589ddf97ab08861064ba8792 Author: Stefano Sabatini Date: Thu Jun 2 17:45:33 2011 +0200 lavfi: add avfilter_link_free() function Allow to free the buffers cached in each AVFilterLink pool. Fix leak. commit b932eb1be62b47b29969667f14a207e425e79a55 Author: Stefano Sabatini Date: Thu Jun 2 19:00:47 2011 +0200 swscale: reintroduce sws_format_name() symbol Reintroduce the internal symbol which was removed in: commit e1197b9e1746c03b1d13d816d1569aeaf1b71ecc Author: Stefano Sabatini Date: Sun May 29 17:57:40 2011 +0200 swscale: remove sws_format_name() Use av_get_pix_fmt_name() instead. The symbol is used by some external libs (hi libx264!), this gives time to them to use the recently added av_get_pix_fmt_name() rather than an internal symbol. commit b751f611065f1fe1d7216971c4b100c928a3b0d5 Author: Diego Biurrun Date: Thu Jun 2 20:40:09 2011 +0200 Remove stray extra arguments from av_dlog() invocations. commit 551dfdde70f912d0278730b28d480e32a49b1b5e Author: Mans Rullgard Date: Thu Jun 2 21:07:53 2011 +0100 targa: fix big-endian build commit fefa67d536346b39973ab70b892d8ef27215b0b3 Author: Anton Khirnov Date: Sun May 29 15:22:45 2011 +0200 v4l2: remove one forgotten use of AVFormatParameters.pix_fmt. commit 4078ed26312adb9adc1948556464705011b28e67 Author: Anton Khirnov Date: Tue May 24 21:16:47 2011 +0200 vfwcap: add a framerate private option. commit c21324eeb6f3175ad2304cb77e990f73a1e810b2 Author: Anton Khirnov Date: Tue May 24 21:16:47 2011 +0200 v4l2: add a framerate private option. commit 121ef2e26d6fefb6b48fbc1082d351bd4d538111 Author: Anton Khirnov Date: Tue May 24 21:16:47 2011 +0200 libdc1394: add a framerate private option. commit 1556186a625fc61bcd06a6a009795f3c895459ea Author: Anton Khirnov Date: Tue May 24 21:16:47 2011 +0200 fbdev: add a framerate private option. commit 3e3db4d93d71d25927c7c68bb92f9cc8f2003396 Author: Anton Khirnov Date: Tue May 24 21:16:47 2011 +0200 bktr: add a framerate private option. commit 4c1e56ede86b68b5c600bde4ebeea6153c46f7f9 Author: Mans Rullgard Date: Wed Jun 1 17:30:28 2011 +0100 oma: check avio_read() return value commit 14086341bfd2f8f5a5dfbb23868bf8cf677862ef Author: Mans Rullgard Date: Wed Jun 1 17:29:22 2011 +0100 nutdec: remove unused variable commit e65ab9d94f1c8d8893e32d90467d9525625d306a Author: Mans Rullgard Date: Wed Jun 1 17:26:27 2011 +0100 Remove unused variables commit 6713989c231104ff4381ef58f25ec1af8603535b Author: Michael Niedermayer Date: Thu Jun 2 04:41:44 2011 +0200 swscale: dither for planar yuv outputs Signed-off-by: Michael Niedermayer commit 877f76ad33bb9b0b0d09565dd9ec1cf8e91096f1 Author: Michael Niedermayer Date: Thu Jun 2 19:26:40 2011 +0200 swscale: Fix use of uninitialized values (bug probably introduced from a marge of libav) Signed-off-by: Michael Niedermayer commit 5ad38d93e86e66b29b329c04cdc86f22a96b7db3 Author: Michael Niedermayer Date: Thu Jun 2 16:09:22 2011 +0200 cpudetect: add av_force_cpu_flags() Signed-off-by: Michael Niedermayer commit 808d8ff6bb92e641cdd99a0b06767eabd707b925 Author: Ronald S. Bultje Date: Thu Jun 2 11:25:56 2011 -0700 swscale: allocate larger buffer to handle altivec overreads. Altivec sws code intentionally overreads buffers for better performance, so we need to allocate larger buffers to handle that. commit 6a9c85944427e3c4355bce67d7f677ec69527bff Author: Alexander Strange Date: Thu Jun 2 10:15:58 2011 -0700 H264/MPEG frame-level multi-threading. Signed-off-by: Ronald S. Bultje commit 9e66b64c360568a91faa84d0cda96ab93c467502 Author: Stefano Sabatini Date: Thu Jun 2 16:09:24 2011 +0200 vsrc_buffer: propagate error code in av_vsrc_buffer_add_frame() Propagate av_vsrc_buffer_add_video_buffer_ref() error code rather than return 0. commit 665e608c8d920d83216e1b8fd1445ee335528f13 Author: Stefano Sabatini Date: Thu Jun 2 16:36:12 2011 +0200 lavfi: reindent after the previous commit commit 6f1dd6f45a641ca7670c7b00fbeea42420b89ada Author: Stefano Sabatini Date: Thu Jun 2 16:33:25 2011 +0200 lavfi: add braces around the block of an if() expression in avfilter_default_get_video_buffer Clarify code layout. commit 0ff5cbedd2b6e813064fe4f8aab735162889037c Author: Stefano Sabatini Date: Thu Jun 2 16:27:56 2011 +0200 lavfi: clarify the context of a comment in avfilter_default_get_video_buffer() The comment is meant to be about the align parameter. commit 77b32b73ed31f9aaa6c1e476c9a041399a35be9d Author: Stefano Sabatini Date: Thu Jun 2 16:26:55 2011 +0200 lavfi: apply misc style fixes Adopt K&R style for overall consistency/readability. commit 53be7b23e9d7074d1aeee77407b008411d034e9e Author: Loren Merritt Date: Wed Jun 1 01:01:01 2011 -0400 Cosmetic changes to h264_idct_10bit.asm. Removes redundant dword tags and whitespace changes. Signed-off-by: Ronald S. Bultje commit 994c3550ffe032385833c21876fb121f59516079 Author: Loren Merritt Date: Wed Jun 1 21:53:15 2011 -0400 2x faster h264_idct_add8_10. Signed-off-by: Ronald S. Bultje commit cc9947ffbe8a847a49d092c9253910cfc53279ad Author: Nathan Caldwell Date: Tue May 31 23:38:09 2011 -0600 aacenc: Add stereo_mode option. ms_off is the default, until Mid/Side is no longer buggy. Signed-off-by: Ronald S. Bultje commit e6635a9a19639a71c9c1f71c3b4547a0a6301d29 Author: Ronald S. Bultje Date: Wed Jun 1 21:56:55 2011 -0700 h264: remove CONFIG_GPL from x86 intra prediction code. The authors permitted relicensing to LGPL a long time ago (Holger, Loren and Jason). commit d013c6da80003cb4b577867d1f091e47a0fe3776 Author: James Zern Date: Wed Jun 1 13:56:12 2011 -0700 doc: cosmetics: libx264 typos commit c96f3750c22ef1576a46140f3101e3585041f41f Author: Piotr Kaczuba Date: Wed Jun 1 18:47:37 2011 +0200 postprocess: Remove test for impossible condition (was: Re: postprocess.c: replace check for p==NULL with *p==0) commit b443447536116f2843097f26a693478c66dcbe02 Author: Clément BÅ“sch Date: Sun May 29 21:02:20 2011 +0200 Fix various uninitialized variable warnings commit 58fd70b04decdb7e5580c06b1be3bd573fabeeda Author: Reimar Döffinger Date: Wed Jun 1 21:30:13 2011 +0200 Port remove of get_sws_cpuflags from MPlayer's libmpcodecs. commit 3c194f390fe7e18a6e2e51eb4f29495eb230585e Author: Reimar Döffinger Date: Wed Jun 1 22:15:36 2011 +0200 Replace "vector const" by "const vector" otherwise gcc 4.6.0 fails. Given that this compiles fine with the Apple compiler that is probably a gcc bug, but "const vector" is nicer anyway. commit 3379531c401b457c9f7437ee0db772da75fd1765 Author: Reimar Döffinger Date: Wed Jun 1 21:24:16 2011 +0200 Port recent changes to MPlayer libmpcodecs. Also include an older fix for vf_smartblur which was essentially broken due to reading the threshold value wrongly. commit 2a30df09fd64634ad1b70485cd665ad05116730c Author: Reimar Döffinger Date: Wed Jun 1 20:52:43 2011 +0200 Replace non-existent HAVE_SSE2 with HAVE_SSE. Since this is only a compilation check (the actual function used is selected at runtime) and HAVE_SSE indicates that we can also compile SSE2 code, this is correct. commit cd8cb54990be4fbd23e28f9d7c2c6170d3667692 Merge: 06a9da7 8e112df Author: Michael Niedermayer Date: Thu Jun 2 05:12:10 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: ARM: ac3dsp: optimised update_bap_counts() mpegaudiodec: Fix av_dlog() invocation. h264/10bit: add HAVE_ALIGNED_STACK checks. Update 8-bit H.264 IDCT function names to reflect bit-depth. Add IDCT functions for 10-bit H.264. mpegaudioenc: Fix broken av_dlog statement. Employ correct printf format specifiers, mostly in debug output. ARM: fix MUL64 inline asm for pre-armv6 Conflicts: libavcodec/mpegaudioenc.c libavformat/ape.c libavformat/mxfdec.c libavformat/r3d.c Merged-by: Michael Niedermayer commit 06a9da736554197601e4062298fcf45a5e8d49ff Author: Reimar Döffinger Date: Wed Jun 1 20:29:27 2011 +0200 Simplify code and avoid compiler warning about incompatible types. commit bf19c871012644fe27c69531b5f733c472aa858b Author: Reimar Döffinger Date: Wed Jun 1 20:26:54 2011 +0200 Fix type of out[] variable, it should not be const. Fixes compiler warning about incompatible types in sws_scale call. commit 8e112df409061034202b98fcc6ce2c1c670c0dda Author: Mans Rullgard Date: Sun May 29 14:27:03 2011 +0100 ARM: ac3dsp: optimised update_bap_counts() Signed-off-by: Mans Rullgard commit bde2c1c7fe175c5c857a8d9a8ae05f31ace0b94f Author: Diego Biurrun Date: Wed Jun 1 12:17:30 2011 +0200 mpegaudiodec: Fix av_dlog() invocation. Some parameters passed to the av_dlog can be either float or int, depending on the mode the file is being compiled as. Cast those parameters to float and use appropriate conversion specifiers. commit eb5a3ab7b0ddaa9e7ce1b5070ba44bda9ce41ce9 Author: Stefano Sabatini Date: Wed Jun 1 13:30:35 2011 +0200 swscale: fix compilation of bfin due to missing pixdesc.h header This is required after sws_format_name() was replaced by av_get_pix_fmt(), which is declared in libavutil/pixdesc.h. commit adf94155989c765c4cac6e3ef5d3526555ad2274 Author: Stefano Sabatini Date: Wed Jun 1 13:07:57 2011 +0200 lavf: tag dump_format() as @deprecated This makes the generated Doxygen doc link to the replacement av_dump_format() function. commit 1f95fb58137951941d8d74bd47b1635b6d2399ec Author: Stefano Sabatini Date: Mon May 30 17:09:12 2011 +0200 yuv4mpeg: complain and exit if a non-rawvideo stream is selected The yuv4mpeg muxer will crash otherwise. commit ac41f3b036246e64d1724d945bea01d982bd1c91 Author: Stefano Sabatini Date: Mon May 30 16:52:35 2011 +0200 ffmpeg: handle copy of packets for AVFMT_RAWPICTURE output formats Store AVPicture in AVPacket as required by AVFMT_RAWPICTURE formats. Fix trac issue #251. commit ca858ab77d7bb49ae99485721bbbe3a580670904 Author: Stefano Sabatini Date: Mon May 30 09:18:42 2011 +0200 doc/examples: give meaningful names to the example files Rename: api-example.c -> encoding-example.c output-example.c -> muxing-example.c commit f3aa65af3a84c787b0fa8b8cf0881fc05668a24c Author: Daniel Kang Date: Tue May 31 23:10:51 2011 -0400 h264/10bit: add HAVE_ALIGNED_STACK checks. Fixes regression in 836f47d34b49e8ba9883e738a42f154130421caa in ICC-10.x, since ICC<=11.0 doesn't align stack upon function calls. Signed-off-by: Ronald S. Bultje commit 201549d1a95e5ea81a97257368668cda0afcb2f8 Author: Michael Niedermayer Date: Wed Jun 1 04:15:13 2011 +0200 swscale: More accurate rounding in YSCALE_YUV_2_PACKEDX_FULL_C() Signed-off-by: Michael Niedermayer commit f6a8ce98a7bce601a7db4a8f2a615822dc8f71bd Merge: 0abbd3a 5ac4952 Author: Michael Niedermayer Date: Tue May 31 23:16:26 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: vf_drawtext: Replace FFmpeg by Libav in license boilerplate. mpegaudiodec: remove unusued code and variables improved 'edts' atom writing support mpegaudio: clean up compute_antialias() definition vp8: fix segmentation race during frame-threading. Merged-by: Michael Niedermayer commit 348493db60de19d1997fd2861e130720218b9fcf Author: Daniel Kang Date: Tue May 24 15:15:08 2011 -0400 Update 8-bit H.264 IDCT function names to reflect bit-depth. Signed-off-by: Ronald S. Bultje commit 836f47d34b49e8ba9883e738a42f154130421caa Author: Daniel Kang Date: Tue May 24 15:14:38 2011 -0400 Add IDCT functions for 10-bit H.264. Ports the majority of IDCT functions for 10-bit H.264. Parts are inspired from 8-bit IDCT code in Libav; other parts ported from x264 with relicensing permission from author. Signed-off-by: Ronald S. Bultje commit 7e985c9e35f2be426039da9a1696a584ebd57ad0 Author: Diego Biurrun Date: Tue May 31 21:24:13 2011 +0200 mpegaudioenc: Fix broken av_dlog statement. commit b0a4e5f9e765dc601a62f87cf3510ac381c3c4c6 Author: Diego Biurrun Date: Tue May 31 21:23:45 2011 +0200 Employ correct printf format specifiers, mostly in debug output. commit c51695dbf6e05b397ad8ef8e89d27723db5cb9f1 Author: Mans Rullgard Date: Tue May 31 21:04:01 2011 +0100 ARM: fix MUL64 inline asm for pre-armv6 Prior to ARMv6, the destination registers of the SMULL instruction must be distinct from the first source register. Marking the output early-clobber ensures it is allocated unique registers. This restriction is dropped in ARMv6 and later, so allowing overlap between input and output registers there might give better code. Signed-off-by: Mans Rullgard commit 0abbd3adb6a28c088e121bf3da6c04225398bee4 Author: James Zern Date: Tue May 31 13:48:49 2011 -0700 doc: add libvpx encoder section Documents the mapping from FFmpeg options to libvpx. commit 5ac4952a5808cc8cfe01031ca9d4df7d072f453c Author: Diego Biurrun Date: Tue May 31 14:00:12 2011 +0200 vf_drawtext: Replace FFmpeg by Libav in license boilerplate. commit fdf18e33bb07d665a86b344e65043692a3de51bb Author: Mans Rullgard Date: Tue May 31 18:38:01 2011 +0100 mpegaudiodec: remove unusued code and variables Signed-off-by: Mans Rullgard commit 84fb4e9df737c856cca7767016110fc74bee56cb Author: Piotr Kaczuba Date: Mon May 30 13:19:35 2011 +0200 postprocess.c: filter name needs to be double 0 terminated commit c16919487ec4acc861401d0e2ad2bbdb5cb251d1 Author: Gil Pedersen Date: Mon May 2 19:25:28 2011 +0200 improved 'edts' atom writing support The 'edts' write function can now generate an initial empty edit resulting in a track-specific presentation delay. This is automatically calculated and inserted for any track where the initial DTS != 0. Added support for long (version==1) timecodes. commit 6f1ec38ce2193d3d4cacd87edb452c6d7ba751ec Author: Mans Rullgard Date: Thu May 19 13:36:21 2011 +0100 mpegaudio: clean up compute_antialias() definition This merges the float and fixed-point versions of the compute_antialias function, fixes invalid array indexing, and eliminates a dead copy of csa_table. Signed-off-by: Mans Rullgard commit 9ebcf7699bced12d4b7e326cfbb1f9ffb59ec794 Author: Ronald S. Bultje Date: Sun May 29 18:53:42 2011 -0400 vp8: fix segmentation race during frame-threading. Fixes occasional failure of make fate-vp8-test-vector-010 with frame-multithreading enabled. commit a52f598d6301eddc333002c0b2a5e9cb5dda1cf6 Author: Reimar Döffinger Date: Mon May 30 23:44:54 2011 +0200 Port libmpcodec fixes from MPlayer. commit a54dceb26af072d049c3f3f003f2a4ab0df26987 Author: Alexander Strange Date: Tue May 31 03:10:35 2011 +0200 Merge remote-tracking branch 'ffmpeg-mt/master' * ffmpeg-mt/master: Update todo The maximum buffer size needs to be 33, not 32 merged-by: Michael Niedermayer commit 40c29d42cfe5615b9e382b89f5bcba7a2d62cd29 Merge: 3d0424f f635a23 Author: Michael Niedermayer Date: Tue May 31 02:08:13 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: swscale: Remove unused variable. ARM: simplify inline asm with 64-bit operands Merged-by: Michael Niedermayer commit f635a233e377bedc6a39c9d8923ee3039fa5319f Author: Diego Biurrun Date: Mon May 30 20:31:27 2011 +0200 swscale: Remove unused variable. commit 6bb70dfd7466ff89259285d5714b5caa6ca954f9 Author: Mans Rullgard Date: Mon May 30 16:37:06 2011 +0100 ARM: simplify inline asm with 64-bit operands Signed-off-by: Mans Rullgard commit 3d0424f2ff3ae774d4237954186e4113976827e5 Author: Reimar Döffinger Date: Mon May 30 20:07:39 2011 +0200 Add "const" to avoid "initialization discards qualifiers" warning. commit 70564983c5e3a4e62426510aee8cd27bc636774e Author: Reimar Döffinger Date: Mon May 30 20:02:39 2011 +0200 Add const to fix "cast discards qualifiers" warnings. commit b7b62c3a53b3d543450451176e88806d21a49b9d Author: Reimar Döffinger Date: Mon May 30 19:35:32 2011 +0200 Include pixdesc.h for av_get_pix_fmt_name. Fixes compilation on PPC with Altivec enabled. commit f86d260df305ebde41093cb6de6de03e0d076356 Author: Tomas Härdin Date: Fri May 27 22:01:32 2011 +0200 wav: Don't avio_seek() if we know we'll run into EOF Since we want to break the loop the 'if (data_ofs < 0)' block is moved after the loop. This fixes ticket #250. commit c328122a8d1d51873b1555ef41b08e5621de6e99 Author: Stefano Sabatini Date: Mon May 30 09:14:48 2011 +0200 api-example: uppercase first letter in "copyright" Improve consistency. commit f501c74d9916187206e8bc23c7ff041d91098677 Author: Stefano Sabatini Date: Mon May 30 09:12:48 2011 +0200 output-example: create @file doxy from text in the copyright header commit 9362b5094114bd2f0cea74691ad900b19dac64f8 Author: Stefano Sabatini Date: Sun May 29 12:47:40 2011 +0200 examples: move API examples to a dedicated dir in doc commit f712f6c8a4bd14bae3c41118af642b5dae7f6e2b Author: Stefano Sabatini Date: Sun May 29 10:42:44 2011 +0200 ffmpeg: simplify opt_*_codec() options Replace opt_{audio,video,subtitle,data}_codec() with a single opt_codec() function. commit 7533a727f9efed2d0eb6c8b452ff9e35214f5c8e Author: Stefano Sabatini Date: Sat May 28 21:14:06 2011 +0200 v4l2: rewrite code iterating the supported standards Simplify/clarify the code logic and error reporting. commit 2d48515eb7a6db81ca067db0f2b986c58360115a Author: Stefano Sabatini Date: Sat May 28 21:04:29 2011 +0200 v4l2: perform minor style fixes commit 7b017086d4262199893117e19755763b7755f03d Author: Stefano Sabatini Date: Sat May 28 21:02:14 2011 +0200 v4l2: replace memset() with explicit struct initialization commit 50fee0fc8b2540eade190575ab7802826597bf32 Author: Stefano Sabatini Date: Mon May 30 01:42:45 2011 +0200 rawdec: fail in case of unknow pixel format commit e1197b9e1746c03b1d13d816d1569aeaf1b71ecc Author: Stefano Sabatini Date: Sun May 29 17:57:40 2011 +0200 swscale: remove sws_format_name() Use av_get_pix_fmt_name() instead. commit 2c10ee23583d80a44f65a2199cef96eafaaceade Author: Michael Niedermayer Date: Mon May 30 03:11:54 2011 +0200 error.c: fix compile flags Signed-off-by: Michael Niedermayer commit 35bed44fc95eb1165f75b0c513d743f79ce8410c Author: Michael Niedermayer Date: Mon May 30 02:39:26 2011 +0200 TCP: change default timeout to 5sec Signed-off-by: Michael Niedermayer commit a22500744bf878e1c8f9dfd1c6695e861f544780 Author: Michael Niedermayer Date: Mon May 30 02:36:49 2011 +0200 Revert "Timeout TCP open() after 5 seconds." This code is redundant and conflicts with lucas reimplementation of it. This reverts commit a2f5e14a867768019b49b830e29801f1bfb2abb7. commit 5a35cef4b102ba99c31f83db8092b4d36383b044 Merge: adba9c6 371266d Author: Michael Niedermayer Date: Mon May 30 01:23:11 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: ARM: enable UAL syntax in asm.S v4l2: don't leak video standard string on error. swscale: Remove disabled code. avfilter: Surround function only used in debug mode by appropriate #ifdef. vf_crop: Replace #ifdef DEBUG + av_log() by av_dlog(). build: remove BUILD_ROOT variable vp8: use av_clip_uintp2() where possible Merged-by: Michael Niedermayer commit adba9c63525b8971fc6ccda47e643dca05c3ee9d Author: Clément BÅ“sch Date: Sun May 29 21:07:34 2011 +0200 Fix various unused variable warnings Signed-off-by: Michael Niedermayer commit fd38a15adf7f4e20f25d89f162e4a8fbbd8ec92e Author: Clément BÅ“sch Date: Sun May 29 21:07:35 2011 +0200 Fix various bad printf format warnings Signed-off-by: Michael Niedermayer commit 371266daa3df35c424203fff0ce2e6de0e33a29d Author: Mans Rullgard Date: Sun May 29 14:22:52 2011 +0100 ARM: enable UAL syntax in asm.S This enables UAL syntax for all asm files instead of only those which happen to be incompatible with the old, deprecated syntax. Signed-off-by: Mans Rullgard commit bb9b7bc62eb645d127cbf283b8f86fd4b6b3c916 Author: Reimar Döffinger Date: Sun May 29 15:31:20 2011 +0200 Remove now unused nb_istreams variable. commit 89c687e97e6544414e11808d99d7a56729b79ef8 Author: Reimar Döffinger Date: Sun May 29 15:25:17 2011 +0200 Add const to vector types for input in altivec code. Avoids a large amount of warnings about cast discarding qualifiers. commit 4596d0f4c448e7cec37818cd3ee3583346083f28 Author: Reimar Döffinger Date: Sun May 29 15:23:28 2011 +0200 Remove unused variable, avoiding compiler warning. commit 54dc95634d1d15d5d6e3c7c361610c8eec97e75e Author: Reimar Döffinger Date: Sun May 29 15:22:15 2011 +0200 Cast pointers to uintptr_t rather than unsigned int. Avoids potential warnings on PPC64 systems. commit 7a70e01b267b499d92fda68724d311c94cd76b26 Author: Anton Khirnov Date: Fri May 27 09:32:17 2011 +0200 v4l2: don't leak video standard string on error. commit 06b5facd4b8cb19da352cec71b2edf2f0343ee35 Author: Diego Biurrun Date: Fri Apr 29 19:35:08 2011 +0200 swscale: Remove disabled code. commit d6e0729b24de566a80554abbdf0aca1ed24de14b Author: Diego Biurrun Date: Fri May 27 20:24:44 2011 +0200 avfilter: Surround function only used in debug mode by appropriate #ifdef. This fixes the warning: libavfilter/avfilter.c:219: warning: ‘ff_get_ref_perms_string’ defined but not used commit 2146f4928a45b37eba781a74aa8cc9ae50e89d52 Author: Diego Biurrun Date: Fri May 27 20:22:55 2011 +0200 vf_crop: Replace #ifdef DEBUG + av_log() by av_dlog(). commit 798b26467877007418d21722d59c769d17ed7233 Author: Mans Rullgard Date: Sat May 28 13:10:01 2011 +0100 build: remove BUILD_ROOT variable This variable is unnecessary as absolute paths are not required. Signed-off-by: Mans Rullgard commit b8a43bc1b50f409414493a05f6c4b7895ca4ddf9 Merge: 39d607e 90da52f Author: Michael Niedermayer Date: Sun May 29 02:55:19 2011 +0200 Merge remote-tracking branch 'qatar/master' into master * qatar/master: (27 commits) ac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits() ac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits. ac3dsp: fix loop condition in ac3_update_bap_counts_c() ARM: unbreak build ac3enc: modify mantissa bit counting to keep bap counts for all values of bap instead of just 0 to 4. ac3enc: split mantissa bit counting into a separate function. ac3enc: store per-block/channel bap pointers by reference block in a 2D array rather than in the AC3Block struct. get_bits: add av_unused tag to cache variable sws: replace all long with int. ARM: aacdec: fix constraints on inline asm ARM: remove unnecessary volatile from inline asm ARM: add "cc" clobbers to inline asm where needed ARM: improve FASTDIV asm ac3enc: use LOCAL_ALIGNED macro APIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7). lavu: add av_get_pix_fmt_name() convenience function cmdutils: remove OPT_FUNC2 swscale: fix crash in bilinear scaling. vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping webm: support stereo videos in matroska/webm muxer ... Conflicts: Changelog cmdutils.c cmdutils.h doc/APIchanges doc/muxers.texi ffmpeg.c ffplay.c libavcodec/ac3enc.c libavcodec/ac3enc_float.c libavcodec/avcodec.h libavcodec/get_bits.h libavcodec/libvpxenc.c libavcodec/version.h libavdevice/libdc1394.c libavformat/matroskaenc.c libavutil/avutil.h libswscale/rgb2rgb.c libswscale/swscale.c libswscale/swscale_template.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer commit 42761122779dea2629cfc54a8bbe5d327e729c6e Author: Mans Rullgard Date: Sat May 28 17:20:49 2011 +0100 vp8: use av_clip_uintp2() where possible Signed-off-by: Mans Rullgard commit 39d607e5bbc25ad9629683702b510e865434ef21 Author: Michael Niedermayer Date: Fri May 27 23:50:06 2011 +0200 swscale: Commits that could not be pulled earlier due to bugs #2 commit 5a5a0f161359ca6c3fd03eac88a57bd026b8bc1d Author: Diego Biurrun Date: Fri May 27 19:46:39 2011 +0200 swscale: Remove unused variables in x86 code. libswscale/x86/swscale_template.c:2072: warning: unused variable ‘canMMX2BeUsed’ libswscale/x86/swscale_template.c:2145: warning: unused variable ‘canMMX2BeUsed’ libswscale/x86/swscale_template.c:2209: warning: unused variable ‘chrVPixBuf’ libswscale/x86/swscale_template.c:2237: warning: unused variable ‘chrVSrcPtr’ commit 389e2000ebc299b9da24f7e5faf9a68a88f9ee7c Author: Ronald S. Bultje Date: Fri May 27 12:23:32 2011 -0400 swscale: delay allocation of formatConvBuffer(). That means it won't be allocated when not needed. Alongside this, it fixes valgrind/fate-detected memory leaks. commit f327bfa6dcdbce4593213c30a328d8aaf7a4b86b Author: Ronald S. Bultje Date: Fri May 27 11:36:43 2011 -0400 swscale: fix build with --disable-swscale-alpha. commit 9f5d45025e8df9d5f39832caad16b94cb6ac11c5 Author: Ronald S. Bultje Date: Fri May 27 09:28:38 2011 -0400 swscale: fix non-bitexact yuv2yuv[X2]() MMX/MMX2 functions. commit 986f0d86cbdc92f46e5fbba05fb29526b76162be Author: Michael Niedermayer Date: Sat May 28 15:52:50 2011 +0200 Commits that could not be pulled earlier due to bugs. commit 93681fbd5082a3af896b7a730dacdd27a3052406 Author: Ronald S. Bultje Date: Thu May 26 11:32:32 2011 -0400 swscale: fix compile on ppc. commit e758573a887cfb1155e81499ca54f433127cf24e Author: Ronald S. Bultje Date: Thu May 26 10:36:47 2011 -0400 swscale: fix compile on x86-32. commit 0f4eb8b04341081591bf401eaa2c07d6bc3ff52e Author: Ronald S. Bultje Date: Thu May 26 09:17:52 2011 -0400 swscale: remove VOF/VOFW. commit b4a224c5e4109cb2cca8bac38628673d685fe763 Author: Ronald S. Bultje Date: Wed May 25 14:30:09 2011 -0400 swscale: split chroma buffers into separate U/V planes. Preparatory step to implement support for sizes > VOFW. commit ea535ed50d1b8d751e2d194a987295ab38daf1a2 Author: Michael Niedermayer Date: Sun May 29 00:11:39 2011 +0200 Revert 1a5e4fd8c5b99478b4e08a69261930bb12aa948b for postproc. This broke the code Signed-off-by: Michael Niedermayer commit 011b098cd0ae7296651d36ae7da400d5d04337c3 Author: James Zern Date: Fri May 27 16:31:59 2011 -0700 doc: correct AC-3 option subsection placement Floating-Point-Only section was added after the video encoders chapter in 034fc7b merge. commit 90da52f01f8b6c22af22a002eb226989b1cf7ef8 Author: Mans Rullgard Date: Sat May 28 20:27:09 2011 +0100 ac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits() Signed-off-by: Mans Rullgard commit 70bb747a57d8df6f33803bb4824b0a447c708823 Author: Justin Ruggles Date: Sat May 28 14:39:18 2011 -0400 ac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits. this should fix the windows builds Signed-off-by: Martin Storsjö commit 9222dddb448789b138a106ed677f3c628c85a840 Author: Ronald S. Bultje Date: Wed May 25 15:28:12 2011 -0400 swscale: use av_clip_uint8() in yuv2yuv1_c(). commit 485d73ef215323ead6cb58a83853d1f6b52ede54 Author: Ronald S. Bultje Date: Thu May 26 09:15:38 2011 -0400 swscale: replace formatConvBuffer[VOF] by allocated array. This allows to convert between formats of arbitrary width, regardless of the value of VOF/VOFW. commit 895e4de8d5a0760a48ba968546693d9094a62013 Author: Stefano Sabatini Date: Sat May 28 20:59:27 2011 +0200 v4l2: create file @doxy from text in the copyright header commit 72c60f3ecdd8a9e1760c3929376de3f17ab9e74a Author: Stefano Sabatini Date: Sat May 28 20:58:32 2011 +0200 v4l2: remove pointless empty lines commit af344a69f3a8240b508183586617fba6af698bb2 Author: Stefano Sabatini Date: Sat May 28 20:47:17 2011 +0200 v4l2: set default standard to NULL Avoid a failure with the default value of "NTSC". Not all drivers support a standard. commit f8f3f6c40bb452bb716096f455391f3fba324190 Author: Stefano Sabatini Date: Sat May 28 20:38:06 2011 +0200 v4l2: use OFFSET macro when setting options Improve readability. commit dc0ad40de2b0d6995eb842e56b22f9096bd539ff Author: Justin Ruggles Date: Sat May 28 14:40:16 2011 -0400 ac3dsp: fix loop condition in ac3_update_bap_counts_c() commit edfa89b2608889626bb6c6b177283b6fd16716cf Author: Mans Rullgard Date: Sat May 28 18:36:07 2011 +0100 ARM: unbreak build Signed-off-by: Mans Rullgard commit b2a6f25c67cca644257f008c8de83e4939f87196 Author: Stefano Sabatini Date: Fri May 27 01:34:35 2011 +0200 lavdev: add SDL output device commit 6ca23db9cccac05bef9bf9c665821b396af12a0b Author: Justin Ruggles Date: Thu May 26 15:53:25 2011 -0400 ac3enc: modify mantissa bit counting to keep bap counts for all values of bap instead of just 0 to 4. This does all the actual bit counting as a final step. commit 1323828a0fbfa428d2e39a9f094039637b7fef5b Author: Justin Ruggles Date: Thu May 26 12:31:31 2011 -0400 ac3enc: split mantissa bit counting into a separate function. No speed difference. This is to allow for more flexible bit counting. commit 7743865ffcb921a78a913b3de5a6d80248954d71 Author: Justin Ruggles Date: Thu May 26 15:57:21 2011 -0400 ac3enc: store per-block/channel bap pointers by reference block in a 2D array rather than in the AC3Block struct. This will make it easier to access the bap values without having to chase the reference block pointers each time. commit e71f26086ab899be7df1efb30b33e0a11973fd8e Author: Stefano Sabatini Date: Thu May 26 19:19:18 2011 +0200 lavu: add av_get_pix_fmt_name() convenience function Also deprecate avcodec_get_pix_fmt_name() in its favor. commit 34e9c9b11192271a4e5d0557441d09686852c771 Author: Stefano Sabatini Date: Sat May 28 10:50:11 2011 +0200 iff: remove duplicated file description commit eb8bc57240d5d3e4680ff1df18a0a7792e96bd0c Author: Stefano Sabatini Date: Tue May 24 18:14:42 2011 +0200 cmdutils: remove OPT_FUNC2 Make ff* tools only accept opt_* functions taking two arguments. The distinction between functions with one and two arguments is quite pointless. Simplify parse_options() code. commit e01e05ee66f7ea26dd7574501e329aa5b8e788ef Author: Mans Rullgard Date: Sat May 28 15:46:55 2011 +0100 get_bits: add av_unused tag to cache variable This silences numerous compiler warnings from skip_bits(), where the cache variable is not used. Signed-off-by: Mans Rullgard commit b8e893399ff8755721dc117695ec5ff183c1e07b Author: Anton Khirnov Date: Thu May 26 18:57:26 2011 +0200 sws: replace all long with int. Signed-off-by: Ronald S. Bultje commit 7d8c17b5f62bc14d5f7c7c792630b23240b47eec Author: Mans Rullgard Date: Fri May 27 22:52:49 2011 +0100 ARM: aacdec: fix constraints on inline asm This adds output operands for modified memory allowing the volatile qualifiers to be dropped. Signed-off-by: Mans Rullgard commit 84e4804ad08a6371e9368c7db8c5d9e2c81e175d Author: Mans Rullgard Date: Fri May 27 22:49:28 2011 +0100 ARM: remove unnecessary volatile from inline asm Signed-off-by: Mans Rullgard commit 5726ec171bf7cb833f8445d9a294f23fc047a549 Author: Mans Rullgard Date: Fri May 27 21:59:46 2011 +0100 ARM: add "cc" clobbers to inline asm where needed Signed-off-by: Mans Rullgard commit a84f82560e3fa6aa41de64b0a5b75d1d607599aa Author: Mans Rullgard Date: Fri May 27 21:43:15 2011 +0100 ARM: improve FASTDIV asm This uses one register less. Also add missing "cc" clobber. Signed-off-by: Mans Rullgard commit 7f7726c7a23f8ca9d8cd5d2511356d724d4284a3 Author: Mans Rullgard Date: Fri May 27 20:31:57 2011 +0100 ac3enc: use LOCAL_ALIGNED macro Aligned local variables must use the LOCAL_ALIGNED macro to ensure correct alignment on all systems. The unusual size argument to memset is required since the implementation of LOCAL_ALIGNED may use a pointer to an array. Signed-off-by: Mans Rullgard commit 04de5bf56c1f1f946272f436d9c8cb82c63d30b4 Author: Ronald S. Bultje Date: Sat May 28 09:46:42 2011 -0400 APIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7). commit 8f653e28f54d6629c22a7135dff4c32dfc95acda Author: Stefano Sabatini Date: Sat May 28 02:39:20 2011 +0200 lavu: add av_get_pix_fmt_name() convenience function Also deprecate avcodec_get_pix_fmt_name() in its favor. Signed-off-by: Ronald S. Bultje commit 26513856d657de3b3afacae7c13fd99a7fe79d05 Author: Stefano Sabatini Date: Sat May 28 01:53:00 2011 +0200 cmdutils: remove OPT_FUNC2 Make ff* tools only accept opt_* functions taking two arguments. The distinction between functions with one and two arguments is quite pointless. Simplify parse_options() code. Signed-off-by: Ronald S. Bultje commit 009f829dde811af654af7110326aea3a72c05d5e Author: Ronald S. Bultje Date: Fri May 27 19:01:47 2011 -0400 swscale: fix crash in bilinear scaling. commit 88aa21593932fbf5597996041ab669848c542ee5 Author: James Zern Date: Tue Apr 12 04:40:47 2011 +0200 vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping via the equivalent AVCodecContext::mb_threshold Signed-off-by: Michael Niedermayer commit 945dda41a2085b3c8fb5cf99026c224aa3d2cbfa Author: Alok Ahuja Date: Sat May 28 08:12:22 2011 +0200 webm: support stereo videos in matroska/webm muxer Create a stereo_mode metadata tag to specify the stereo 3d video layout using the StereoMode tag in a matroska/webm video track. commit 78046dadc3145a7afd16034ab1178033a053a03e Author: Ronald S. Bultje Date: Tue May 24 18:28:40 2011 -0400 rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions. Many functions have such a prefix, but do not actually use any instructions or features from that set, thus giving the false impression that swscale is highly optimized for a particular system, whereas in reality it is not. commit fc72ec727e8731d57ede82502081366921667486 Author: Ronald S. Bultje Date: Tue May 24 17:50:03 2011 -0400 swscale: reindent h[cy]scale_fast() and updateDitherTables(). commit c3f07903ec47d2fa6ee59a1129df3f25ad22e6eb Author: Ronald S. Bultje Date: Thu May 26 09:11:29 2011 -0400 swscale: reformat x86/swscale_template.c. Interleave macros and code so that it's easier to find the actual code that belongs to a function. Also reindent where appropriate and remove dead code. commit 1dbf40c38392eab5b893aadcfbb48b589ff1471f Author: Ronald S. Bultje Date: Tue May 24 16:45:41 2011 -0400 swscale: remove duplicate mmx/mmx2 functions if they are identical. commit 264dcc63afdb7c5bd6b5e8c0d8e95dd45c2e9f3e Author: Ronald S. Bultje Date: Tue May 24 16:02:47 2011 -0400 swscale: remove if (c->dstFormat) branch from yuv2packed[12X](). This allows cutting up the function in much smaller and easier- to-maintain chunks. commit f2a3b23051c61a38ba5cb04414e6ebe0986041da Author: Ronald S. Bultje Date: Tue May 24 15:18:40 2011 -0400 swscale: remove if(full_chr_int) from yuv2packed1(). If that flag is set, swScale() already proxies the call to yuv2rgbXinC_full(). Therefore, this flag is never set when yuv2packed1() is called. commit 835ab9207e029ebbf7e77a3ae61f89ad7e9df82d Author: Ronald S. Bultje Date: Tue May 24 15:16:19 2011 -0400 swscale: remove if(accurate_rnd) branch from functions. commit 2b04858a100fd8f4a803d25bfdd97bb77ef9ece9 Author: Anton Khirnov Date: Wed May 25 21:47:31 2011 +0200 swscale: revive SWS_CPU_CAPS until next major bump. commit 11f2eae2aeb3c5b8a1f59efb9ccd9144b3aa074f Author: Diego Biurrun Date: Thu May 26 01:40:56 2011 +0200 swscale: Remove commented-out printf cruft. commit 5501afa6ee857693bf4fe745792ab7b79477f731 Author: Kieran Kunhya Date: Fri Mar 11 12:39:55 2011 +0000 Export PCR pid commit 24adef142f4901abf7e92e79d20b79f332d5c54f Author: Kieran Kunhya Date: Fri Mar 4 19:22:09 2011 +0000 Export more transport stream information. with minor addition to the comment by michael commit fa12fb3b00cb4e08a38a4fb192293347c218b3d3 Author: Kieran Kunhya Date: Fri Mar 4 15:09:32 2011 +0000 Output MPEG-TS stream identifiers. with changes by michael to simplify API commit 8381ab143779d25611a1bb05d674bc39fe940f77 Merge: b8773e4 79aeade Author: Michael Niedermayer Date: Fri May 27 23:47:05 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: (29 commits) ARM: disable ff_vector_fmul_vfp on VFPv3 systems ARM: check for VFPv3 swscale: Remove unused variables in x86 code. doc: Drop DJGPP section, Libav now compiles out-of-the-box on FreeDOS. x86: Add appropriate ifdefs around certain AVX functions. cmdutils: use sws_freeContext() instead of av_freep(). swscale: delay allocation of formatConvBuffer(). swscale: fix build with --disable-swscale-alpha. movenc: Deprecate the global RTP hinting flag, use a private AVOption instead movenc: Add an AVClass for setting muxer specific options swscale: fix non-bitexact yuv2yuv[X2]() MMX/MMX2 functions. configure: report yasm/nasm presence properly tcp: make connect() timeout properly rawdec: factor video demuxer definitions into a macro. rtspdec: add initial_pause private option. lavf: deprecate AVFormatParameters.width/height. tty: add video_size private option. rawdec: add video_size private option. x11grab: add video_size private option. x11grab: factorize returning error codes. ... Merged-by: Michael Niedermayer commit f91ccb1df6fe6d043bd88eabc916be1093b6677b Author: Anton Khirnov Date: Fri May 27 07:38:49 2011 +0200 lavf: deprecate AVFormatParameters.pix_fmt. commit 2a85f218680832bc8a22155c8d5225bdb9c10279 Author: Anton Khirnov Date: Tue May 24 09:02:11 2011 +0200 rawdec: add a pixel_format private option. commit d576bbf3eb0eb2a421f0c3efb2b78a47a1826cf5 Author: Anton Khirnov Date: Tue May 24 09:02:11 2011 +0200 v4l2: add a pixel_format private option. commit 2e0e1e712aa263d919ebb842567977195dfa4774 Author: Anton Khirnov Date: Tue May 24 09:02:11 2011 +0200 libdc1394: add a pixel_format private option. commit 1a950da6a2d981d53f61d42f3a078888b00db091 Author: Justin Ruggles Date: Tue May 24 19:38:30 2011 -0400 cosmetics: indentation and alignment after previous commit commit aa47c35dff263f19f64f10a93ea9e4da4e395ede Author: Justin Ruggles Date: Tue May 24 15:20:56 2011 -0400 ac3enc: add support for E-AC-3 encoding. This adds basic stream format support and allows for arbitrary bit rates rather than just those supported in AC-3. commit b1bf8c7887395b08a68072c80f11b0c53d8e785a Author: Justin Ruggles Date: Tue May 24 15:14:36 2011 -0400 ac3enc: Move AC-3 AVOptions array to a separate file to make it easier to use only selected options for the different AC-3 encoder types. commit 79aeade6f6f8fbd7ce1da619fdd475e5db88ae24 Author: Mans Rullgard Date: Fri May 27 20:18:26 2011 +0100 ARM: disable ff_vector_fmul_vfp on VFPv3 systems This function uses old-style vector operations deprecated in VFPv3. Some implementations, e.g. Cortex-A9, support them only through slow software emulation. Cortex-A8 does have this functionality in hardware, but as it also has NEON, this function is not used there regardless. Signed-off-by: Mans Rullgard commit 93eb8e4d7c6654040fd160396546c547cdf51043 Author: Mans Rullgard Date: Fri May 27 20:12:01 2011 +0100 ARM: check for VFPv3 Signed-off-by: Mans Rullgard commit 5a5a0f161359ca6c3fd03eac88a57bd026b8bc1d Author: Diego Biurrun Date: Fri May 27 19:46:39 2011 +0200 swscale: Remove unused variables in x86 code. libswscale/x86/swscale_template.c:2072: warning: unused variable ‘canMMX2BeUsed’ libswscale/x86/swscale_template.c:2145: warning: unused variable ‘canMMX2BeUsed’ libswscale/x86/swscale_template.c:2209: warning: unused variable ‘chrVPixBuf’ libswscale/x86/swscale_template.c:2237: warning: unused variable ‘chrVSrcPtr’ commit 7eae0110022063d0b3eb423c46dea5eff5268797 Author: Diego Biurrun Date: Thu May 26 14:39:37 2011 +0200 doc: Drop DJGPP section, Libav now compiles out-of-the-box on FreeDOS. commit 5e528cffcf3d2cb1665075649601f4e62c8764e1 Author: Diego Biurrun Date: Fri May 27 21:18:12 2011 +0200 x86: Add appropriate ifdefs around certain AVX functions. nasm versions prior to 2.09 have trouble assembling some of our AVX code. Protect these sections by preprocessor macros to allow compilation to pass. commit faf8d3ddfa105d7f107a886c5f3cadf6357d89b6 Author: Ronald S. Bultje Date: Fri May 27 11:57:39 2011 -0400 cmdutils: use sws_freeContext() instead of av_freep(). av_freep(swsContext) will leak all memory potentially allocated within the swsContext. commit 389e2000ebc299b9da24f7e5faf9a68a88f9ee7c Author: Ronald S. Bultje Date: Fri May 27 12:23:32 2011 -0400 swscale: delay allocation of formatConvBuffer(). That means it won't be allocated when not needed. Alongside this, it fixes valgrind/fate-detected memory leaks. commit f327bfa6dcdbce4593213c30a328d8aaf7a4b86b Author: Ronald S. Bultje Date: Fri May 27 11:36:43 2011 -0400 swscale: fix build with --disable-swscale-alpha. commit 28734ac995ef4ea9be2203144362a585b2296637 Author: Martin Storsjö Date: Fri May 20 12:27:02 2011 +0300 movenc: Deprecate the global RTP hinting flag, use a private AVOption instead Instead of -fflags rtphint, set -movflags rtphint instead. Signed-off-by: Martin Storsjö commit 91e3a25ef6de2efcbea38ec0f6ffd3f8785962a2 Author: Martin Storsjö Date: Sat May 21 14:57:04 2011 +0300 movenc: Add an AVClass for setting muxer specific options Signed-off-by: Martin Storsjö commit b8773e44d56667edea2d68d067d0c156522ca304 Author: Martin Lambers Date: Thu May 26 08:16:58 2011 +0200 libdc1394: choose best video mode and rate based on camera capabilities. commit ea7e318fb2d7a7c2395d87c93d1d5f703166ac0d Author: Martin Lambers Date: Wed May 25 11:28:30 2011 +0200 Remove support for libdc1394 < 2.0. Versions >= 2.0 have been around for a very long time now. commit 87ababd7c5adb6d82a3a642b9b6e2223b3a4025b Author: Michael Niedermayer Date: Fri May 27 16:54:22 2011 +0200 avopt: fix segfault Signed-off-by: Michael Niedermayer commit 9f5d45025e8df9d5f39832caad16b94cb6ac11c5 Author: Ronald S. Bultje Date: Fri May 27 09:28:38 2011 -0400 swscale: fix non-bitexact yuv2yuv[X2]() MMX/MMX2 functions. commit 041dbd3c145046e1bfd35079d23c6843a2f703cb Author: Michael Niedermayer Date: Fri May 27 12:47:03 2011 +0200 swscale: dont loose precission on RGB/BGR48 input, that is dont drop half the bits. Signed-off-by: Michael Niedermayer commit f642982c10dd2257a372e36c00c66b8a57954ae1 Author: Michael Niedermayer Date: Fri May 27 11:50:38 2011 +0200 patch checklist: suggest --disable-yasm test. Signed-off-by: Michael Niedermayer commit 6b899e16de94c05203008d969523a642147a5e4b Author: Stefano Sabatini Date: Thu May 26 19:11:25 2011 +0200 lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h commit e48993e3cf532a1713562a147c244b267f5ab713 Author: Stefano Sabatini Date: Fri May 27 10:52:34 2011 +0200 lavdev: include libavformat/avformat.h in avdevice.h The header is always required for files which directly deal with devices, since libavdevice uses the AVFormat* structures defined in avformat.h. Avoid the need to explicitely add libavformat/avformat.h. commit ec76ef5ae251f82ab1080abb83ed7d619f2a002e Author: Stefano Sabatini Date: Thu May 26 16:02:55 2011 +0200 fate.txt: replace FATE rsync command with a make command Remove reference to the mplayerhq.hu rsync command, and replace it with a reference to the make fate-rsync command. rsync needs still to be enabled on mplayerhq.hu, and it is currently not working. Also the fate-rsync Makefile target can be easily updated without the need to keep the docs in synch. commit 6348a96c06ca152f32fddac58552dd679d39eddf Author: Luca Barbato Date: Thu May 26 20:03:37 2011 +0200 configure: report yasm/nasm presence properly If the secondary assembler is in use report the proper name commit ebb6b27ad9a72de2382a4eb438a11043273c4cad Author: Luca Barbato Date: Fri May 20 14:09:21 2011 +0200 tcp: make connect() timeout properly The connect() timeout can take minutes, gets misreported as EIO and isn't interruptible. commit fa4924a35818b2564050119ed7c14cbdd2b56065 Author: Anton Khirnov Date: Wed May 25 08:14:13 2011 +0200 rawdec: factor video demuxer definitions into a macro. commit 4779f59378d54f30644ef79ce3a5c402546f3cb9 Author: Anton Khirnov Date: Tue May 24 08:44:10 2011 +0200 rtspdec: add initial_pause private option. Deprecate corresponding AVFormatParameters field. commit 89d1b7f40671e0d455fe6b6670bf6f2bcf2eea2e Author: Anton Khirnov Date: Thu May 26 08:14:03 2011 +0200 lavf: deprecate AVFormatParameters.width/height. commit 06d8c9e5f0d9db605830d36678ccefeceddce610 Author: Anton Khirnov Date: Tue May 24 07:43:01 2011 +0200 tty: add video_size private option. commit 973f686a6c4f7c3b9120a1e22cb7c0159ea9aee2 Author: Anton Khirnov Date: Tue May 24 07:43:01 2011 +0200 rawdec: add video_size private option. commit 724a900c454f7b41066edcc0443bff083d59f81c Author: Anton Khirnov Date: Tue May 24 07:43:01 2011 +0200 x11grab: add video_size private option. commit 3102fb0351fb9dd96543b3f1b9c4c04758226ee5 Author: Anton Khirnov Date: Thu May 26 21:17:05 2011 +0200 x11grab: factorize returning error codes. commit 3e15ea21504a5cc1765afd78dd72ef486a10a27b Author: Anton Khirnov Date: Tue May 24 07:43:01 2011 +0200 vfwcap: add video_size private option. commit 8fe7b6443fe8721215f1abac3b854cd52092c909 Author: Anton Khirnov Date: Tue May 24 07:43:01 2011 +0200 v4l2: add video_size private option. commit 82b5aa0add203e6e90e3bbefbb9eb02118256ff6 Author: Anton Khirnov Date: Thu May 26 20:37:08 2011 +0200 v4l2: factorize returning error codes. This will be useful in the following commit. commit fd48620e3e259cdb8df9e7d677a943d6e7d3575b Author: Anton Khirnov Date: Tue May 24 07:43:01 2011 +0200 libdc1394: add video_size private option. commit 284bac2e7770685831a8389e8f2eaae977d4daa4 Author: Anton Khirnov Date: Thu May 26 17:13:09 2011 +0200 libdc1394: return meaninful error codes. commit 33e036967253b83621f378a75d3e4ed199bf4508 Author: Anton Khirnov Date: Tue May 24 07:43:01 2011 +0200 bktr: add video_size private option. commit 3577416212d992f63352f3695c6eb1b63567503d Author: Anton Khirnov Date: Thu May 26 20:14:53 2011 +0200 bktr: factorize returning error codes. This will be useful in the following commit. commit 5e0dafe8caa9ba1e87dfc51aa25ebb9fea61ed42 Author: Etienne Buira Date: Thu May 26 21:02:50 2011 +0200 Fix memleak Signed-off-by: Michael Niedermayer commit 28768579aafd31acc74b6534dbc3ed91548afe83 Author: Etienne Buira Date: Thu May 26 21:00:37 2011 +0200 Fix typo Signed-off-by: Michael Niedermayer commit 152d3519445e59567fea53e18332768072fd6348 Author: Etienne Buira Date: Thu May 26 19:52:16 2011 +0200 Remove specific note when not specific Signed-off-by: Michael Niedermayer commit 5918d16742277f417f28ae59417b871a2ed8b39c Author: Etienne Buira Date: Thu May 26 19:48:59 2011 +0200 Minor cleanup in libx264.c Not needed as overwritten later on (look for "// update AVCodecContext with x264 parameters"), and not accessed inbetween. Signed-off-by: Michael Niedermayer commit 2660e9e1f398dbc8d447164a772b52281fa94a30 Author: Tomas Härdin Date: Thu May 26 09:29:03 2011 +0200 Add metadata conversion table to the wav demuxer Signed-off-by: Michael Niedermayer commit 027264cb82134c83413810810b24340f6290e11a Merge: 701012d ca7d825 Author: Michael Niedermayer Date: Fri May 27 01:47:34 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: (31 commits) ARM: add ARMv6 optimised av_clip_uintp2 ARM: remove volatile from asm statements in libavutil/intmath ARM: fix av_clipl_int32_arm() v4l: include avdevice.h ffserver: move close_connection() call to avoid a temporary string and copy. lavf: initialize demuxer private options. AVOptions: set string default values. lavdevice: mark v4l for removal on next major bump. swscale: fix compile on ppc. swscale: fix compile on x86-32. build: Remove generated .version file on distclean. configure: Add -D_GNU_SOURCE to CPPFLAGS on OS/2. doc: Drop hint at --enable-memalign-hack for MinGW, it is now autodetected. ffplay: Remove disabled code. Mark parameterless function declarations as 'void'. swscale: use av_clip_uint8() in yuv2yuv1_c(). swscale: remove VOF/VOFW. swscale: split chroma buffers into separate U/V planes. swscale: replace formatConvBuffer[VOF] by allocated array. rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions. ... Merged-by: Michael Niedermayer commit 701012d676042608cd6ec3317c1936a246f436d7 Author: Carl Eugen Hoyos Date: Thu May 26 23:49:17 2011 +0200 Fix 32bit rawvideo in avi on big-endian. commit 86f868771bac89168086285b71186fd8cf934cc3 Author: Alex Converse Date: Wed May 25 17:57:33 2011 -0700 id3v2: Check malloc result. ID3v2 tags can be very large. commit 40a5dd2f35e0cfcfb92475a8f305fb6f78038507 Author: Alex Converse Date: Wed May 25 17:03:12 2011 -0700 id3v2: Initialize tflags for version 2.2. commit a138121bf1f952073914d493c099ebfea22ac5f7 Author: James Zern Date: Thu May 26 20:20:36 2011 +0200 webm: Additional options/presets for VP8 encodes under FFmpeg commit 094aa84b03632370dde171935171321bbfa9548b Author: James Zern Date: Thu May 26 20:19:04 2011 +0200 muxers: Add a flag to mark muxers that allow (non strict) monotone timestamps. commit 2b6bfff2b21f07c5455ef873cc9331a1b7fbf83c Author: Michael Niedermayer Date: Thu May 26 15:32:33 2011 +0200 swscale: Do not loose precission on yuv values after rgb->yuv. Signed-off-by: Michael Niedermayer commit 5655469ee73bc7f5a975a909738a764b9be7949b Author: JULIAN GARDNER Date: Thu May 26 15:32:14 2011 +0200 libx264: support aspect Ratio Switch commit ca7d8256e32e4dbafadc54a65b441945ac759ca9 Author: Mans Rullgard Date: Tue May 24 15:46:28 2011 +0100 ARM: add ARMv6 optimised av_clip_uintp2 Signed-off-by: Mans Rullgard commit 77cd6efc33f45a5f7dbb37e10f49f55e9fe3c479 Author: Mans Rullgard Date: Tue May 24 15:45:50 2011 +0100 ARM: remove volatile from asm statements in libavutil/intmath The volatile qualifiers are not needed on these statements as their effects are fully specified by constraints. Signed-off-by: Mans Rullgard commit 74cc8c52ed42e269715e128d5aa0708b9f7ec463 Author: Mans Rullgard Date: Wed May 25 18:43:28 2011 +0100 ARM: fix av_clipl_int32_arm() Signed-off-by: Mans Rullgard commit 3d96c13e437e77a3220146aa466d89df52871fbd Author: Anton Khirnov Date: Thu May 26 20:32:05 2011 +0200 v4l: include avdevice.h Fixes build. commit e2d7dc87df0c1e261e4a3fe082d192a7a798d4d5 Author: Mike Williams Date: Wed May 18 09:14:22 2011 -0400 ffserver: move close_connection() call to avoid a temporary string and copy. Signed-off-by: Mike Williams Signed-off-by: Anton Khirnov commit 9749cdf7754e600ff50dc255519fdb7bb5aad800 Author: Anton Khirnov Date: Thu May 26 06:59:08 2011 +0200 lavf: initialize demuxer private options. commit 6c117d43c968629758c1b652e9b3a60cda6dcbac Author: Anton Khirnov Date: Thu May 26 08:48:31 2011 +0200 AVOptions: set string default values. commit 7e637b70ecd425fbe1479066a5751f26b9fce8a9 Author: Reimar Döffinger Date: Thu May 26 19:44:39 2011 +0200 Fix compilation with YASM/NASM versions not supporting AVX. commit aaea1490351bfd1e8f21cb4b7e4c25d82d090e94 Author: Anton Khirnov Date: Thu May 26 17:48:52 2011 +0200 lavdevice: mark v4l for removal on next major bump. commit 93681fbd5082a3af896b7a730dacdd27a3052406 Author: Ronald S. Bultje Date: Thu May 26 11:32:32 2011 -0400 swscale: fix compile on ppc. commit e758573a887cfb1155e81499ca54f433127cf24e Author: Ronald S. Bultje Date: Thu May 26 10:36:47 2011 -0400 swscale: fix compile on x86-32. commit 59748689f6d32cdd24080947a494093800f5629f Author: Diego Biurrun Date: Thu May 26 15:48:31 2011 +0200 build: Remove generated .version file on distclean. commit e14574eb68271fb9d1e255950c5a304f36d9a6ba Author: Diego Biurrun Date: Thu May 26 14:21:04 2011 +0200 configure: Add -D_GNU_SOURCE to CPPFLAGS on OS/2. The flag is required for some C99 math functions to be declared. commit 25101cf5bde4e05e22cbf0c53d8c82cbf56d0a35 Author: Diego Biurrun Date: Thu May 26 14:40:29 2011 +0200 doc: Drop hint at --enable-memalign-hack for MinGW, it is now autodetected. commit 6c6c976fa93be0aef731fc0884f784a9be81071e Author: Diego Biurrun Date: Tue Apr 26 14:29:14 2011 +0200 ffplay: Remove disabled code. commit e16942852979c44faaa8fcd6ad95d1ff3642368b Author: Diego Biurrun Date: Thu May 26 13:37:13 2011 +0200 Mark parameterless function declarations as 'void'. commit 48520772d9eba9725382be612f1dcd87d2fda2e6 Author: Ronald S. Bultje Date: Wed May 25 15:28:12 2011 -0400 swscale: use av_clip_uint8() in yuv2yuv1_c(). commit 0f4eb8b04341081591bf401eaa2c07d6bc3ff52e Author: Ronald S. Bultje Date: Thu May 26 09:17:52 2011 -0400 swscale: remove VOF/VOFW. commit b4a224c5e4109cb2cca8bac38628673d685fe763 Author: Ronald S. Bultje Date: Wed May 25 14:30:09 2011 -0400 swscale: split chroma buffers into separate U/V planes. Preparatory step to implement support for sizes > VOFW. commit 69645c021ad2cc503769b44b9008f98b014423de Author: Ronald S. Bultje Date: Thu May 26 09:15:38 2011 -0400 swscale: replace formatConvBuffer[VOF] by allocated array. This allows to convert between formats of arbitrary width, regardless of the value of VOF/VOFW. commit 522d65ba259a263d0cd91db27b79c07e13d7fcf2 Author: Ronald S. Bultje Date: Tue May 24 18:28:40 2011 -0400 rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions. Many functions have such a prefix, but do not actually use any instructions or features from that set, thus giving the false impression that swscale is highly optimized for a particular system, whereas in reality it is not. commit 836b82e3c9fd4ac2b5240e143fbd9ef6118cc12b Author: Ronald S. Bultje Date: Tue May 24 17:50:03 2011 -0400 swscale: reindent h[cy]scale_fast() and updateDitherTables(). commit e2bad983b510f0e963f38dab38397abbd346bc6c Author: Ronald S. Bultje Date: Thu May 26 09:11:29 2011 -0400 swscale: reformat x86/swscale_template.c. Interleave macros and code so that it's easier to find the actual code that belongs to a function. Also reindent where appropriate and remove dead code. commit 71d9c33c8693b3cdd1122765ec2daabc07ab116a Author: Ronald S. Bultje Date: Tue May 24 16:45:41 2011 -0400 swscale: remove duplicate mmx/mmx2 functions if they are identical. commit acb96bc268014efbf2353f3285106cfdabe3ff54 Author: Ronald S. Bultje Date: Tue May 24 16:02:47 2011 -0400 swscale: remove if (c->dstFormat) branch from yuv2packed[12X](). This allows cutting up the function in much smaller and easier- to-maintain chunks. commit b6cac9b3bfba262f33875c549382b816c8e8cf26 Author: Ronald S. Bultje Date: Tue May 24 15:18:40 2011 -0400 swscale: remove if(full_chr_int) from yuv2packed1(). If that flag is set, swScale() already proxies the call to yuv2rgbXinC_full(). Therefore, this flag is never set when yuv2packed1() is called. commit 2159a245738cfec80dfcdeba8d2fbdc2db0f711c Author: Ronald S. Bultje Date: Tue May 24 15:16:19 2011 -0400 swscale: remove if(accurate_rnd) branch from functions. commit db3262b700092e4012ae7564aa29eba1624a398c Author: Mike Williams Date: Wed May 18 11:03:10 2011 -0400 ffserver: Fix a null pointer dereference as a result of the FF_API_MAX_STREAMS cleanup. Fixed another dereference in the RTSP code. Removed a useless variable. Changed an unnecessary looping assignment to a simple assignment suggested by Maksym. Added fixes and tweaks suggested by Maksym Veremeyenko [verem@m1stereo.tv] and Clément B. commit 2341c97e8d737876693fc1e0ecfe7f9f6d2b7c57 Author: Anton Khirnov Date: Thu May 26 07:25:41 2011 +0200 libdc1394: fix compilation. Add a forgotten comma and move options/class definition outside of HAVE_LIBDC1394_1. commit c7a973e44aba0a2e59fdd8957738c32b9fae872e Author: Anton Khirnov Date: Wed May 25 21:47:31 2011 +0200 swscale: revive SWS_CPU_CAPS until next major bump. commit 00931991849f2c7f250ea583c749493cf1b611fc Author: Diego Biurrun Date: Thu May 26 01:40:56 2011 +0200 swscale: Remove commented-out printf cruft. commit 39e4206dc672a596c742809c1466f8643a787208 Merge: 189db9c a2ee284 Author: Michael Niedermayer Date: Thu May 26 03:00:37 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: (32 commits) doc: create separate section for audio encoders swscale: Remove orphaned, commented-out function declaration. swscale: Eliminate rgb24toyv12_c() duplication. Remove h263_msmpeg4 from MpegEncContext. APIchanges: Fill in git hash for fps_probe_size (30315a8) avformat: Add fpsprobesize as an AVOption. avoptions: Return explicitly NAN or {0,0} if the option isn't found rtmp: Reindent rtmp: Don't try to do av_malloc(0) tty: replace AVFormatParameters.sample_rate abuse with a private option. Fix end time of last chapter in compute_chapters_end ffmpeg: get rid of useless AVInputStream.nb_streams. ffmpeg: simplify managing input files and streams ffmpeg: purge redundant AVInputStream.index. lavf: deprecate AVFormatParameters.channel. libdc1394: add a private option for channel. dv1394: add a private option for channel. v4l2: reindent. v4l2: add a private option for channel. lavf: deprecate AVFormatParameters.standard. ... Conflicts: doc/APIchanges doc/encoders.texi ffmpeg.c libavdevice/alsa-audio.h libavformat/version.h libavutil/opt.c libswscale/rgb2rgb.h libswscale/rgb2rgb_template.c Merged-by: Michael Niedermayer commit 478455d66b80e335bdabc00df5dee298d630cbab Author: Justin Ruggles Date: Wed May 25 20:12:57 2011 -0400 ac3enc: initialize all coefficients to zero. Uninitialized coefficients were being used to generate exponents, some of which actually ended up in the final stream. Even though, they were just extra exponents that are not used by any decoder, it is still better to have consistent output for testing. This also fixes valgrind errors. commit 189db9c9829b970b3e28006c9f00d6960f71cff1 Author: Michael Niedermayer Date: Thu May 26 01:55:12 2011 +0200 ffv1: fix 16bits multithreading fixes ticket237 Signed-off-by: Michael Niedermayer commit a2ee2843c09a6116b090020eff8213b86ea98bdb Author: Stefano Sabatini Date: Thu May 19 19:41:19 2011 +0200 doc: create separate section for audio encoders Having a separate section for audio encoders simplifies navigation and is slightly more consistent with the rest of the manual. Signed-off-by: Diego Biurrun commit 6f7a280eadd719d0a5c9b72b63dfca61bb9605f5 Author: Diego Biurrun Date: Wed May 25 22:07:55 2011 +0200 swscale: Remove orphaned, commented-out function declaration. commit 7dc303a60ef7205d88a11ddbcb251f3237a3945e Author: Michael Niedermayer Date: Wed May 25 20:49:52 2011 +0200 swscale: Eliminate rgb24toyv12_c() duplication. Signed-off-by: Michael Niedermayer Signed-off-by: Diego Biurrun commit feae7ad2f809c8e1007503031e231d1590514d66 Author: ami_stuff Date: Wed May 25 23:38:16 2011 +0200 mpegvideo_enc: use AV_LOG_ERROR instead of AV_LOG_INFO for two error messages use AV_LOG_ERROR instead of AV_LOG_INFO for two error messages Signed-off-by: Michael Niedermayer commit 7a54edaa16be3673a2ae8110d1777462c7f6ed7c Author: ami_stuff Date: Wed May 25 19:53:38 2011 +0200 Fail when lowres value is lower than 0 The attached patch fixes the crash which happens when user passes lowres value lower than 0 to FFplay. ffplay -lowres -1 test.mpg Signed-off-by: Michael Niedermayer commit 8c51620f219db0f408d2833c3e5d56cedaf0d95a Author: Alex Converse Date: Tue May 24 16:28:45 2011 -0700 Remove h263_msmpeg4 from MpegEncContext. It was long ago superseded by msmpeg4_version. commit 19a686b8a373e93807880c63bd73303616c96b71 Author: Alex Converse Date: Wed May 25 12:36:41 2011 -0700 APIchanges: Fill in git hash for fps_probe_size (30315a8) commit 30315a8d9c9bea98d54260956db58b6df56f9347 Author: Alex Converse Date: Mon May 9 14:34:23 2011 -0700 avformat: Add fpsprobesize as an AVOption. commit b49728df732109c270af47f98b0d380cb1454c2a Author: Michael Niedermayer Date: Wed May 25 21:04:44 2011 +0200 swscale: document SWS_CPU_CAPS* Signed-off-by: Michael Niedermayer commit e92bdadb2d8bd5cb0b2c5bedf42a390371cc4824 Author: Michael Niedermayer Date: Wed May 25 21:03:26 2011 +0200 Revert removial of SWS flags from e66149e714006d099d1ebfcca3f22ca74fc7dcf4 Signed-off-by: Michael Niedermayer commit 80068da3a0bafc7e24ce6b1f91cefec7d793b4d2 Author: Martin Storsjö Date: Wed May 25 16:47:09 2011 +0300 avoptions: Return explicitly NAN or {0,0} if the option isn't found This actually matches what av_get_double did earlier, the 0.0/0.0 division was intentional, for producing NAN. Still keeping the check for the return value from av_get_number, for clarity. Signed-off-by: Martin Storsjö commit 48b1fb1397281dd16df909b6f33c2c36e5626f0a Author: Martin Storsjö Date: Wed May 25 22:01:15 2011 +0300 rtmp: Reindent Signed-off-by: Martin Storsjö commit 271c869cc3285dac2b6f2663a87c70bf3ba2b04f Author: Martin Storsjö Date: Wed May 25 19:08:29 2011 +0300 rtmp: Don't try to do av_malloc(0) Some received packets can have size 0. The return value from av_malloc(0) may be NULL, which is ok if the size was 0. On OS X, however, the returned pointer is non-null but leads to crashes when trying to free it. Signed-off-by: Martin Storsjö commit 4a056160bef8578dc1e370e2445f61f2459e3863 Author: Michael Niedermayer Date: Wed May 25 20:49:52 2011 +0200 swscale: remove duplicatiopn of rgb24toyv12_c() Signed-off-by: Michael Niedermayer commit 364889cf9c1f3c5e816a30d30d714a84765cfc29 Author: Jean-Tiare Le Bigot Date: Wed May 25 20:12:17 2011 +0200 Return -1 on invalid input instead of crashing. commit b8e3b7414733a685bd1f62d65cfdfafac6cc9027 Author: Stefano Sabatini Date: Wed May 25 18:29:55 2011 +0200 vf_mp: fix name of the remove-logo filter referenced in filters.texi Correct the name from "remove_logo" to "remove-logo". commit 67540af7baa5c4064753861be217ac8f7c8df997 Author: Anton Khirnov Date: Mon May 23 19:23:55 2011 +0200 tty: replace AVFormatParameters.sample_rate abuse with a private option. commit 656566d7a4fef9680e483f1015d4cc242d825202 Author: John Stebbins Date: Mon May 23 14:26:54 2011 -0700 Fix end time of last chapter in compute_chapters_end Parenthesis are misplaced in calculation of max_time. Signed-off-by: Anton Khirnov commit 2cf8355f98681bdd726b739008acd5483f82f8d7 Author: Anton Khirnov Date: Mon May 23 17:19:54 2011 +0200 ffmpeg: get rid of useless AVInputStream.nb_streams. It's a duplicate of AVFormatContext.nb_streams. commit 07633154add3cf59f281ba0c9eb689df4284e2cb Author: Anton Khirnov Date: Sun May 22 22:12:35 2011 +0200 ffmpeg: simplify managing input files and streams Grow the file and stream list in opt_input_file() instead of creating it all at once in transcode(). This is simpler and will be useful for following commits. commit d2bc4da15becf40c54e37af045963e3d13db5d8d Author: Anton Khirnov Date: Sun May 22 21:54:06 2011 +0200 ffmpeg: purge redundant AVInputStream.index. AVStream.index stores the same thing. commit d20576d01b6489e37813302c208df01068418bfb Author: Anton Khirnov Date: Mon May 23 22:06:09 2011 +0200 lavf: deprecate AVFormatParameters.channel. commit 79405e57dc1a1e2746c87cba677052d742dbb7ee Author: Anton Khirnov Date: Mon May 23 22:01:36 2011 +0200 libdc1394: add a private option for channel. commit 986f4f491840d7c440ef4ccde7adcef219be26f3 Author: Anton Khirnov Date: Mon May 23 21:55:44 2011 +0200 dv1394: add a private option for channel. commit 3d2a418605b23b475b4217a93e8e60660154e198 Author: Anton Khirnov Date: Tue May 24 07:23:29 2011 +0200 v4l2: reindent. commit a02fd06ab76c0abd7ef32f332a08177e6014b3a8 Author: Anton Khirnov Date: Mon May 23 21:53:44 2011 +0200 v4l2: add a private option for channel. commit fc68a8f7030227fc4fa8d83b9051aaf598cd12dd Author: Anton Khirnov Date: Mon May 23 21:40:44 2011 +0200 lavf: deprecate AVFormatParameters.standard. commit b3da2692115ea17190544883d15efa36219da99e Author: Anton Khirnov Date: Mon May 23 21:21:59 2011 +0200 v4l2: add a private option for video standard. commit a861ffeffa40dfc4f3d20c221c1accca99db23df Author: Anton Khirnov Date: Mon May 23 21:21:59 2011 +0200 v4l: add a private option for video standard. commit eb040dbbd39898f03e5057a21b0981a8ffe9f37b Author: Anton Khirnov Date: Mon May 23 20:58:07 2011 +0200 dv1394: add a private option for video standard. commit e199eb44fdccd06db7d2c373bc0324351543ded0 Author: Anton Khirnov Date: Mon May 23 20:45:36 2011 +0200 bktr: add a private option for video standard. commit bffd4dd1d36b1e9b9479c81b370c134ffb434e1a Author: Anton Khirnov Date: Mon May 23 20:13:28 2011 +0200 lavf: deprecate AVFormatParameters.{channels,sample_rate}. commit 5b3865fc5f9675dd55f7dd7d5ae3b9ed58c3310c Author: Anton Khirnov Date: Mon May 23 20:05:55 2011 +0200 rawdec: add sample_rate/channels private options. commit 2ea8faf39ff6f21c2faaf8f9bd060a6636ea65fc Author: Anton Khirnov Date: Mon May 23 19:03:10 2011 +0200 ALSA: add channels and sample_rate private options. commit 003e63b6df7ba08cce18c1830df9c49dd3f0f391 Author: Anton Khirnov Date: Mon May 23 19:02:40 2011 +0200 oss: add channels and sample_rate private options. commit a1a15a9993d45b2ec69e370ea1687dd7cb2b5794 Author: Anton Khirnov Date: Mon May 23 19:02:08 2011 +0200 sndio: add channels and sample_rate private options. commit fb37d573473d615cc323635fa5bc58fe16d14ee4 Author: Anton Khirnov Date: Mon May 23 21:06:14 2011 +0200 lavf: deprecate AVFormatParameters.mpeg2ts_raw. It doesn't do anything except produce an error message when set. commit 17a5556db598ba1e5550d89ae3e339c1161a218a Author: Anton Khirnov Date: Sat Apr 30 13:42:55 2011 +0200 mpegts: add compute_pcr option. Deprecate the corresponding AVFormatParameters field. commit 5dc8214420e4c48cdf48455329138db752d15cd0 Author: Anton Khirnov Date: Tue May 24 07:27:19 2011 +0200 lavf: add priv_class field to AVInputFormat. commit 07586b68a8a496e44c7c977599e1ec09d07fd57f Author: Stefano Sabatini Date: Sat May 7 02:06:25 2011 +0200 lavfi: add select filter Address trac issue #92. commit 3c2c52baecb6c8c2af62989462804af7765694c4 Author: Stefano Sabatini Date: Mon May 23 13:13:50 2011 +0200 eval: implement not() expression commit cf06e3e4dd8c1023fb1dcad905f3f77fdc1cf3fb Author: Stefano Sabatini Date: Fri May 20 01:00:59 2011 +0200 vsrc_buffer: return an error code if no frames are available Also decrease the log level of the corresponding message to WARNING, since the error is not fatal. commit 6b5e1825406a8180c72863bf63964ae50a8499db Author: Stefano Sabatini Date: Fri May 20 00:59:47 2011 +0200 ffmpeg: handle the case when get_filtered_frame() fails commit 48df6a241532f0702fc4fd10ddcbfac435e4027c Author: Stefano Sabatini Date: Tue May 17 22:21:33 2011 +0200 indeo3: add out-of-buffer write check Prevent out-of-buffer writes. In particular fix smclocki32.avi.1.1 crash, trac issue #114, roundup issue #1482. commit 39d983461a81766f06bf66c0be254f5bdd7b8eb5 Author: Reuben Thomas Date: Wed May 25 11:15:56 2011 +0200 Add reading of disc number to mov.c commit a3da17730e5704555d62a7eb32c1f988f8efed66 Author: John Stebbins Date: Wed May 25 09:43:55 2011 +0200 Fix end time of last chapter in compute_chapters_end(). commit 06fd213eb608c23f58e290cfad6262b94e30fc74 Author: Carl Eugen Hoyos Date: Wed May 25 09:43:14 2011 +0200 Do not reset channel_layout to 0. The channel_layout may have been set by the demuxer. commit ecf72542fac6d05d88efe4a7a474adb8ec291fbe Author: Stefano Sabatini Date: Wed May 25 09:37:25 2011 +0200 vsrc_buffer: remove duplicated file description commit 034fc7bf129152b94958f4b74b9c81590350ce59 Merge: d1adad3 9bbd6a4 Author: Michael Niedermayer Date: Wed May 25 06:32:23 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: (22 commits) configure: enable memalign_hack automatically when needed swscale: unbreak the build on non-x86 systems. swscale: remove if(bitexact) branch from functions. swscale: remove if(canMMX2BeUsed) conditional. swscale: remove swScale_{c,MMX,MMX2} duplication. swscale: use emms_c(). Move emms_c() from libavcodec to libavutil. tiff: set palette in the context when specified in TIFF_PAL tag rtsp: use strtoul to parse rtptime and seq values. pgssubdec: fix incorrect colors. dvdsubdec: fix incorrect colors. ape: Allow demuxing of files with metadata tags. swscale: remove dead macro WRITEBGR24OLD. swscale: remove AMD3DNOW "optimizations". swscale: remove duplicate code in ppc/ subdirectory. swscale: remove duplicated x86/ functions. swscale: force --enable-runtime-cpudetect and remove SWS_CPU_CAPS_*. vsrc_buffer.h: add file doxy vsrc_buffer: tweak error message in init() msmpeg4: reindent. ... Merged-by: Michael Niedermayer commit d1adad3cca407f493c3637e20ecd4f7124e69212 Author: Michael Niedermayer Date: Wed May 25 05:23:39 2011 +0200 Merge swscale bloatup This will be cleaned up in the next merge Authorship / merged commits: commit f668afd4896ee65683619b6f165dda4cdd46766f Author: Janne Grunau Date: Fri Apr 15 09:12:34 2011 +0200 swscale: fix "ISO C90 forbids mixed declarations and code" warning only hit with --enable-runtime-cpudetect commit 7f2ae5c7af374dfe254195a9375974a2ff9395a7 Author: Janne Grunau Date: Fri Apr 15 02:09:44 2011 +0200 swscale: fix compilation with --enable-runtime-cpudetect commit b6cad3df822969b31bb93eaf677e52a72416bc97 Author: Janne Grunau Date: Fri Apr 15 00:31:04 2011 +0200 swscale: correct include path to fix ppc altivec build commit 6216fc70b74e01a5272085329aa92f5ac797f9cf Author: Luca Barbato Date: Thu Apr 14 22:03:45 2011 +0200 swscale: simplify rgb2rgb templating MMX is always built. Drop the ifdefs commit 33a0421bbaa64f4e9c3d852b7f225ede8dad1388 Author: Josh Allmann Date: Wed Apr 13 20:57:32 2011 +0200 swscale: simplify initialization code Simplify the fallthrough case when no accelerated functions can be initialized. commit 735bf1951171a1e0ee4292e84a1b1beac45dd0ab Author: Josh Allmann Date: Wed Apr 13 20:57:31 2011 +0200 swscale: further cleanup swscale.c Move x86-specific constants out of swscale.c commit 86330b4c9258d5e583c0db033d1e68f46443307c Author: Luca Barbato Date: Wed Apr 13 20:57:30 2011 +0200 swscale: partially move the arch specific code left PPC and x86 code is split off from swscale_template.c. Lots of code is still duplicated and should be removed later. Again uniformize the init system to be more similar to the dsputil one. Unset h*scale_fast in the x86 init in order to make the output consistent with the previous status. Thanks to Josh for spotting it. commit c0038328830d7b341c28d7c99b0236a33617fd21 Author: Luca Barbato Date: Wed Apr 13 20:57:29 2011 +0200 swscale: move away x86 specific code from rgb2rgb Keep only the plain C code in the main rgb2rgb.c and move the x86 specific optimizations to x86/rgb2rgb.c Change the initialization pattern a little so some of it can be factorized to behave more like dsputils. Conflicts: libswscale/rgb2rgb.c libswscale/swscale_template.c commit d9d56036f3351af711261aa6e7a832017c00a34f Author: Michael Niedermayer Date: Wed May 25 02:40:22 2011 +0200 swscale: MMX optim of hscale16() code is based on existing 8bit MMX code Signed-off-by: Michael Niedermayer commit 895b616146a0d6091b09dab4752191b5234964d0 Author: Michael Niedermayer Date: Tue May 24 22:59:11 2011 +0200 swscale: dont loose bits on planar >8bit yuv ind gray nput. Signed-off-by: Michael Niedermayer commit 8050dfdfb284874e3989301771e8011422e78c7a Author: Michael Niedermayer Date: Tue May 24 17:48:41 2011 +0200 swscale: Switch to ronalds yuv2yuvX16inC_template() its very similar to baptsites and supports alpha Signed-off-by: Michael Niedermayer commit 9bbd6a4cd89da4bfc9fd36fea5777a539a542b40 Author: Mans Rullgard Date: Tue May 24 20:11:53 2011 +0100 configure: enable memalign_hack automatically when needed Signed-off-by: Mans Rullgard commit 040e1c67edab57177adb88a7dd1cc9ed38d2b74e Author: ami_stuff Date: Tue May 24 23:38:01 2011 +0200 rawdec: fix decoding of QT WRAW files Fix decoding of QT WRAW files. From some tests it results that: 1. all of the AVI/MOV WRAW files (at least from the link posted to the trac ticket #108) need to be flipped 2. mov WRAW files need to use AVI color modes 3. assigning PAL8 mode by default to WRAW codec is not correct Fix decoding of file CarltonMovie2.mov, fix trac issue #108. commit 09525f7956508c420a5c56c8daee16e05aa3f528 Author: Aurelien Jacobs Date: Tue May 24 23:34:24 2011 +0200 matroska: improve declaration of video_stereo_* constant tables commit b44bbf908d000808b2480cd6e8ca571cd3846fd2 Author: Aurelien Jacobs Date: Tue May 24 23:26:24 2011 +0200 matroskadec: fix reverted condition to accept combine_plane operation commit 384d10360b163e881e30483f2e5467ac53a356d6 Author: Reimar Döffinger Date: Tue May 24 22:24:08 2011 +0200 Fix register types for LOAD_AB arguments, fixes compilation with NASM. commit a724ee6265bbf0acf4c43cd948dede661459727d Author: Ronald S. Bultje Date: Tue May 24 15:32:03 2011 -0400 swscale: unbreak the build on non-x86 systems. commit 1bb0f0c925d616375b3b991d9c645e170b90c0a4 Author: Ronald S. Bultje Date: Tue May 24 12:30:55 2011 -0400 swscale: remove if(bitexact) branch from functions. Instead, only set the function pointers if bitexact flag is not set during initialization. Since a change in flags triggers a re-init anyway, this doesn't situations where flag values change during runtime. commit 566b5fbbb3753f71b60c4da491236a62232a8cf9 Author: Ronald S. Bultje Date: Tue May 24 12:15:14 2011 -0400 swscale: remove if(canMMX2BeUsed) conditional. Instead, set function pointers conditionally during init. This patch also reveals a whole branch of dead assembly code that is therefore also removed. commit aaca69c130edf219110c616d2e236a3a27caf706 Author: Ronald S. Bultje Date: Tue May 24 12:43:29 2011 -0400 swscale: remove swScale_{c,MMX,MMX2} duplication. commit c4fd283a467031fdbde5bca0963b20d5911eca91 Author: Ronald S. Bultje Date: Tue May 24 13:04:46 2011 -0400 swscale: use emms_c(). commit e9735572113ab903b92cc0a7931eb894e7177f6e Author: Ronald S. Bultje Date: Tue May 24 13:04:38 2011 -0400 Move emms_c() from libavcodec to libavutil. commit 7ca5338b49aa9967c9b18503490ca656e3bd6c5d Author: Stefano Sabatini Date: Tue May 24 01:17:25 2011 +0200 tiff: set palette in the context when specified in TIFF_PAL tag Since image initialization was moved after tag parsing, the palette needs to be specified in the context and then copied to the allocated image in init_image(). Fixes a regression with TIFF images that have palette data, trac issue #230, file Test_Flate_8bpp.tif. Signed-off-by: Diego Biurrun commit 4515f9b58a51eb0af81c1ed1fd99889fcdc5ae91 Author: Ilya Date: Sat Mar 26 17:13:36 2011 +0100 rtsp: use strtoul to parse rtptime and seq values. strtol could return negative values, leading to various error messages, mainly "non-monotonically increasing dts". Signed-off-by: Anton Khirnov commit d980d7b1295290cedd978ef53118513838aa1484 Author: Alexandre Colucci Date: Fri Mar 25 17:31:28 2011 +0100 pgssubdec: fix incorrect colors. On Blu-ray colors are stored in the order YCrCb (and not YCbCr) as mentioned in the specifications: see System Description Blu-ray Disc Read-Only Format, 9.14.4.2.2.1 Palette Definition Segment When decoding a Blu-ray subtitle, the colors were incorrectly set. Signed-off-by: Anton Khirnov commit 676eaf84335fa91ee6a699fc03207762b8a7d6ae Author: Alexandre Colucci Date: Fri Mar 25 11:25:02 2011 +0100 dvdsubdec: fix incorrect colors. On DVD and HD-DVD colors are stored in the order YCrCb (and not YCbCr) as mentioned in the specifications: see DVD Specifications for Read-Only Disc / Part 3, 4.3 Program Chain Information (7) PGC_SP_PLT see DVD Specifications for High Definition Disc, 5.2 Navigation for Standard Content (11) PGC_SDSP_PLT see DVD Specifications for High Definition Disc, 5.2 Navigation for Standard Content (12) PGC_HDSP_PLT see DVD Specifications for High Definition Disc, 5.5 Presentation Data (4) SET_COLOR2 When decoding a DVD or HD-DVD subtitle, the colors were incorrectly set. Signed-off-by: Anton Khirnov commit ab088f7d2842b9c658a8906062a96be37fbc9981 Author: Carl Eugen Hoyos Date: Mon Mar 21 12:04:10 2011 +0100 ape: Allow demuxing of files with metadata tags. Signed-off-by: Anton Khirnov commit b9eb2136af4e9b6700437d996eae731ffca07702 Author: Ronald S. Bultje Date: Tue May 24 10:46:40 2011 -0400 swscale: remove dead macro WRITEBGR24OLD. commit 1dd4f4be5a82409a162b42b120fc5054fef9d899 Author: Ronald S. Bultje Date: Tue May 24 10:19:41 2011 -0400 swscale: remove AMD3DNOW "optimizations". The functions are identical to their MMX counterparts. Thus, pretending that swscale is highly optimized for AMD3DNOW extensions is a poorly executed practical joke at best. commit fe43d5d71e1b272e1176232a34074c8c9bc0c61d Author: Ronald S. Bultje Date: Sat May 14 14:45:27 2011 -0400 swscale: remove duplicate code in ppc/ subdirectory. commit 11ffefefdbf92016e764e148e41ec08f9bc1a2db Author: Ronald S. Bultje Date: Tue May 24 10:11:26 2011 -0400 swscale: remove duplicated x86/ functions. commit e66149e714006d099d1ebfcca3f22ca74fc7dcf4 Author: Ronald S. Bultje Date: Tue May 24 10:03:26 2011 -0400 swscale: force --enable-runtime-cpudetect and remove SWS_CPU_CAPS_*. commit 75abcdb3915e3abb2dc6b5f7d101c177dcfdb626 Author: Stefano Sabatini Date: Mon Apr 11 11:29:35 2011 +0200 vsrc_buffer.h: add file doxy Signed-off-by: Stefano Sabatini Signed-off-by: Anton Khirnov commit f7053dc41a29fdd2592f57ced97420ac917d3ca9 Author: Stefano Sabatini Date: Sun Apr 3 16:48:33 2011 +0200 vsrc_buffer: tweak error message in init() Change: Expected 7 arguments, but only %d found in '%s'\n to: Expected 7 arguments, but %d found in '%s'\n as the user may provide more than 7 arguments, in that case the error is not misleading. Signed-off-by: Anton Khirnov commit 8d953175d4f7b2f5ea97489b5ba6d170b6ca461f Author: Stefano Sabatini Date: Tue May 24 13:29:33 2011 +0200 wav: fix various printf warnings related to wrong argument type commit e9f4001a30c563a840614048629055769f6f7020 Author: Stefano Sabatini Date: Tue May 24 13:18:31 2011 +0200 wav: propagate ff_get_wav_header() error code in w64_read_header() Alos fix warning: wav.c: In function ‘w64_read_header’: wav.c:546: warning: ‘ret’ may be used uninitialized in this function commit b2893ee2f8b204f3d636c25a05d1dc1dd81dfdba Author: Anton Khirnov Date: Sat May 21 12:23:34 2011 +0200 msmpeg4: reindent. commit 57aa765971878ff678abbe3bf1bfd9407b9e5a00 Author: Anton Khirnov Date: Fri May 13 08:03:36 2011 +0200 lavc: remove msmpeg4v1 encoder. The encoder has never produced files that could be decoded with any software and there should be no reason to create such files anyway. commit d42dce7bb35927b5e93ba7569d9e8dba38ab95a1 Author: Carl Eugen Hoyos Date: Tue May 24 10:08:55 2011 +0200 Remove avconfig.h and INCINSTDIRs on uninstall. commit 7f3a7b5c40b7fda09cbba4bb53e1ced133970930 Author: Justin Ruggles Date: Mon May 23 17:45:51 2011 +0200 ac3enc: add channel coupling support Channel coupling is an optional AC-3 feature that increases quality by combining high frequency information from multiple channels into a single channel. The per-channel high frequency information is sent with less accuracy in both the frequency and time domains. This allows more bits to be used for lower frequencies while preserving enough information to reconstruct the high frequencies. commit af2f79709947e5135e2923138a15ba83daeb75c5 Author: Michael Niedermayer Date: Tue May 24 05:19:56 2011 +0200 partial revert of 01d3ebaf219d83c0a70cdf9696ecb6b868e8a165 Fixes ffplay Signed-off-by: Michael Niedermayer commit 0781e14ec440463529c5cae25f7335a7224d7f26 Author: Michael Niedermayer Date: Tue May 24 04:57:51 2011 +0200 fate: reenable frext-pph10i4_panasonic_a after the bitstream has been fixed Signed-off-by: Michael Niedermayer commit 26ed595bd0e66c6982515988de0d858bc56d2362 Merge: 1bc81bf a7a187a Author: Michael Niedermayer Date: Tue May 24 04:08:36 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: configure: Add -U__STRICT_ANSI__ to CPPFLAGS on Cygwin and DOS. aacdec: fix typo in scalefactor clipping check fate: fix fate-h264-conformance-frext-pph10i4-panasonic-a crcs. fate: update 9/10bit refs. h264: Properly set coded_{width, height} when parsing H.264. x86 asm: Add SECTION_TEXT to dct32_sse.asm. Fix 9/10 bit in swscale. Merged-by: Michael Niedermayer commit 1bc81bf981552ec542e14af194cd05d7c74a83e1 Author: Michael Niedermayer Date: Tue May 24 01:31:15 2011 +0200 avcodec_find_decoder: prefer non experimental decoders. Signed-off-by: Michael Niedermayer commit df0adc806b77a6e0cb9293a5002ed00788436f68 Author: Michael Niedermayer Date: Tue May 24 00:01:29 2011 +0200 j2kdec: mark as CODEC_CAP_EXPERIMENTAL Signed-off-by: Michael Niedermayer commit 88e9397ef1e8c854e00b329cc866f88d046893d9 Author: Rukhsana Ruby Date: Mon May 23 23:56:20 2011 +0200 j2k[c/h] j2kdec.c: Implement 2 code block styles commit cbe60f34515dcfcbd08c00685d5810857ba9513e Author: Rukhsana Ruby Date: Mon May 23 23:55:28 2011 +0200 j2k: Add void as the parameter of function ff_j2k_init_tier1_luts commit 83654c7b1b598add9041c7add6b77478eb91177f Author: Kamil Nowosad Date: Mon May 23 23:13:34 2011 +0200 Add Kamil Nowosads j2k code. This needs work but it should not rot in soc svn. commit 4c509fe305bc79a913ef1b690df6c910c732f608 Author: Aurelien Jacobs Date: Tue May 24 01:09:24 2011 +0200 matroska: cleanup handling of video stereo mode commit 2ef241c09f6af4513f0558c295935708d40f2acd Author: Stefano Sabatini Date: Mon May 23 23:51:39 2011 +0200 oggdec: use av_dlog() Simplify. commit 6b4c0be5586acad3bbafd7d2dd02a8328a5ab632 Author: Stefano Sabatini Date: Wed May 18 23:59:38 2011 +0200 mem: define the MAX_MALLOC_SIZE constant and use it in place of INT_MAX This makes re-dimensionating the constant simpler, since now it is defined only in one place. commit a7a187a1beb8551101b592bf85f0f31a0db22f61 Author: Diego Biurrun Date: Sun May 15 14:32:15 2011 +0200 configure: Add -U__STRICT_ANSI__ to CPPFLAGS on Cygwin and DOS. In -std=c99 mode GCC defines __STRICT_ANSI__ to hide non-ANSI interfaces. This causes declarations for some POSIX functions to be omitted from system headers, which causes compilation failures. commit 5f3c436bdf36395974af93c815b86f439e25f36c Author: alahuja Date: Mon May 23 08:33:35 2011 -0700 muxers.texi changes for mkv/webm options commit cef7d70181ec7ee9df426ef0f3a08dd4995a4d9a Author: Justin Ruggles Date: Mon May 23 15:56:52 2011 -0400 aacdec: fix typo in scalefactor clipping check commit bed12e24fff91db18b44811b210ed7ad4572e20c Author: Michael Niedermayer Date: Mon May 23 17:33:03 2011 +0200 mpegaudio: Correct license header To the best of my knowledge the author has not agreed to the change from ffmpeg->libav thus i revert it. commit 02260ccc3b7f8b88c11af4739252f5c5f97fa6e7 Author: jan gerber Date: Mon May 23 17:22:02 2011 +0200 add 5.1 to stereo downmix to resample.c this is based on previous 6to2channel-resample.patch from ffmpeg2theora but updated to work with trunk and using av_clip_int16. commit b51021da7b69a98f135cf15bbe7f3ecb08daaa82 Author: Ronald S. Bultje Date: Mon May 23 08:44:31 2011 -0400 fate: fix fate-h264-conformance-frext-pph10i4-panasonic-a crcs. The sample on rsync was corrupt, this one is now bitexact w.r.t. JM. commit 845807494b013a5429918f5d3252c343abcee315 Author: Ronald S. Bultje Date: Mon May 23 08:08:03 2011 -0400 fate: update 9/10bit refs. commit b47904d158709bdec1a9d40e83d1abadf50081dc Author: Felipe Contreras Date: Fri May 20 00:39:12 2011 +0300 h264: Properly set coded_{width, height} when parsing H.264. Signed-off-by: Felipe Contreras Signed-off-by: Diego Biurrun commit a10fb79070c017be613700b946f51baed4f69df0 Author: Dave Yeo Date: Sun May 22 10:44:17 2011 -0700 x86 asm: Add SECTION_TEXT to dct32_sse.asm. This fixes the following error on OS/2: error: segment name `.text align=16' not recognized Signed-off-by: Diego Biurrun commit 6465c820da7b104150366a8cdd837c00cf364235 Author: Kieran Kunhya Date: Mon May 23 03:02:12 2011 +0100 Fix 9/10 bit in swscale. Signed-off-by: Ronald S. Bultje commit 01a73d6cef70dfa90fdf79f7afd55b817b4c9342 Merge: 0753721 a121754 Author: Michael Niedermayer Date: Mon May 23 04:16:08 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: ffmpeg: Don't trigger url_interrupt_cb on the first signal avoptions: Check the return value from av_get_number dct32_sse: eliminate some spills Fix dct32() compilation with --disable-yasm Conflicts: ffmpeg.c Merged-by: Michael Niedermayer commit 0753721ed1caab048b58db15ebfdf45569e83420 Author: Carl Eugen Hoyos Date: Mon May 23 01:23:33 2011 +0200 Do not ask for samples if a specific channel layout was requested. commit 458f20bc75f9bf7615c65d30296071a69f1660e9 Author: Stefano Sabatini Date: Sun May 22 21:28:28 2011 +0200 libx264: specify field for default union values in options Fix warnings. commit f455f46455ae258d2d0ebc50a2e991fa020ba92d Author: Michael Niedermayer Date: Sun May 22 21:26:13 2011 +0200 movdec: dont divide by zero when stts_data[0].duration = 0. Fixes ticket223 Signed-off-by: Michael Niedermayer commit a0cd98b5943a7807aff837f9adba1dd034ec2272 Author: Michael Niedermayer Date: Sun May 22 19:06:10 2011 +0200 Fix ticket127 This fixes detectiion of slightly too big dummy frames. Signed-off-by: Michael Niedermayer commit 94ea17075ba0751a4ac0f9fa0929956a18497b5a Author: Michael Niedermayer Date: Sun May 22 16:18:36 2011 +0200 dct32: Replacing libav by ffmpeg in the license header with the authors permission. Signed-off-by: Michael Niedermayer commit a121754852a69b4879a39ba78863404c13c54f61 Author: Martin Storsjö Date: Sun May 22 14:40:33 2011 +0300 ffmpeg: Don't trigger url_interrupt_cb on the first signal Currently, the url_interrupt_cb callback will abort all IO after the first received signal. This makes the output files from e.g. the mov muxer to be unreadable if the transcode is aborted with ctrl+c. After this patch, the first signal cleanly breaks out of the transcoding loop, but won't forcibly abort all IO. After the second signal is received, the url_interrupt_cb callback will abort all IO. Signed-off-by: Martin Storsjö commit 8089b7fa8c5b5a48cc7101daa4be891d0ead5a5e Author: Martin Storsjö Date: Sun May 22 21:34:49 2011 +0300 avoptions: Check the return value from av_get_number This avoids doing a division by zero if the option wasn't found, or wasn't an option of an appropriate type. Signed-off-by: Martin Storsjö commit 5045786b7ee235787766337a2f0b05955ff6c649 Author: Stefano Sabatini Date: Thu May 19 22:12:37 2011 +0200 lavf: fix style for avformat_alloc_output_context2() More consistent/readable. commit 5ecdfd008bce961c3241eaa1f8dc06e82a6b12db Author: Stefano Sabatini Date: Thu May 19 22:09:34 2011 +0200 lavf: deprecate avformat_alloc_output_context() in favor of avformat_alloc_output_context2() The new function accepts a slightly more intuitive order of paramters, and returns an error code, thus allowing applications to report a meaningful error message. commit 83db71977700d3337c84d5945ac8b7e7ee881ac2 Author: Stefano Sabatini Date: Sun May 22 19:30:08 2011 +0200 lavfi: make vsrc_buffer.h header public Address trac issue #33. commit 422b2362fc83ed3a75532ea68a6d167c52f447ec Author: Loren Merritt Date: Sat May 21 23:36:23 2011 +0200 dct32_sse: eliminate some spills 125->104 cycles on penryn (x86_64 only) commit e6c1791b471e4dd03d8fd33d02307d9d9eae948d Author: Vitor Sessak Date: Sun May 22 13:41:13 2011 +0200 Fix compilation with --disable-yasm. commit 165c7c420d611bfa16d999f2033619c542961926 Author: Vitor Sessak Date: Sun May 22 12:04:33 2011 +0200 Fix dct32() compilation with --disable-yasm Signed-off-by: Ronald S. Bultje commit bf8bb94322d92134206392c3f238a58c424b1c9e Merge: 33adcdb 71cc331 Author: Michael Niedermayer Date: Sun May 22 04:53:19 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: ffmpeg: get rid of the -vglobal option. dct32: Add AVX implementation of 32-point DCT dct32: Change pass 6 permutation to allow for AVX implementation dct32: port SSE 32-point DCT to YASM multiple inclusion guard cleanup avio: document buffer must created with av_malloc() and friends avio: check AVIOContext malloc failure swscale: point out an alternative to sws_getContext svq3: Do initialization after parsing the extradata add changelog entries for 0.7_beta2 mp3lame: add #include required for AV_RB32 macro. Conflicts: Changelog libavcodec/svq3.c libavcodec/x86/dct32_sse.c libavfilter/vsrc_buffer.h Merged-by: Michael Niedermayer commit 33adcdb53118df8f281742b75adf861cda64801a Author: Michael Niedermayer Date: Sun May 22 03:30:01 2011 +0200 mpeg2dec: Fix lowres 3 Fixes ticket212 Signed-off-by: Michael Niedermayer commit af2ed4b7488468abc8ccdd1b45d810886a609e1e Author: Stefano Sabatini Date: Sun May 22 01:34:15 2011 +0200 lavfi: bump minor and add changelog entry after the split filter addition commit 8a5b71d0c3dbb0b1a6895ea858353e6fb41e9ab8 Author: Stefano Sabatini Date: Sun May 22 01:32:40 2011 +0200 vf_split: add documentation to filters.texi commit 6f5a145be17c1aeb61a0c7f2ef14a8ec537d7d46 Author: Stefano Sabatini Date: Sun May 22 01:32:18 2011 +0200 vf_split: give more meaningful names to the output pads Rename "default" -> "output1", "default2" -> output2. commit de1100a00a483d967ed82c46792e1553b5bdc332 Author: Stefano Sabatini Date: Sun May 22 01:20:53 2011 +0200 vf_split: define draw_slice() before end_frame() Improve logical coherence, fix nit. commit 88fc2e411ecf66b8a8e1b41b027b51bf2b5434b0 Author: Stefano Sabatini Date: Sun May 22 01:19:20 2011 +0200 vf_split: add description commit 7d5297b3436623fe52f9424d0bc3ae03fbfe164d Author: Stefano Sabatini Date: Sun May 22 01:18:59 2011 +0200 vf_split: fix various nits commit eb97d4d611efdb8480a5a8dcfbc35860b9eda638 Author: Michael Niedermayer Date: Sun May 22 02:33:03 2011 +0200 wmadec: avoid infinit loop. Fixes ticket183 Signed-off-by: Michael Niedermayer commit a13fec8a9cbc13745bcb7e7c1b017d72623051ad Author: Ramiro Polla Date: Sat May 21 21:53:15 2011 +0200 DirectShow capture: Fix build Signed-off-by: Michael Niedermayer commit 71cc331cab8d61130048f3003f2ca77cfb94e3f3 Author: Anton Khirnov Date: Sat May 21 12:05:49 2011 +0200 ffmpeg: get rid of the -vglobal option. It's badly documented and does the same thing as -flags global_header, so it's redundant. commit 6204feb160c843320f6001d7e2bb2361c82b90ca Author: Vitor Sessak Date: Sat May 14 14:17:15 2011 +0200 dct32: Add AVX implementation of 32-point DCT commit 4e653b98c888a922ee192c6c8f914dde6ea2dc40 Author: Vitor Sessak Date: Sat May 14 14:16:30 2011 +0200 dct32: Change pass 6 permutation to allow for AVX implementation commit 3758eb0eb96217c6968d47487533337f96aeecfb Author: Vitor Sessak Date: Tue May 17 18:26:01 2011 +0200 dct32: port SSE 32-point DCT to YASM commit e6ec9212c543c77ab3ddab90ac52021cfbbdac17 Author: Kirill Gavrilov Date: Sat May 21 17:14:14 2011 +0200 matroska: switch stereo mode from int to string and add support in the demuxer too commit 69a83da5d40833e20da07830eda8ecbc31735116 Author: Kirill Gavrilov Date: Sat May 21 17:08:53 2011 +0200 matroska: cosmetics commit 8dd12b077b9f6c8437f387195feaefa806f93957 Author: Alok Ahuja Date: Sat Apr 23 22:29:13 2011 -0700 Create a stereo_mode metadata tag to specify the stereo 3d video layout using the StereoMode tag in a matroska/webm video track. commit a38a00eddf200e18c6cf3ba090beaa3b224bd114 Author: Bobby Bingham Date: Sat May 21 16:46:11 2011 +0200 libavfilter: vf_split from soc. Commited by michael, for detailed authorship see soc repo commit 95eb2e3a3819e8b6d87940bfa41bf1ea3ae68f5a Author: Ramiro Polla Date: Sat May 21 14:24:50 2011 +0200 DirectShow capture support Signed-off-by: Michael Niedermayer commit 153382e1b6b428a1dcb8dc3f06f64a6959d722c5 Author: Diego Biurrun Date: Tue May 17 16:58:04 2011 +0200 multiple inclusion guard cleanup Add missing multiple inclusion guards; clean up #endif comments; add missing library prefixes; keep guard names consistent. commit d49051e0742c09345495ae0486c3601a15222ac4 Author: Can Wu Date: Sat May 14 17:34:28 2011 +0800 avio: document buffer must created with av_malloc() and friends Else a later buffer resize in ffio_set_buf_size() will ABORT. Signed-off-by: Anton Khirnov commit 9e2dabed4a7bf21e3e0c0f4ddc895f8ed90fa839 Author: Can Wu Date: Sat May 14 17:27:31 2011 +0800 avio: check AVIOContext malloc failure Signed-off-by: Anton Khirnov commit 7d4c4394b5c94a665cc807fb8b92ea153b6225b0 Author: Clément BÅ“sch Date: Thu May 5 21:25:46 2011 +0200 swscale: point out an alternative to sws_getContext Signed-off-by: Anton Khirnov commit cdca7c378ed46cf67a7583a102ba1b2b91d00b9c Author: Ronald S. Bultje Date: Fri May 13 10:24:31 2011 +0300 svq3: Do initialization after parsing the extradata If done before, some parameters aren't known yet. With svq3/rtp, initializing before some parameters are known can lead to calling av_malloc(0), which on OS X currently returns broken pointers. commit f8c49d02b0f17c3011712ec4638ec4c6c76e7831 Author: Carl Eugen Hoyos Date: Sat May 21 11:08:44 2011 +0200 Fix channel_layout documentation. libavformat/riff.c has been writing channel_layout for as long as the field exists. commit 21bbca5b4422ddd10363bf1d8494564c54639b39 Author: Reinhard Tartler Date: Thu May 12 18:18:54 2011 +0200 add changelog entries for 0.7_beta2 commit 6d32bcd770c638e49d69a4d5eb5464cfa4f35d9a Merge: 840238b a1d0dcc Author: Michael Niedermayer Date: Sat May 21 05:00:01 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: configure: make executable again LATM/AAC: Free previously initialized context on reinit. configure: Do not unconditionally add -Wall to host CFLAGS. configure: Set OS/2 objformat to a.out. Add support for a.out object format to assembler macros. fate: disable threading for encoding fate: add comment field fate: allow overriding default build and install dirs mpegtsenc: Add an AVClass pointer to the private data mpegaudio: clean up #includes mpegaudio: move all header parsing to mpegaudiodecheader.[ch] Merged-by: Michael Niedermayer commit 840238b8706ea2ca740cf4b49bffd8ae196352f9 Author: Mike William Date: Sat May 21 04:50:59 2011 +0200 ffserver: dont just crash With changes from ubitux. commit ab1c19efc59cbcb1ff1b0c076cde01b87837f21e Author: Maksym Veremeyenko Date: Sat May 21 04:39:20 2011 +0200 fix ffserver's SIGSEGV commit 0eed5016a27ec2f6990c426e79eb28fbf370f613 Author: Martin Storsjö Date: Fri May 20 14:59:47 2011 +0300 avoptions: Support getting flag values using av_get_int commit 1b30e4f5865260323da5232174fc68d6cc283f45 Author: Gianluigi Tiesi Date: Sat May 21 03:36:26 2011 +0200 preset dir for win32 commit 0424e052f83adc422d8a746e3cdc5ab6bc28679e Author: Michael Niedermayer Date: Sat May 21 03:11:50 2011 +0200 Merge remote-tracking branch 'ffmpeg-mt/master' * ffmpeg-mt/master: Update todo. h264: add an assert that copied pictures are valid picture pointers valgrind-check: run with 1 and 3 threads h264: When decoding a packet with multiple PPS/SPS, don't start the next thread until all of them have been read Allow some pictures to be released earlier after 51ead6d2c40c5defdd211f435aec49b19f5f6a18 h264: fix slice threading MC reading uninitialized frame edges. Please see ffmpeg-mt for a list of authors of these changes. Conflicts: libavcodec/h264.c mt-work/valgrind-check.sh Signed-off-by: Michael Niedermayer commit 5c08c7b2151409c3b7a05e54fe46834deedff119 Author: Michael Niedermayer Date: Sat May 21 02:17:10 2011 +0200 Add a flag to disable side data merging. Signed-off-by: Michael Niedermayer commit 94eadee7efc2c5d19ecfe92d36f0556663468080 Author: Michael Niedermayer Date: Wed Apr 20 03:25:48 2011 +0200 Merge/split side data. Signed-off-by: Michael Niedermayer commit 007f773942e5c8f39e9ad880d8e7e71f8f3bf7d2 Author: Carl Eugen Hoyos Date: Sat May 21 01:11:42 2011 +0200 Encoding alac with more than two channels is not supported. commit 03c804e1ed65f52fd99020e1777103f4fb7abf15 Author: Ronald S. Bultje Date: Fri May 20 14:56:44 2011 -0400 mp3lame: add #include required for AV_RB32 macro. Fixes compilation with mp3lame enabled. commit a1d0dcc7134f1401c682b5e13d4ab3864da21efb Author: Mans Rullgard Date: Fri May 20 18:11:31 2011 +0100 configure: make executable again Signed-off-by: Mans Rullgard commit 42da8ea8e848e65611f0c606cd2c96d3a70c041d Author: Ronald S. Bultje Date: Fri May 20 10:49:20 2011 -0400 LATM/AAC: Free previously initialized context on reinit. Fixes memory leaks which are the result of overwriting already-initialized MDCT contexts during context reinitialization, e.g. in valgrind fate-aac-latm_000000001180bc60. Signed-off-by: Diego Biurrun commit 0a6db2a25a70e3e8fb414e361719152a9e7e9766 Author: Diego Biurrun Date: Mon May 16 16:16:14 2011 +0200 configure: Do not unconditionally add -Wall to host CFLAGS. Some compilers choke on -Wall, so only add the flag after checking it works. commit 9297f1ed15a4707b1b59c5c347d7185ee0bb3ef8 Author: Dave Yeo Date: Fri May 20 17:26:52 2011 +0200 configure: Set OS/2 objformat to a.out. Signed-off-by: Diego Biurrun commit d69f9a4234fefcbf038e6a19203df6865f38ffb8 Author: Dave Yeo Date: Fri May 20 17:33:38 2011 +0200 Add support for a.out object format to assembler macros. This format is still used by e.g. OS/2. Signed-off-by: Diego Biurrun commit 6da57043eabdcde99e8411da3628f2249e951e66 Author: Mans Rullgard Date: Fri May 20 12:57:12 2011 +0100 fate: disable threading for encoding This explicitly disables threading for encoding as slices are otherwise automatically activated. This should be dropped once option resetting between files is fully implemented. Signed-off-by: Mans Rullgard commit 5ffccc00567363c8e09d4c47dd03dee99c312b7d Author: Mans Rullgard Date: Fri May 20 12:47:42 2011 +0100 fate: add comment field This adds a comment field to the report header, suitable for extra information not covered by the automatic fields. Signed-off-by: Mans Rullgard commit eb8da636af0652a4865055c237a76caff02b98bf Author: Mans Rullgard Date: Fri May 20 12:06:51 2011 +0100 fate: allow overriding default build and install dirs This is useful e.g. for building in a different filesystem than where the source is kept. Signed-off-by: Mans Rullgard commit 50fefa10de920e16036f2be977c39fc0c286d024 Author: Martin Storsjö Date: Fri May 20 11:33:57 2011 +0300 mpegtsenc: Add an AVClass pointer to the private data Since a private class is set for this muxer, the callers will assume that the private data starts with an AVClass pointer. If no such member exists, the first few bytes of the struct will be overwritten, and the class pointer may be broken at any later time. Signed-off-by: Martin Storsjö commit f255a28d140a64ea4c1a5060061863aec993b5ea Author: Mans Rullgard Date: Thu May 19 13:27:24 2011 +0100 mpegaudio: clean up #includes Signed-off-by: Mans Rullgard commit 0199e00bc80a55aacf7ecd393bf32dcd64e06739 Author: Mans Rullgard Date: Thu May 19 13:44:11 2011 +0100 mpegaudio: move all header parsing to mpegaudiodecheader.[ch] Signed-off-by: Mans Rullgard commit f1b3f33d48b366dd7b3b915b4de90d9ad4c4ae39 Author: Stefano Sabatini Date: Fri May 20 11:36:16 2011 +0200 vf_libopencv: prefer opencv/cxcore.h over cxtypes.h Require the presence of opencv/cxcore.h in place of opencv/cxtypes.h, which has been removed. Fix compilation with libopencv > 2.1.0. Fix trac issue #221. commit 125d807660996b879c4762c3a15c4bb485e13f4c Author: Stefano Sabatini Date: Fri May 20 10:12:42 2011 +0200 decoders.texi: fix typos in rawvideo section commit 950b3589974e55888fc37369f2d9216a18c1ca84 Author: Stefano Sabatini Date: Thu May 19 21:41:50 2011 +0200 cmdutils: use const AVClass * when senseful Fix warnings: cmdutils.c: In function ‘opt_default’: cmdutils.c:304: warning: initialization discards qualifiers from pointer target type cmdutils.c: In function ‘set_context_opts’: cmdutils.c:431: warning: passing argument 2 of ‘alloc_priv_context’ discards qualifiers from pointer target type cmdutils.c:414: note: expected ‘struct AVClass *’ but argument is of type ‘const struct AVClass *’ commit 52da548c7dabac364cc38e4239edc56a28d0d63c Author: Stefano Sabatini Date: Thu May 19 21:14:37 2011 +0200 encoders.texi: add documentation for the libx264 encoder Also remove -x264opts item from the ffmpeg manual, since it belongs to the encoders section. commit c5385147cd74bc1892650c47531c7797f22b0b1d Author: Stefano Sabatini Date: Thu May 19 20:51:28 2011 +0200 decoders.texi: add documentation for rawvideo decoder and options commit 5e45f03420945dfeaf66729f5d022e5c15ff5723 Author: Stefano Sabatini Date: Thu May 19 20:34:56 2011 +0200 doc: add decoders.texi file commit d4111e525dbb0efe72c03d715134d654f3d66392 Author: Stefano Sabatini Date: Thu May 19 19:41:19 2011 +0200 encoders.texi: decrease level for audio encoders section Make Audio Encoders a separate chapter, and decrese the contained sections level by one. Improve rendering, and improve consistency with the other parts of the manual. commit 1e31ea71ffa27928d27b934945cc97d9e92ac471 Author: Stefano Sabatini Date: Thu May 19 21:14:09 2011 +0200 ffprobe.texi: remove inclusion of muxers section Muxers are not used by ffprobe. commit 7f58eb3c2b552f232905731b5944307e72c590a0 Author: Stefano Sabatini Date: Tue May 17 13:01:21 2011 +0200 indeo3: release buffer in indeo3_decode_end() Fix leak. commit 5443812fbcc7c12f783c1328539232cb3bcde9e1 Author: Stefano Sabatini Date: Tue May 17 20:25:06 2011 +0200 indeo3: remove unnecessary includes commit a469c32478cd2bee1fabc37b388d0fcda28ecc07 Author: Stefano Sabatini Date: Tue May 17 20:22:48 2011 +0200 indeo3: add @file doxy and a link to multimedia wiki documentation commit 0d65e0f8cb0f924be95650f50f3d05d0b223aceb Author: Stefano Sabatini Date: Fri May 20 00:58:00 2011 +0200 cmdutils: reset *picref_ptr to NULL in get_filtered_frame() Avoid the presence of an invalid pointer, fix a crash in case of get_filtered_frame() failure. commit 328810390d0458b7c8200342a87f238f7610b776 Author: Stefano Sabatini Date: Thu May 19 19:01:38 2011 +0200 ffmpeg: remove useless NULL-check on avfilter_unref_buffer The check is no more required since recent changes in the avfilter_unref_buffer(), the check is done in the function. Simplify. commit ed96fffb6e0c744a405f379ba4ff4faf9e79173d Author: Stefano Sabatini Date: Fri May 20 09:33:57 2011 +0200 libmp3lame: include "libavutil/intreadwrite.h" header Fix compilation. commit 80d156d7fdc44b09783ba242fe2681a6d4cc8df5 Merge: 6efb296 984ece7 Author: Michael Niedermayer Date: Fri May 20 05:42:04 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: qdm2: Use floating point synthesis filter. h264: correct border check. h264: fix loopfilter with threading at slice boundaries. Fix ff_mpa_synth_filter_fixed() prototype Rename costablegen.c ---> cos_tablegen.c. Collapse tableprint.c into tableprint.h. Simplify trig table rules Remove potentially unstable filenames from comments in generated files. Ignore generated tables and generated table generator programs. Simplify CLEANFILES make variable by using wildcards. Remove silly insults from avformat_version() Doxygen documentation. mpegaudiodsp: fix x86 and ppc makefiles configure: Adjust AVX assembler check. mpegaudio: remove unused version of SAME_HEADER_MASK mpegaudio: remove useless #undef at end of file asfdec: add missing #include for av_bswap32() mpegaudio: merge two #if CONFIG_FLOAT blocks mpegaudio: move some struct definitions from mpegaudio.h Move some mpegaudio functions to new mpegaudiodsp subsystem Conflicts: libavcodec/h264.c libavcodec/x86/Makefile Merged-by: Michael Niedermayer commit 984ece7503597d30e6f3bdeb67e337ea1616f880 Author: Vitor Sessak Date: Thu May 19 21:33:27 2011 +0200 qdm2: Use floating point synthesis filter. This avoid needlessly convertion from floating point to fixed point and back. Signed-off-by: Ronald S. Bultje commit 4e987f8282ff7658a6f804b9db39954bb59fa72e Author: Ronald S. Bultje Date: Thu May 19 16:47:59 2011 -0400 h264: correct border check. When backing up the top-left border, check that the top-left (rather than left) MB indeed does belong to our slice. If it doesn't, backing up has no positive effect but may accidentally interfere with other threads writing in the same space. Fixes occasional one-off effects when enabling slice-MT. commit 0ffc84150599d15b66a3960202e07755f99fe0d0 Author: Ronald S. Bultje Date: Wed May 18 08:10:49 2011 -0400 h264: fix loopfilter with threading at slice boundaries. commit 89a20987355757be64c49fb714721c38902ac1cc Author: Mans Rullgard Date: Thu May 19 20:46:24 2011 +0100 Fix ff_mpa_synth_filter_fixed() prototype The prototype should use the same typedefs as the definition, or it will fail where int32_t is not int (DOS apparently). Signed-off-by: Mans Rullgard commit 6efb29686fc9a7f76480405df8fe7eaa7a9dd4cf Author: Martin Storsjö Date: Wed May 18 16:21:50 2011 +0300 Reindent commit 65a4d8e5a78800a4f493fa21c4bb329d31df96ed Author: Martin Storsjö Date: Wed May 18 16:21:49 2011 +0300 rtpenc_chain: Pass the MP4A_LATM flag to chained muxers commit ef409645f06368bcdcedd1b7fe19e25699ae5082 Author: Juan Carlos Rodriguez Date: Wed May 18 16:21:48 2011 +0300 rtpenc: MP4A-LATM payload support commit bd61b2a1cac5fcaa9970dffe3b28c52774ea2f09 Author: Martin Storsjö Date: Wed May 18 16:21:47 2011 +0300 movenc: Pass AVFormatContext flags to the SDP generation commit abe936388940e5d54057c74ba0afc3d228eccdc0 Author: Martin Storsjö Date: Wed May 18 16:21:46 2011 +0300 sdp: Allow passing AVFormatContext flags to the SDP generation commit c78a85adf4a153914233e02b4d44f9414bc579d7 Author: Stefano Sabatini Date: Thu May 19 12:01:25 2011 +0200 vsrc_buffer: document av_vsrc_buffer_add_video_buffer_ref() commit c000a9f78390b71812c7ee5187bbccc3c2d79b1e Author: Stefano Sabatini Date: Thu May 19 01:17:16 2011 +0200 vsrc_buffer: add av_vsrc_buffer_add_frame() The new function is a wrapper around av_vsrc_buffer_add_video_buffer_ref(), and allows to simplify the act of pushing AVFrame data to the source buffer. commit d3fddb8454cab525cbcb6cc9c3d0ca29b6c78cdd Author: Stefano Sabatini Date: Thu May 19 22:51:28 2011 +0200 vsrc_buffer: fix example in docs, add mandatory parameters commit 50764e19a8edc018b6e5276f1b3e4215ba66217f Author: Stefano Sabatini Date: Thu May 19 01:02:54 2011 +0200 vsrc_buffer: make the source accept sws_param in init Avoid the need of two distinct av_vsrc_add_video_buffer_ref* functions. Simplify the interface. commit 509b32cf5d5656473e277ac43dbb2ce9da66bff2 Author: Stefano Sabatini Date: Fri May 13 18:09:47 2011 +0200 vsrc_buffer: propagate avfilter_open() error code commit 3799805e560f168811808ee0ba3befcb6fddc50e Author: Stefano Sabatini Date: Fri May 13 18:07:51 2011 +0200 vsrc_buffer: fix style commit 9fdf77217b39646afdb8907b977e3d7a59f1cb9e Author: Stefano Sabatini Date: Sat May 14 11:46:14 2011 +0200 lavfi: add avfilter_get_video_buffer_ref_from_frame to avcodec.h Simplify passing AVFrame data to av_vsrc_buffer_add_video_buffer_ref(). commit 6070b7e1c520e9ca389403bae20a2ad04c7d54c7 Author: Stefano Sabatini Date: Sat May 7 21:35:08 2011 +0200 vsrc_buffer: remove dependency on AVFrame Rename av_vsrc_buffer_add_frame to av_vsrc_buffer_add_video_buffer_ref(), and change its inteface to make it accept in input an AVFilterBufferRef rather than an AVFrame. This way the interface can be used without requiring the inclusion/installation of libavcodec headers. commit 4887f8245c5dcd2a27817a678122eea4d1a0f31a Author: Diego Biurrun Date: Mon May 16 00:53:07 2011 +0200 Rename costablegen.c ---> cos_tablegen.c. This is consistent with how all other table generation programs are named. Moreover this ensures that the cos table generation program is correctly deleted when cleaning the tree. commit 9f2405661d5bcc9416f4b3339f1139997467e1f5 Author: Diego Biurrun Date: Thu May 19 19:22:41 2011 +0200 Collapse tableprint.c into tableprint.h. tableprint.c serves little purpose on its own and removing it allows building the table generator programs with the normal HOSTPROGS Makefile rules. commit 272874c9dbde5d48884c417b76f3c7f04938c92f Author: Mans Rullgard Date: Thu May 19 18:34:40 2011 +0100 Simplify trig table rules This collapses the make rules for the trig tables into a pattern rule. Based on a patch by Diego, modified to avoid using fragile make constructs and allow future addition of fixed-point sin tables. Signed-off-by: Mans Rullgard commit c98657a21536ef71a1d8d6a7ff4d69dd19d9e5b7 Author: Diego Biurrun Date: Thu May 19 18:12:17 2011 +0200 Remove potentially unstable filenames from comments in generated files. commit 8a0572b05451b9a161989ab1ec2c03447a4c1ce6 Author: Diego Biurrun Date: Mon May 16 00:59:50 2011 +0200 Ignore generated tables and generated table generator programs. commit d9a69f730e180ab9b1cac8a4d53d07b1ec375a38 Author: Diego Biurrun Date: Mon May 16 00:54:36 2011 +0200 Simplify CLEANFILES make variable by using wildcards. Also ensures that generated file cos_fixed_tables.c is deleted on 'make clean'. commit 7ed0a77ff4d19eb77671ce786ef515e5ffb1496e Author: Diego Biurrun Date: Thu May 19 17:39:50 2011 +0200 Remove silly insults from avformat_version() Doxygen documentation. commit 0b5e44ed2922f2abe0de9670d099666ca3622a69 Author: Mans Rullgard Date: Thu May 19 16:26:39 2011 +0100 mpegaudiodsp: fix x86 and ppc makefiles Signed-off-by: Mans Rullgard commit 429059f866259b447233c3fa23fffddce3e39508 Author: Diego Biurrun Date: Mon May 16 14:23:59 2011 +0200 configure: Adjust AVX assembler check. Older nasm versions have trouble assembling certain AVX instructions, but the current AVX check did not detect this. Update the check to use an instruction that triggers the nasm problem. commit c2a16e44f8ed130c2b492f1f3ce09f7f55a7d4a4 Author: Mans Rullgard Date: Thu May 19 14:01:11 2011 +0100 mpegaudio: remove unused version of SAME_HEADER_MASK Signed-off-by: Mans Rullgard commit d7d21c9f4befe8fea9596e41e691a9fba8f377e2 Author: Mans Rullgard Date: Thu May 19 12:48:33 2011 +0100 mpegaudio: remove useless #undef at end of file Signed-off-by: Mans Rullgard commit b122c651075814722ade6f93c46cb2ee08c45b49 Author: Mans Rullgard Date: Thu May 19 12:31:05 2011 +0100 asfdec: add missing #include for av_bswap32() Signed-off-by: Mans Rullgard commit c7bbc6cd7a7e26c6c6f26e1b06f8ce354c7a1a46 Author: Mans Rullgard Date: Mon May 16 18:59:25 2011 +0100 mpegaudio: merge two #if CONFIG_FLOAT blocks Signed-off-by: Mans Rullgard commit 918d0584a452bf76264e717006f2cfc40b0de21f Author: Mans Rullgard Date: Tue May 17 14:22:25 2011 +0100 mpegaudio: move some struct definitions from mpegaudio.h These structs are only used in mpegaudiodec.c, so move them there and remove no longer needed #include lines from mpegaudio.h. Signed-off-by: Mans Rullgard commit c4f5c2d6f4ffa3f4b56555059000208a6ba47b55 Author: Mans Rullgard Date: Mon May 16 16:52:01 2011 +0100 Move some mpegaudio functions to new mpegaudiodsp subsystem This separation allows these functions to be used in a cleaner fashion from other codecs (e.g. qdm2) and simplifies creating optimised versions of them. Signed-off-by: Mans Rullgard commit 3c7650a83d3bdca2fd680af722de344b092f65ec Merge: 75a37b5 ea91e77 Author: Michael Niedermayer Date: Thu May 19 13:00:31 2011 +0200 Merge remote-tracking branch 'qatar/master' This early morning merge should fix --disable-yasm * qatar/master: Clean up #includes in cmdutils.h. g729: Merge g729.h into g729dec.c. 10l: wrap float_interleave functions in HAVE_YASM. Conflicts: libavcodec/g729.h Merged-by: Michael Niedermayer commit ea91e77127229015d23a046f1797d3fc6a33e54d Author: Diego Biurrun Date: Sun May 15 17:09:25 2011 +0200 Clean up #includes in cmdutils.h. inttypes.h is not necessary, just stdint.h is enough. Unconditionally #include avfilter.h in cmdutils.h. It is an installed header with no non-standard external dependencies, so it is safe. commit a2077b85da5bf71167b11925aabbb738558a134d Author: Diego Biurrun Date: Tue May 17 15:29:58 2011 +0200 g729: Merge g729.h into g729dec.c. The header contains just a single define that is only used in g729dec.c. commit 75a37b57a59f6701d9443c5f7a0ceec108b27a18 Merge: 8529f9b 41e21e4 Author: Michael Niedermayer Date: Thu May 19 05:12:45 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: APIchanges: fill in date and commit for request_sample_fmt Add floating-point sample format support to the ac3, eac3, dca, aac, and vorbis decoders. Add support for request_sample_format in ffmpeg and ffplay. Add APIchanges entry for request_sample_fmt. Add request_sample_fmt field to AVCodecContext. Add float_interleave() to FmtConvertContext with x86-optimized versions. Remove unused make variable SEEK_REFFILE fate: remove redundant aref and vref references fate: remove do_ffmpeg_nocheck function fate: do not collect -benchmark output mpegaudiodec: remove decode_end() function fate: run aref and vref as regular tests mpegaudio: sanitise compute_antialias_* names mpeg12: add slice-threading checks to slice-threading initializers. h264: copy pixel_shift between slice threading contexts. mdec: enable frame-level multithreading. mdec.c: fix overread. Conflicts: libavcodec/aacdec.c libavcodec/ac3dec.c libavcodec/avcodec.h libavcodec/dca.c libavcodec/h264.c libavcodec/mdec.c libavcodec/mpeg12.c libavcodec/options.c libavcodec/version.h libavcodec/vorbisdec.c Merged-by: Michael Niedermayer commit 8529f9b36b7c1b8f2cb36ba2709983517c4b6458 Author: Michael Niedermayer Date: Wed May 18 21:39:22 2011 +0200 av_find_stream_info: Print more details about max anaylize duration failures. Signed-off-by: Michael Niedermayer commit e98a95e7792f9452bc790f2552d9ea24d0f7818e Author: Justin Ruggles Date: Wed May 18 20:18:08 2011 -0400 10l: wrap float_interleave functions in HAVE_YASM. fixes compilation with --disable-yasm commit 155d1d189bf240764a18a6923739e84d09ac5d08 Author: Etienne Buira Date: Wed May 18 18:54:42 2011 +0200 Add little description for -rc_override Signed-off-by: Michael Niedermayer commit 41e21e4db623ebd77f431a6f30cf21d62d9e1f33 Author: Justin Ruggles Date: Wed May 18 17:52:31 2011 -0400 APIchanges: fill in date and commit for request_sample_fmt commit 9aa8193a234ccb6a79cba5cc550531f62ffb0a17 Author: Justin Ruggles Date: Fri Apr 22 21:30:19 2011 -0400 Add floating-point sample format support to the ac3, eac3, dca, aac, and vorbis decoders. Based on patches by clsid2 in ffdshow-tryout. commit bc778a0cea3027941afa1ff6bbb424b3159a0b27 Author: Justin Ruggles Date: Sun Apr 24 16:48:42 2011 -0400 Add support for request_sample_format in ffmpeg and ffplay. commit 00e5da893dc8f67cbc9ed940c4da9423a01e4f8c Author: Justin Ruggles Date: Thu Apr 21 10:48:05 2011 -0400 Add APIchanges entry for request_sample_fmt. commit 64150ff014708b4b00cb5d76237e9e908ac0fbfc Author: Justin Ruggles Date: Tue Apr 19 19:47:01 2011 -0400 Add request_sample_fmt field to AVCodecContext. This will allow audio decoders to support output of different sample formats as a runtime option. commit 32f8fb8ecf8178b9c9ec8d7152f1fdd8537f7f3a Author: Justin Ruggles Date: Sun Apr 24 17:50:17 2011 -0400 Add float_interleave() to FmtConvertContext with x86-optimized versions. Partially based on patches by clsid2 in ffdshow-tryout. ff_float_interleave6() x86 improvements by Loren Merrit. commit f907ad9b85d5e08e4a024e24734181940cd4fc48 Author: Mans Rullgard Date: Wed May 18 17:13:15 2011 +0100 Remove unused make variable SEEK_REFFILE Signed-off-by: Mans Rullgard commit 164c24c858047f304a81278615409503c6a7da17 Author: Mans Rullgard Date: Wed May 18 17:23:47 2011 +0100 fate: remove redundant aref and vref references The ref targets are included in the FATE_[AV]CODEC lists created by configure so they do not need to be listed separately in the makefile. Filter them out when setting dependencies to avoid make warnings about circular deps. Signed-off-by: Mans Rullgard commit 7e5cb2ef51650d1c3050cfa09bf4496813df5e57 Author: Tomas Härdin Date: Wed May 18 13:48:39 2011 +0200 Parse 'bext' metadata in the wav demuxer Signed-off-by: Michael Niedermayer commit 40612f260160014165f045d66da1d7e35ce857cf Author: Tomas Härdin Date: Thu Mar 3 16:41:11 2011 +0100 Cosmetics: indent Signed-off-by: Michael Niedermayer commit 6629dbd299717169c2dc8cf9218cf98e43322fb5 Author: Tomas Härdin Date: Wed May 18 13:48:02 2011 +0200 Keep parsing wav until EOF if the input is seekable and we know the size of the data tag Signed-off-by: Michael Niedermayer commit a06d238e8cc44ea970ebb2b671389c78bc5bb251 Author: Tomas Härdin Date: Thu Feb 17 15:58:10 2011 +0100 Refactor the tag checking into a switch statement Signed-off-by: Michael Niedermayer commit 93df511ec78a190a35b66f22e3a151f1b646a19a Author: Tomas Härdin Date: Wed May 18 13:47:23 2011 +0200 Use avio_tell() instead of url_ftell() Signed-off-by: Michael Niedermayer commit 420ebd1850de594cfdbb573237ba9e2df39946ad Author: Compn Date: Wed May 18 11:50:34 2011 -0400 add x264opts entry to docs commit 8146d16b60ec84aae93cfc4a9444d879f9d5bbfc Author: JULIAN GARDNER Date: Wed May 18 16:51:20 2011 +0200 cleaned up the udp.c, removed some variables and an av_log commit e3ff6e8d0fb222a8fce7c747781258e6f5e47a70 Author: Michael Niedermayer Date: Wed May 18 16:36:08 2011 +0200 configure: favor pkg_config over sdl_config This fixes linking issues on ubuntu. Signed-off-by: Michael Niedermayer commit d1f9621d39b80add240d09daf1328ceae613bcd4 Author: Michael Niedermayer Date: Wed May 18 15:39:40 2011 +0200 libx264: support passing arbitrary parameters. Idea taken from mencoder. This should fix conflicts with presets as long as the new system is used. Signed-off-by: Michael Niedermayer commit e89403216cc15563a7f701a9e6547abf2b8ad7a9 Author: Michael Niedermayer Date: Wed May 18 13:58:13 2011 +0200 ffmpeg: dont show_banner() on verbose<0 Signed-off-by: Michael Niedermayer commit 1a14a27603fec02498627b6f92cea7bd57c8d41f Author: Mans Rullgard Date: Wed May 18 15:13:58 2011 +0100 fate: remove do_ffmpeg_nocheck function This function is essentially an alias for run_ffmpeg and is only used in one place. This patch removes the function and replaces the call with the equivalent (simpler) run_ffmpeg call. Signed-off-by: Mans Rullgard commit d4a7df423c7eda78185d79fb81ffe36b3d4253c4 Author: Mans Rullgard Date: Wed May 18 15:05:26 2011 +0100 fate: do not collect -benchmark output The old regtest scripts pass -benchmark and collect the utime values. As these values are never used, this machinery can be removed. Signed-off-by: Mans Rullgard commit a06bf6368be2acb760a10289645eba1f65bf967b Author: Mans Rullgard Date: Mon May 16 16:37:38 2011 +0100 mpegaudiodec: remove decode_end() function This function is not needed since 721d6f2dc5 removed the DCT table allocations for the configuration used here. Signed-off-by: Mans Rullgard commit 70378ea1902b57ccb221157fbd3a411d11046ad0 Author: Mans Rullgard Date: Wed May 18 13:05:39 2011 +0100 fate: run aref and vref as regular tests These tests create reference files used for psnr calculation in the other codec tests. Treating them as (mostly) regular tests simplifies the makefile and makes them visible in the fate reports. The latter makes errors in these runs easier to identify. Signed-off-by: Mans Rullgard commit dede36bd024fb23da244dbfab32b7ef18ca51c82 Author: Mans Rullgard Date: Tue May 17 20:39:09 2011 +0100 mpegaudio: sanitise compute_antialias_* names This makes the compute_antialias functions use the same naming convention as everything else. Signed-off-by: Mans Rullgard commit 508a24f8dc63e74bd9917e6f0c4cdbb744741ef0 Author: Ronald S. Bultje Date: Tue May 17 10:26:29 2011 -0400 mpeg12: add slice-threading checks to slice-threading initializers. Fixes "make THREADS=2 THREAD_TYPE=1 fate-mpeg2-field-enc". commit 8d44cd2cd82e27e6b051fe0606dece3b0bec0bcd Author: Ronald S. Bultje Date: Tue May 17 10:26:30 2011 -0400 h264: copy pixel_shift between slice threading contexts. Fixes "make THREADS=2 THREAD_TYPE=2 fate-h264-conformance-frext-pph10i3_panasonic_a". commit a64c58a24023b3e8c9b30bfb6908150b57117a3b Author: Alexander Strange Date: Tue May 10 11:29:09 2011 -0400 mdec: enable frame-level multithreading. Signed-off-by: Ronald S. Bultje commit 32ac63ee10ca5daa149344a75d736c1b98177392 Author: Ronald S. Bultje Date: Tue May 10 11:29:08 2011 -0400 mdec.c: fix overread. commit 64be0d1edad630f5bc0f287022f5880de07915b2 Author: Stefano Sabatini Date: Wed May 18 00:43:25 2011 +0200 id3v2: prevent unsigned integer overflow in ff_id3v2_parse() In ff_id3v2_parse(), prevent unsigned integer overflow if data length indicator is skipped and tlen is < 4. Fix crash decoding file Allaby_cut.mp3, fix trac issue #182. commit b69e5ee9027ddc1820796253f2d2bcd4e6fdba00 Author: Stefano Sabatini Date: Tue May 17 23:28:19 2011 +0200 id3v2: add @file doxy and link to format documentation commit b4bcd1e2f1d603419ea9d4fdaab400b1ad35e58c Merge: 7a88617 a26d2b4 Author: Michael Niedermayer Date: Wed May 18 05:42:42 2011 +0200 Merge remote-tracking branch 'qatar/master' * qatar/master: Fix compilation of iirfilter-test. libx264: handle closed GOP codec flag lavf: remove duplicate assignment in avformat_alloc_context. lavf: use designated initializers for AVClasses. flvdec: clenup debug code asfdec: fix possible overread on broken files. asfdec: do not fall back to binary/generic search asfdec: reindent after previous commit c7bd5ed asfdec: fallback to binary search internally mpegaudio: add _fixed suffix to some names Modify x86util.asm to ease transitioning to 10-bit H.264 assembly. dct: build dct32 as separate object files qdm2: include correct header for rdft Conflicts: ffpresets/libx264-fast.ffpreset ffpresets/libx264-fast_firstpass.ffpreset ffpresets/libx264-faster.ffpreset ffpresets/libx264-faster_firstpass.ffpreset ffpresets/libx264-medium.ffpreset ffpresets/libx264-medium_firstpass.ffpreset ffpresets/libx264-placebo.ffpreset ffpresets/libx264-placebo_firstpass.ffpreset ffpresets/libx264-slow.ffpreset ffpresets/libx264-slow_firstpass.ffpreset ffpresets/libx264-slower.ffpreset ffpresets/libx264-slower_firstpass.ffpreset ffpresets/libx264-superfast.ffpreset ffpresets/libx264-superfast_firstpass.ffpreset ffpresets/libx264-ultrafast.ffpreset ffpresets/libx264-ultrafast_firstpass.ffpreset ffpresets/libx264-veryfast.ffpreset ffpresets/libx264-veryfast_firstpass.ffpreset ffpresets/libx264-veryslow.ffpreset ffpresets/libx264-veryslow_firstpass.ffpreset libavformat/flvdec.c Merged-by: Michael Niedermayer commit 7a88617c43ce534d94591dd78d4958333492b939 Author: Michael Niedermayer Date: Wed May 18 00:03:19 2011 +0200 configure: opensolaris install is not compatible with ffmpeg, allow overriding it. ginstall works on opensolaris. Signed-off-by: Michael Niedermayer commit a26d2b4bc8af02b27168c277c5097273c05652c2 Author: Justin Ruggles Date: Tue May 17 18:06:51 2011 -0400 Fix compilation of iirfilter-test. commit 9132f2ad0c064b5cebfc0e7ad562ac0cfd67a79e Author: Michael Niedermayer Date: Wed May 18 00:01:40 2011 +0200 eval: opensolaris strtod() cannot handle 0x1234 Signed-off-by: Michael Niedermayer commit e25c67108a77b2dbf13de1339b5314d07e3ffa02 Author: Jindrich Makovicka Date: Tue May 10 15:11:45 2011 +0200 libx264: handle closed GOP codec flag Also update libx264 presets to keep closed gop as default. Signed-off-by: Jindrich Makovicka Signed-off-by: Anton Khirnov commit 29e3489602aeb72dbd8ceebfcfa7025e8a57acaf Author: Anton Khirnov Date: Fri Apr 29 11:42:05 2011 +0200 lavf: remove duplicate assignment in avformat_alloc_context. AVClass is already initialized in avformat_get_context_defaults. commit f0029cbcf68d77f4ea0ea0cc36596ea2a5305b13 Author: Anton Khirnov Date: Fri Apr 29 11:30:02 2011 +0200 lavf: use designated initializers for AVClasses. commit 3d922c84622e7bf8603390b154630c3d62b93b12 Author: Tomas Härdin Date: Tue May 17 19:52:36 2011 +0200 Make sure neither data_size nor sample_count is negative commit cc1ca9e534d540aa698d14763aee2933ca3dca59 Author: Tomas Härdin Date: Tue May 17 19:46:08 2011 +0200 Refactor the 'fmt ' tag search and parsing Moving the search and parsing of the 'fmt ' info the main loop of wav_read_header() allows tags that precede it to be parsed. Creating wav_parse_fmt_tag() makes wav_read_header() easier to read. commit 13220b1856c98d83ad8ac237e789927cce0b9413 Author: Alex Converse Date: Tue May 17 12:49:42 2011 -0700 flvdec: clenup debug code commit 29fa570d0c74c59a4a970f5ade9fbd126314cbd9 Author: Uoti Urpala Date: Thu May 12 10:20:27 2011 -0400 asfdec: fix possible overread on broken files. commit 69fa23961ededd725c68b188493cf2653d70f4fd Author: Vladimir Pantelic Date: Tue May 17 17:30:05 2011 +0200 asfdec: do not fall back to binary/generic search asf_read_seek() inside the asf demuxer already does the right thing, it tries the index and if that fails it uses binary search. If binary search is called from outside of asfdec.c it will fail because the asf code cannot clean up after itself. Therefore introduce AVFMT_NOBINSEARCH that prevents the seek code to fallback to binary search and AVFMT_NOGENSEARCH that prevents the seek code to fallback to generic search. commit b58bc17cf72fcd79b6ed80faae2d0c88729def15 Author: Vladimir Pantelic Date: Thu May 12 10:26:32 2011 +0200 asfdec: reindent after previous commit c7bd5ed commit c7bd5edae4573d901583475608865c6f6ca64061 Author: Vladimir Pantelic Date: Thu May 12 10:25:54 2011 +0200 asfdec: fallback to binary search internally lavf will do that anyway in case seek by index fails commit 4bac1bbc3bc6e102cd1e8bfd0a36db07d769dfea Author: Mans Rullgard Date: Tue May 17 13:07:08 2011 +0100 mpegaudio: add _fixed suffix to some names This adds a _fixed suffix to the fixed-point versions of things with both float and fixed-point variants. This makes it more consistent with other dual-implementation things, e.g. fft. Signed-off-by: Mans Rullgard commit d0005d347d0831c904630fe70408c9fd4eec18e8 Author: Daniel Kang Date: Mon May 16 17:18:22 2011 -0400 Modify x86util.asm to ease transitioning to 10-bit H.264 assembly. Arguments for variable size instructions are added to many macros, along with other various changes. The x86util.asm code was ported from x264. Signed-off-by: Diego Biurrun commit a4b6000b00850f74fabc06f673da49331d5fdf5d Author: Michael Niedermayer Date: Tue May 17 16:48:39 2011 +0200 ffmpeg: reset top_field_first in opt_input_file(). This allows seting tff for inputs without also setting it for the output Signed-off-by: Michael Niedermayer commit 6f2309ed2e0c5c02ab417f3f0acad23e86411079 Author: Mans Rullgard Date: Tue May 17 11:48:28 2011 +0100 dct: build dct32 as separate object files This builds the float and fixed-point versions of dct32 separately instead of #including the file in dct.c and mpegaudiodec.c. Signed-off-by: Mans Rullgard commit 1362a291c971ba2c46c08f0533265b294030de27 Author: Mans Rullgard Date: Tue May 17 13:42:43 2011 +0100 qdm2: include correct header for rdft Signed-off-by: Mans Rullgard commit bec994dff22c5f3f0a5c7a96b333b3faab81c02d Author: Nicolas George Date: Fri Apr 15 17:08:12 2011 +0200 Ogg demuxer: give meaningful error codes and warnings. Signed-off-by: Nicolas George commit 34b92dbd942f6aef50632bf86eb87bf3b0175b26 Merge: cb8b824 f8ae3a2 Author: Compn Date: Mon May 16 23:31:23 2011 -0400 Merge branch 'master' of git.videolan.org:ffmpeg commit cb8b824a0899a086ed22eef84b0eedbcab6788c9 Author: Compn Date: Mon May 16 23:30:41 2011 -0400 update changelog with 9/10 bit H264 and FFV1 changes commit f8ae3a2108b612776e886d927b4a7289dde619f1 Merge: e6e7ba0 901ff51 Author: Michael Niedermayer Date: Tue May 17 04:47:05 2011 +0200 Merge remote branch 'qatar/master' 12 files changed, 36 insertions(+), 81 deletions(-) yes thats 36 new lines in 14 commits * qatar/master: ffmpeg: fix -aspect cli option Restructure video filter implementation in ffmpeg.c. ffplay: remove audio_write_get_buf_size() forward declaration lavfi: print key-frame and picture type information in ff_dlog_ref() mathops: remove ancient confusing comment cws2fws: Improve error message wording. tools: Check the return value of write(). mpegaudio: move OUT_FMT macro to mpegaudiodec.c mpegaudio: remove OUT_MIN/MAX macros Add missing #includes to mp3_header_(de)compress bsf dct: fix indentation dct: bypass table allocation for DCT_II of size 32 h264dsp_mmx: Add #ifdefs around some mmxext functions on x86_64. Remove unused header mpegaudio3.h. Conflicts: ffmpeg.c libavcodec/mpegaudio.h libavcodec/mpegaudio3.h libavfilter/avfilter.c Merged-by: Michael Niedermayer commit e6e7ba0ce3aadef32f7f16f706c4a0406b5bd70f Author: Michael Niedermayer Date: Tue May 17 00:46:48 2011 +0200 Add some forgotten const to function arguments in libavfilter & libavformat. Signed-off-by: Michael Niedermayer commit f2962ac8ad353c12d81bc515a01427f0912b4a69 Author: Carl Eugen Hoyos Date: Tue May 17 01:56:01 2011 +0200 Write channel_layout for multichannel aif files. commit 6d721f714ee61d6e244b980113aa24d5afcbfee0 Author: Carl Eugen Hoyos Date: Tue May 17 01:47:12 2011 +0200 Fix ff_mov_write_chan() so it can be used by other muxers. commit d2549ba9df1a1aac8c0ae19bfca2c81e508ba02e Author: Carl Eugen Hoyos Date: Tue May 17 01:17:27 2011 +0200 Fix some mov files with little endian audio (tickets 201 - 203). commit e280a4da2ae6fd44f0079358ecc5aa08e388a5ed Author: Stefano Sabatini Date: Sun May 15 13:24:46 2011 +0200 iff/8svx: redesign 8SVX demuxing and decoding for handling stereo samples correctly Make the iff demuxer send the whole audio chunk to the decoder as a single packet, move stereo interleaving from the iff demuxer to the decoder, and introduce an 8svx_raw decoder which performs stereo interleaving. This is required for handling stereo data correctly, indeed samples are stored like: LLLLLL....RRRRRR that is all left samples are at the beginning of the chunk, all right samples at the end, so it is necessary to store and process the whole buffer in order to decode each frame. Thus the decoder needs all the audio chunk before it can return interleaved data. Fix decoding of files 8svx_exp.iff and 8svx_fib.iff, fix trac issue #169. commit d8353256a3ae9bbf76b9b080884b82566c4938ab Author: Stefano Sabatini Date: Fri May 13 23:28:18 2011 +0200 iff: compact code setting metadata tags Ease readability. commit 34f590b29bc427036b6cb030bcc23d120316c20f Author: Stefano Sabatini Date: Tue May 10 15:40:03 2011 +0200 iff: fix bitrate computation for compressed audio stream commit 1af99b0292b7e27f989ecf817a09e2b29976490f Author: Stefano Sabatini Date: Tue May 10 15:33:36 2011 +0200 iff: distinguish fields for audio and video compression Create separate fields 8svx_compression (for audio compression), and bitmap_compression (for video compression), and perform minor related logging tweaks. Improve clarity, also simplify the case when both types of compression are employed in the same file. commit c0170d09738c74280af78c6f64914c52a9b6e075 Author: Stefano Sabatini Date: Sun May 15 12:47:06 2011 +0200 imgutils: introduce internal image_get_linesize() and use it Allow to factorize code between av_image_get_linesize() and av_image_fill_linesizes(), and add missing checks. Increase robustness. commit 0d73227c712eca2247e06d7a3c2daeb6f6f2a128 Author: Stefano Sabatini Date: Fri May 13 16:27:35 2011 +0200 imgutils: make av_image_get_linesize() return AVERROR(EINVAL) for invalid pixel formats commit d8c7a216024e1408a1f865227cdfd371ddbe1d59 Author: Stefano Sabatini Date: Mon May 16 23:44:35 2011 +0200 drawtext: specify union type for setting default options Fix warnings of the type: vf_drawtext.c:NNN: warning: missing braces around initializer vf_drawtext.c:NNN: warning: (near initialization for ‘drawtext_options[X].default_val’) commit e8ea9c21790660256942c66a74bf992287f8bb7b Author: Stefano Sabatini Date: Mon May 16 23:48:00 2011 +0200 drawtext: reindent after the previous commit commit ce207e050e38352541531e2f09d62c2f54680063 Author: Stefano Sabatini Date: Mon May 16 20:11:50 2011 +0200 drawtext: fix strftime() text expansion The feature was dropped after the filter was partially rewritten and recommitted. Fix issue #207. commit 901ff51116f831c9082e14c80c7481dd3999aa30 Author: Baptiste Coudurier Date: Fri Apr 1 17:30:45 2011 +0200 ffmpeg: fix -aspect cli option Redesign the way -aspect option is handled. This is done by making ffmpeg read the sample aspect ratio set in the corresponding input stream by default, and overriding it using the value specified by -aspect. If the output display aspect ratio is specified with -aspect, it is set at the end of the filterchain, thus overriding the value set by filters in the filterchain. This implementation is more robust, since does not modify the filterchain description (which was creating potential syntax errors). (Cherry-pick abf8342aa94bdf06bb324f6723a6743dd628d5c6) Another aspect ratio fix try. This leaves the setdar addition at the end (preferred by people). (Cherry-pick e7c7b0d000e81d24327602e04d8fed400dbb7193) commit 9d5fa6182dd2e41d5c174b29ef2a1a2f83a02d23 Author: Michael Niedermayer Date: Mon Feb 14 23:02:10 2011 +0100 Restructure video filter implementation in ffmpeg.c. This fixes several bugs like multiple outputs and -aspect mixed with -vf (cherry picked from commit 1762d9ced70ccc46c5d3e5d64e56a48d0fbbd4f7) (cherry picked from commit 5c20c81bfa526b3a269db9c88b0c9007861f0917) (cherry picked from commit a7844c580d83d8466c161a0e3979b3902d0d9100) commit 3a7c977417f7904a6213048ed3e57dd79264d3d5 Author: Stefano Sabatini Date: Tue Apr 12 12:06:49 2011 +0200 ffplay: remove audio_write_get_buf_size() forward declaration Move up the definition of audio_write_get_buf_size(), so that it is defined before it is used. Simplify. (cherry picked from commit 8776f3d22e401e30d17856e341f6cabbbefa92f7) commit 5dc65a3d0374ffd85e5ff1c89f5917d392897920 Author: Stefano Sabatini Date: Sat Apr 23 19:55:59 2011 +0200 lavfi: print key-frame and picture type information in ff_dlog_ref() Signed-off-by: Stefano Sabatini (cherry picked from commit f7bdffb09da597c5d6afff5359523370470ad072) commit 005db470115ebe2c973688bed9695356f487d674 Author: Mans Rullgard Date: Mon May 16 21:31:06 2011 +0100 mathops: remove ancient confusing comment Signed-off-by: Mans Rullgard commit 9763420bcc4a50a4c6e9ce2ee46f10de0bc7760c Author: Michael Niedermayer Date: Mon May 16 21:52:35 2011 +0200 rawdec: Allow overriding top field first. Iam not sure this is the best way to implement it, but its the simplest and keeps the code seperate from the application. Keeping ffmpeg.c simple and not requireing user apps to duplicate this code. Signed-off-by: Michael Niedermayer commit 198783744e181f047925bf829c69a2a35b85f6ab Author: Michael Niedermayer Date: Mon May 16 21:20:35 2011 +0200 ffmpeg: initialize input_codec array earlier. Signed-off-by: Michael Niedermayer commit 5319f48a5753772e5c04c022a0ed903d8ceecbd1 Author: Michael Niedermayer Date: Mon May 16 21:00:06 2011 +0200 cmdutils: Allocate private decoder context if its not allocated yet. This fixes and simplifies setting decoder private options. Signed-off-by: Michael Niedermayer commit c540061f3f552daa3724289b59b0a7a3692ad740 Author: Diego Biurrun Date: Sun May 15 22:17:35 2011 +0200 cws2fws: Improve error message wording. commit d39facc783c270227e5b7c75db3dec406ed19018 Author: Diego Biurrun Date: Sun May 15 18:34:11 2011 +0200 tools: Check the return value of write(). This fixes several warnings of the type: warning: ignoring return value of ‘write’, declared with attribute warn_unused_result commit bdefbf3e8857d2861d8d57c0ef583fe15a46d1a4 Author: Mans Rullgard Date: Mon May 16 17:06:30 2011 +0100 mpegaudio: move OUT_FMT macro to mpegaudiodec.c Signed-off-by: Mans Rullgard commit 92ea249d7db4baf64680f412c6bd99ff85860723 Author: Mans Rullgard Date: Mon May 16 17:13:23 2011 +0100 mpegaudio: remove OUT_MIN/MAX macros These macros are no longer needed after the s32 output was removed. Change the relevant code to use av_clip_int16() instead of using explicit limits. Signed-off-by: Mans Rullgard commit 5026f946fda58b209334a40319af7c42ceb985fe Author: Mans Rullgard Date: Mon May 16 15:23:22 2011 +0100 Add missing #includes to mp3_header_(de)compress bsf Signed-off-by: Mans Rullgard commit 9503fbb859d859fada35c966af8d4765a8b819fa Author: Mans Rullgard Date: Mon May 16 15:57:36 2011 +0100 dct: fix indentation Signed-off-by: Mans Rullgard commit 721d6f2dc5437df21ae17923b29fa2be847764c7 Author: Mans Rullgard Date: Mon May 16 15:57:04 2011 +0100 dct: bypass table allocation for DCT_II of size 32 The size-32 DCT_II has a special implementation which doesn't use the normal tables. Skipping allocation of these in this case saves some memory. Signed-off-by: Mans Rullgard commit 68bed67d2eaabcfa7eaf00442312055f7d953b69 Author: Stefano Sabatini Date: Mon May 16 01:51:04 2011 +0200 pngdec: relax condition for setting monoblack pixel format Ignore color_type information for setting the monoblack pixel format, only rely on bit_depth. In particular: fix Test_1bpp_grayscale.png from issue #172. This may work fine for some broken encoder, and not for others. commit 257de5fb25454209ccb3fd152d1ff3c98813e2ce Author: Gil Pedersen Date: Mon May 16 14:40:56 2011 +0200 h264dsp_mmx: Add #ifdefs around some mmxext functions on x86_64. This fixes linking errors due to undefined symbols on x86_64 OS X. Signed-off-by: Diego Biurrun commit d39bf3df729bed5f5df5d973ecc7110434416fe3 Author: Diego Biurrun Date: Mon May 16 03:34:20 2011 +0200 Remove unused header mpegaudio3.h. The header is a part of an MP3 encoder that never saw the light of day. commit 85eedcf6ff46b5d3e593a16ebcdd84af278e6d83 Author: ami_stuff Date: Mon May 16 11:26:45 2011 +0200 Support decoding of 1bpp rawvideo in avi (ticket 205). commit 0eba7fc2935fb5d1aba949d89be4049669d1e621 Author: ami_stuff Date: Mon May 16 11:25:57 2011 +0200 Support decoding of 2bpp rawvideo in avi (ticket 206). commit d43a6edf7d62fb24f96697a7ad31cf585db4724c Author: Carl Eugen Hoyos Date: Mon May 16 11:24:23 2011 +0200 Bump minor after adding a caf muxer. commit fc193793c625afc9af2b7d7d46248f78da7e3a2d Merge: 350f3d1 033a4a9 Author: Michael Niedermayer Date: Mon May 16 05:01:24 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: aacdec: Use float instead of int16_t for ltp_state to avoid needless rounding. acelp: Remove unused gray_decode table. dfa: Remove unused variable. configure: Include AVX availability in summary output. configure: use same CPPFLAGS in kFreeBSD as Linux Merged-by: Michael Niedermayer commit 350f3d145be685768292f751ec4bec8439bf1113 Author: Hanspeter Niederstrasser Date: Mon May 16 02:57:15 2011 +0200 configure: another try on fixing osx/mingw SDL commit 033a4a942a81a1880ca5a89e7eb3a2b5f529a7fb Author: Justin Ruggles Date: Sun May 15 11:07:29 2011 -0400 aacdec: Use float instead of int16_t for ltp_state to avoid needless rounding. commit a80f74c584296971c6e6b7e0c10d9b5ec0440857 Author: Michael Niedermayer Date: Sun May 15 22:37:02 2011 +0200 av_picture_crop(): Support simple cases with packed pixels too. This fixes a regression when linked to old ffmpeg. Signed-off-by: Michael Niedermayer commit 33651e3edffcf404e7dce33395b31b1113e5d4b2 Author: Michael Niedermayer Date: Sun May 15 19:38:46 2011 +0200 Revert "lavc: remove the FF_API_VIDEO_OLD cruft." This reverts commit e89e5afdd04a0f081ecc38b528c1147f204027d7. Conflicts: libavcodec/utils.c libavcodec/version.h Signed-off-by: Michael Niedermayer commit d46aada5c2c71b9b0a259e62699cab25837053b2 Merge: 66b1f21 5a15360 Author: Michael Niedermayer Date: Sun May 15 19:18:02 2011 +0200 Merge branch 'master' into oldabi * master: (403 commits) Initial caf muxer. Support decoding of amr_nb and gsm in caf. Fix decoding of msrle samples with 1bpp. udp: remove resource.h inclusion, it breaks mingw compilation. ffmpeg: Allow seting and cycling through debug modes. Fix FSF address copy paste error in some license headers. Add an aac sample which uses LTP to fate-aac. ffmpeg: Help for interactive keys. UDP: dont use thread_t as truth value. swscale: fix compile on mingw32 [PATCH] Update pixdesc_be fate refs after adding 9/10bit YUV420P formats. arm: properly mark external symbol call ffmpeg: Interactivity support. Try pressing +-hs. swscale: 10l forgot git add this change from ronald. AVFrame: only set parameters from AVCodecContext in decode_video*() when no frame reordering is used. avcodec_default_get_buffer: init picture parameters. swscale: properly inline bits/endianness in yuv2yuvX16inC(). swscale: fix clipping of 9/10bit YUV420P. Add av_clip_uintp2() function Support more QT 1bpp rawvideo files. ... Conflicts: libavcodec/flacenc.c libavcodec/h261dec.c libavcodec/h263dec.c libavcodec/mpeg12.c libavcodec/msrle.c libavcodec/options.c libavcodec/qpeg.c libavcodec/rv34.c libavcodec/svq1dec.c libavcodec/svq3.c libavcodec/vc1dec.c libavcodec/version.h libavfilter/avfilter.h libavformat/file.c libavformat/options.c libavformat/rtpproto.c libavformat/udp.c libavutil/avutil.h Merged-by: Michael Niedermayer commit 7f995abed362be3ae54c6f0464cf00b2c89b7678 Author: Diego Biurrun Date: Fri Apr 29 19:42:00 2011 +0200 acelp: Remove unused gray_decode table. commit b1bb3b8d875900b6ea6a560d9336e4d4b3f8fb37 Author: Diego Biurrun Date: Sun May 15 13:12:47 2011 +0200 dfa: Remove unused variable. This fixes the warning: libavcodec/dfa.c:189: warning: unused variable ‘frame_end’ commit c73b779d3576754f883ad5d5968cfae131752f40 Author: Diego Biurrun Date: Sun May 15 11:46:18 2011 +0200 configure: Include AVX availability in summary output. commit 27614b121776aa2b32579808810fb95839627bd9 Author: Stefano Sabatini Date: Sat May 14 19:47:55 2011 +0200 rawdec: propagate pict_type information to the output frame commit a05d02079e0fde1ff9b6abfda79ff20b38f68439 Author: Stefano Sabatini Date: Sat May 14 15:19:26 2011 +0200 showinfo: replace "CRC" by "checksum" Indeed the Adler-32 checksum, which is computed by showinfo, is not cyclic, so using the term "CRC" is wrong/confusing. commit 5a2ea3cffb1ca6c99244b6a9b240cdbac27a0928 Author: Stefano Sabatini Date: Sat May 14 15:09:54 2011 +0200 showinfo: fix vertical align nit commit bb82ea797fb6538308af84310118d8006b150318 Author: Stefano Sabatini Date: Sat May 14 13:20:52 2011 +0200 showinfo: fix computation of Adler checksum Previously the code was computing the checksum only for the first line of each plane. commit 10931720cd55d83e0b933b8a9bb0795fd9e48875 Author: Stefano Sabatini Date: Fri May 13 15:42:31 2011 +0200 imgutils: generalize linesize computation for bitstream formats Make it a subcase of the general algorithm used for the non-bitstream case. Simplify, and make av_image_get_linesize() and av_image_fill_linesizes() correctly return the right value when plane != 0. In particular fix a crash occurring with: -vf format=monow,showinfo,format=monow. commit c1f54478050279663217fe5ffa4bc90f60e7030d Author: Reinhard Tartler Date: Sat May 14 16:10:30 2011 +0200 configure: use same CPPFLAGS in kFreeBSD as Linux 046f081b46c8479820409cf8f530b988221bd15b reorganized the CPPFLAGS to no longer add -D_POSIX_C_SOURCE unconditionally, but only on systems (e.g., glibc based ones) that require it. As kFreeBSD uses glibc, it needs to be treated similar. Additionally, _BSD_SOURCE is turned on to enable some additional types such as caddr_t, which are normally enabled on BSD but not with glibc. commit 5a153604c930792aa7f00c55cbf3c470f582dfb7 Merge: 2c4ad1a 888fa31 Author: Michael Niedermayer Date: Sun May 15 04:40:50 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: Fix FSF address copy paste error in some license headers. Add an aac sample which uses LTP to fate-aac. DUPLICATE [PATCH] Update pixdesc_be fate refs after adding 9/10bit YUV420P formats. arm: properly mark external symbol call Conflicts: libavcodec/x86/ac3dsp.asm libavcodec/x86/deinterlace.asm libavcodec/x86/dsputil_yasm.asm libavcodec/x86/dsputilenc_yasm.asm libavcodec/x86/fft_mmx.asm libavcodec/x86/fmtconvert.asm libavcodec/x86/h264_chromamc.asm libavcodec/x86/h264_deblock.asm libavcodec/x86/h264_idct.asm libavcodec/x86/h264_intrapred.asm libavcodec/x86/h264_weight.asm libavcodec/x86/vc1dsp_yasm.asm libavcodec/x86/vp3dsp.asm libavcodec/x86/vp56dsp.asm libavcodec/x86/vp8dsp.asm libavcodec/x86/x86util.asm libswscale/ppc/swscale_template.c Merged-by: Michael Niedermayer commit 2c4ad1a37b7980b40d6875daea4f87b154509c2e Author: Carl Eugen Hoyos Date: Sun May 15 03:25:27 2011 +0200 Initial caf muxer. commit 0c3803f6bb50038970ee40daa25cfb3ea484febd Author: Carl Eugen Hoyos Date: Sun May 15 02:42:58 2011 +0200 Support decoding of amr_nb and gsm in caf. commit 445ee35e21c92e2429241d65bdba65f6e7c09132 Author: Carl Eugen Hoyos Date: Sun May 15 02:38:02 2011 +0200 Fix decoding of msrle samples with 1bpp. commit 7b915726ebeab8ce4125dacb4afa79f04913a6fe Author: Michael Niedermayer Date: Sun May 15 01:48:17 2011 +0200 udp: remove resource.h inclusion, it breaks mingw compilation. The header seems unneeded, if its needed we will put it back with appropriate #if Signed-off-by: Michael Niedermayer commit 90bb2c78d6344537aa8c670334cffae2f2bb7259 Author: Michael Niedermayer Date: Sun May 15 01:39:04 2011 +0200 ffmpeg: Allow seting and cycling through debug modes. Signed-off-by: Michael Niedermayer commit 888fa31ecafa75cef3c154e129c45060eea88bd7 Author: Diego Biurrun Date: Sat May 14 21:32:31 2011 +0200 Fix FSF address copy paste error in some license headers. commit 08e434b015b204e36aa03a645249d6ca260bc6d1 Author: Justin Ruggles Date: Tue Apr 26 18:19:52 2011 -0400 Add an aac sample which uses LTP to fate-aac. commit 34e838083e385a96640f07923b2b45798a12baa4 Author: Michael Niedermayer Date: Sat May 14 15:51:47 2011 +0200 ffmpeg: Help for interactive keys. Signed-off-by: Michael Niedermayer commit e60e54ceb55ae81f071a0f36cc87a39488047fd1 Author: Michael Niedermayer Date: Sat May 14 13:34:08 2011 +0200 UDP: dont use thread_t as truth value. Unbreak compile on mingw. Signed-off-by: Michael Niedermayer commit 502e858fd2cae24d5090acd5c79619b93756baa3 Author: Peter Belkner Date: Sat May 14 13:22:46 2011 +0200 swscale: fix compile on mingw32 Compiling "swscale.c" breaks on MINGW32 because of multiple including "libswscale_template.c" commit 76f8a96e008c2f383c52750e90ff8f1f30e6d72a Author: Ronald S. Bultje Date: Fri May 13 19:01:50 2011 -0400 [PATCH] Update pixdesc_be fate refs after adding 9/10bit YUV420P formats. Also remove code that overwrites the C versions of functions in sws_init_swScale_altivec(), so that it uses the C functions of files if no altivec-optimized version exists. commit b1eb7a12047d2ba03990b40f3940db33ea4b0bd6 Author: Martin Aumüller Date: Sat May 14 10:10:27 2011 +0200 arm: properly mark external symbol call Surround memset and ff_vp8_dct_cat_prob by X() in order to fix iOS build Includes patch by Luca Barbato . Signed-off-by: Luca Barbato commit 0f6a8579af0bd7e895e1bff32c73de48ac8a5853 Author: Michael Niedermayer Date: Sat May 14 02:54:28 2011 +0200 ffmpeg: Interactivity support. Try pressing +-hs. Signed-off-by: Michael Niedermayer commit b025431bfee2f81a5a0a613f49cac354e4aa9dfa Author: Ronald S. Bultje Date: Sat May 14 02:47:14 2011 +0200 swscale: 10l forgot git add this change from ronald. Signed-off-by: Michael Niedermayer commit 58c03f6d7d6eabdbc25103e8229a06ddf3718bb9 Merge: 01d3eba 9f54e46 Author: Michael Niedermayer Date: Sat May 14 02:19:23 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: swscale: properly inline bits/endianness in yuv2yuvX16inC(). (We didnt pull the bug) swscale: fix clipping of 9/10bit YUV420P. Add av_clip_uintp2() function (our patch / duplicate) dfa: fix buffer overflow checks to avoid integer overflows. (our patch / duplicate) movenc: always write esds descriptor length using 4 bytes. (our patch / duplicate) ffmpeg: use parse_number_and_die() when it makes sense (No thanks) ffmpeg: get rid of the 'q' key schizofrenia Merged-by: Michael Niedermayer commit 01d3ebaf219d83c0a70cdf9696ecb6b868e8a165 Author: Michael Niedermayer Date: Sat May 14 00:11:10 2011 +0200 AVFrame: only set parameters from AVCodecContext in decode_video*() when no frame reordering is used. Signed-off-by: Michael Niedermayer commit a3bc7a9ebf37e642878f6a50a234feb987e732e9 Author: Michael Niedermayer Date: Fri May 13 23:23:30 2011 +0200 avcodec_default_get_buffer: init picture parameters. Fixes multithreading regression introduced in 64c06615d2b99fb9f4ffd6226d0e5787b44a41e2 Fixes ticket197 Signed-off-by: Michael Niedermayer commit 9f54e461fecec7a97ec1b97ae4468135ea770609 Author: Ronald S. Bultje Date: Fri May 13 10:28:49 2011 -0400 swscale: properly inline bits/endianness in yuv2yuvX16inC(). commit c3d68ec9c5fc8b86de2bf3757d353e6ff4ce0815 Author: Ronald S. Bultje Date: Fri May 13 16:45:04 2011 -0400 swscale: fix clipping of 9/10bit YUV420P. commit 1550f45a8928f31c48f770b5ddf860c99a57687e Author: Mans Rullgard Date: Fri May 13 16:39:17 2011 +0100 Add av_clip_uintp2() function Signed-off-by: Mans Rullgard commit 2bd12ee3c8dd7b2555af9aafa0b484b32ba59520 Author: ami_stuff Date: Fri May 13 18:10:33 2011 +0200 Support more QT 1bpp rawvideo files. Fixes ticket #189. commit 29ef0174cc0c4bdf188cf3e5c27790529c33d18c Author: Michael Niedermayer Date: Fri May 13 17:49:00 2011 +0200 UDP: udp depends on pthreads now Signed-off-by: Michael Niedermayer commit 03f8f39769f385f04b770c748a46298e46ab3196 Author: Michael Niedermayer Date: Fri May 13 17:16:15 2011 +0200 udp: switch custom fifo to libavutil fifo. This also allows us to drop the semaphore as our fifo is lock free. Signed-off-by: Michael Niedermayer commit 593bb98d617de8ebfcd686a08be16ea1c26c84e3 Author: Michael Niedermayer Date: Fri May 13 16:31:05 2011 +0200 udp: use FFMAX&FFMIN. Signed-off-by: Michael Niedermayer commit 4275602183d35eed9a9b7bbfef57ffc44d3484e7 Author: JULIAN GARDNER Date: Fri May 13 16:28:42 2011 +0200 udp: add a thread into udp.c for receiving data into a circular buffer, this stops the problem of live decoding/encoding giving errors. Also added a buf_size which is the number of TS packets that to be allocated for the circular buffer. commit 4d15f194b48ad1d92cca2559b6b0db3f0f234528 Author: Stefano Sabatini Date: Fri May 13 02:07:09 2011 +0200 tiffenc: set bpp table for monow/monob formats Also makes the bpp_tab non static const, as it needs to be changed in this case. Fix encoding of monow/monob images, fix trac issue #193. commit ac8d6f120da3f342cd0fc8af35d9633dbaddcfe5 Author: Stefano Sabatini Date: Fri May 13 02:03:18 2011 +0200 tiffenc: factorize code for monow/monob case in encode_frame() switch Reduce code duplication, increase robustness. commit 995013ebc847f9c7bdc5fd8dc1df53c9ad4a7066 Author: Stefano Sabatini Date: Fri May 13 01:49:15 2011 +0200 tiffenc: fix bpp value for monow/monob formats commit d8297ca443c8f7cc9ce3959ad287f9d380343266 Author: Stefano Sabatini Date: Mon May 9 22:11:57 2011 +0200 tiff: fix linesize for mono-white/black formats Fix decoding of file Test_1bpp.tif, fix trac issue #171. commit 762b4662f04026ae31bb2be9678e42b7f2c4e2c1 Author: Stefano Sabatini Date: Mon May 9 21:26:39 2011 +0200 tiff: print log in case of unknown / unsupported tag Helps debugging. commit 2c9a5172d328259c5d76e588f2ddc12f439ffcd0 Author: Reimar Döffinger Date: Tue Mar 29 21:14:55 2011 +0200 dfa: fix buffer overflow checks to avoid integer overflows. Signed-off-by: Anton Khirnov commit 7e19a6e86814b08073b4b8873598ef5d94e6345d Author: Baptiste Coudurier Date: Wed Mar 30 14:08:16 2011 -0700 movenc: always write esds descriptor length using 4 bytes. ipod shuffle doesn't support anything else. Signed-off-by: Anton Khirnov commit dbe94539469b6d5113b37ea45eaf69ddbe34154e Author: Stefano Sabatini Date: Mon Apr 11 13:16:07 2011 +0200 ffmpeg: use parse_number_and_die() when it makes sense Prefer parse_number_or_die() over atoi()/atol() parsing for the options: -pass, -top, -vc, and -qscale. Improve input validation. Signed-off-by: Stefano Sabatini Signed-off-by: Anton Khirnov commit 8fb566fdf839206584b1dec7da2eb9c9540108fa Author: Anton Khirnov Date: Thu May 12 15:15:07 2011 +0200 ffmpeg: get rid of the 'q' key schizofrenia SIGINT for quitting should be enough for everybody. commit e3114a9c8a83fc029799209b443eddd45155c793 Author: Michael Niedermayer Date: Fri May 13 05:10:24 2011 +0200 Add checksums specific to BE machines after last swscale update. Signed-off-by: Michael Niedermayer commit 72153419b52c96b1ed4a1bfb7e7793ddde7d71b2 Merge: 410ca3b 552a999 Author: Michael Niedermayer Date: Fri May 13 04:40:40 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: (33 commits) rtpdec_qdm2: Don't try to parse data packet if no configuration is received ac3enc: put the counting of stereo rematrixing bits in the same place to make the code easier to understand. ac3enc: clean up count_frame_bits() and count_frame_bits_fixed() mpegvideo: make FF_DEBUG_DCT_COEFF output coeffs via av_log() instead of just via AVFrame. srtdec: make sure we don't write past the end of buffer wmaenc: improve channel count and bitrate error handling in encode_init() matroskaenc: make sure we don't produce invalid file with no codec ID matroskadec: check that pointers were initialized before accessing them lavf: fix function name in compute_pkt_fields2 av_dlog message lavf: fix av_find_best_stream when providing a wanted stream. lavf: fix av_find_best_stream when decoder_ret is given and using a related stream. ffmpeg: factorize quality calculation tiff: add support for SamplesPerPixel tag in tiff_decode_tag() tiff: Prefer enum TiffCompr over int for TiffContext.compr. mov: Support edit list atom version 1. configure: Enable libpostproc automatically if GPL code is enabled. Cosmetics: fix prototypes in oggdec oggdec: fix memleak with continuous streams. matroskaenc: add missing new line in av_log() call dnxhdenc: add AVClass in private context. ... swscale changes largely rewritten by me or replaced by baptsites due to lots of bugs in ronalds code. Above code is also just in case its not obvios to a large extended duplicates that where cherry picked from ffmpeg. Conflicts: configure ffmpeg.c libavformat/matroskaenc.c libavutil/pixfmt.h libswscale/ppc/swscale_template.c libswscale/swscale.c libswscale/swscale_template.c libswscale/utils.c libswscale/x86/swscale_template.c tests/fate/h264.mak tests/ref/lavfi/pixdesc_le tests/ref/lavfi/pixfmts_copy_le tests/ref/lavfi/pixfmts_null_le tests/ref/lavfi/pixfmts_scale_le tests/ref/lavfi/pixfmts_vflip_le Merged-by: Michael Niedermayer commit 410ca3bc2d5e95078f3d6698a2f9e53c2fd24f95 Author: Carl Eugen Hoyos Date: Fri May 13 01:08:01 2011 +0200 Support Digital Voodoo SD 8 Bit in mov (ticket 195). commit 92ccdfb8bfbe0b183c6989d8c2d0f02f887c3c47 Author: ami_stuff Date: Fri May 13 00:49:29 2011 +0200 Support R10g in mov. commit 86f2c36c6c62cf0c5789dee975c57029a2b4cf86 Author: Carl Eugen Hoyos Date: Fri May 13 00:23:30 2011 +0200 Add 5.1 plus stereo-downmix to mov_channel_layout array. commit 69b6b2d2bc363888957ba8a535bbb7b893894907 Author: Carl Eugen Hoyos Date: Fri May 13 00:23:00 2011 +0200 Set channel_layout for S302M. commit 0aac0403c54eb7f47d5d707e1368e52763043a69 Author: Carl Eugen Hoyos Date: Fri May 13 00:22:05 2011 +0200 Map mlp surround channels to FFmpeg rear channels. This allows more 3rd party applications to correctly read the resulting wav files. commit a37f7b62461e43f90b30d231e97fb105ae5028fe Author: Alexandre Colucci Date: Fri May 13 00:21:19 2011 +0200 Support native DTS channel order when requested. commit 552a99957f7c6f6ed13795caee7ab7b9deb5d76e Author: Martin Storsjö Date: Thu May 12 22:47:53 2011 +0300 rtpdec_qdm2: Don't try to parse data packet if no configuration is received The later parsing of payload data depends on the configuration being present. If it hasn't been configured properly yet, parsing a data packet may lead to a crash. Signed-off-by: Martin Storsjö commit f0eb373f9dcd3a98177e5637755b3332bd77b1a8 Author: Michael Niedermayer Date: Thu May 12 20:05:47 2011 +0200 pixfmt-Comment: Fix big/little typo Found-by: kierank Signed-off-by: Michael Niedermayer commit 4d7a4215748e8dc3740dfe6be4070ce055df6023 Author: Justin Ruggles Date: Sat Apr 30 15:55:18 2011 -0400 ac3enc: put the counting of stereo rematrixing bits in the same place to make the code easier to understand. commit 257de756fb3da2576c8641e0a31f1785e2439f9d Author: Justin Ruggles Date: Sat Apr 30 15:52:55 2011 -0400 ac3enc: clean up count_frame_bits() and count_frame_bits_fixed() commit c4fb3b0327dc911a7b46b8b8193e97b1fb4afe65 Author: Michael Niedermayer Date: Wed Feb 23 23:38:52 2011 +0100 mpegvideo: make FF_DEBUG_DCT_COEFF output coeffs via av_log() instead of just via AVFrame. This allows the values to be used without changing C code and is closer to how the other DEBUG flags work. Signed-off-by: Anton Khirnov commit ea5fa19427fdaba332b908758f5779add7084bbe Author: Aurelien Jacobs Date: Fri Mar 25 01:02:53 2011 +0100 srtdec: make sure we don't write past the end of buffer Signed-off-by: Aurelien Jacobs Signed-off-by: Anton Khirnov commit ee81e76db119c4ac4f52404d9d826969975aa77f Author: Tomas Härdin Date: Mon Mar 21 10:52:36 2011 +0100 wmaenc: improve channel count and bitrate error handling in encode_init() Signed-off-by: Michael Niedermayer Signed-off-by: Anton Khirnov commit 89d4c130574c6f2a617c5fde6f9b8a82da7a1e28 Author: Aurelien Jacobs Date: Thu Mar 24 01:56:26 2011 +0100 matroskaenc: make sure we don't produce invalid file with no codec ID Signed-off-by: Aurelien Jacobs Signed-off-by: Anton Khirnov commit 9c569ef7129d2e2972a5caa9cc01899a502b4bbf Author: Aurelien Jacobs Date: Thu Mar 24 00:28:19 2011 +0100 matroskadec: check that pointers were initialized before accessing them Signed-off-by: Aurelien Jacobs Signed-off-by: Anton Khirnov commit 4ad0693edccdc01dc7415b9efdc96ea5ab0dbf34 Author: Stefano Sabatini Date: Thu Mar 17 12:52:40 2011 +0100 lavf: fix function name in compute_pkt_fields2 av_dlog message Signed-off-by: Anton Khirnov commit 2c7158169859eb2dd49a72337f9f3f28347da77a Author: Marton Balint Date: Sun Feb 20 01:18:30 2011 +0100 lavf: fix av_find_best_stream when providing a wanted stream. In the main loop, stream_number is incremented after checking the stream type, so the search usually will not find the wanted stream. This patch eliminates the useless stream_number variable and introduces a new one, called real_stream_index to store the real stream index of the current stream, no matter if we are looping through all the streams or only the streams of a program. Signed-off-by: Michael Niedermayer Signed-off-by: Anton Khirnov commit 6b35a795f8ca34c92da8de81f7b20b2d47d71468 Author: Marton Balint Date: Sun Feb 20 01:18:49 2011 +0100 lavf: fix av_find_best_stream when decoder_ret is given and using a related stream. Yet another fix for the code originally designed for use without related_stream. Signed-off-by: Michael Niedermayer Signed-off-by: Anton Khirnov commit 5da116a3fde9013846bd7b385cdde5ce2951869c Author: Michael Niedermayer Date: Wed Apr 6 21:17:32 2011 +0200 ffmpeg: factorize quality calculation Calculate quality value once per stream in print_report(). Also fix segfault, as coded_frame can be NULL. Signed-off-by: Anton Khirnov commit bbc572a2c4d6d71b1c43e7853dd8caba3234dff6 Author: Stefano Sabatini Date: Mon May 9 12:51:24 2011 +0200 tiff: add support for SamplesPerPixel tag in tiff_decode_tag() Format detection and internal frame initialization is moved to a separate init_image() function, which is called when all the tags have been read, and so both BitsPerSample and SamplesPerPixel information has been collected. This fixes decoding of the file 11.tiff from roundup issue #1925. Based on a patch by Kostya Shishkov . Signed-off-by: Diego Biurrun commit 7b874dcc002da5abb2168d44b3db76fbbb135c89 Author: Michael Niedermayer Date: Thu May 12 17:46:02 2011 +0200 ffv1: Add PIX_FMT_YUV420P9 support. Signed-off-by: Michael Niedermayer commit 8102d886be012dc7a519da23b3278d36ae860f6d Author: Stefano Sabatini Date: Mon May 9 21:05:42 2011 +0200 tiff: Prefer enum TiffCompr over int for TiffContext.compr. This is safer and helps debugging. Signed-off-by: Diego Biurrun commit 7a3a2598400af165a235eb4c08afd78a44eb2601 Author: Michael Niedermayer Date: Thu May 12 17:27:31 2011 +0200 ffv1dec: output PIX_FMT_YUV422P10 and PIX_FMT_YUV420P10 when possible. Signed-off-by: Michael Niedermayer commit 518cdff81fff7bf0dac6aaa4b456fe90647acdea Author: Ivan Kalvachev Date: Thu May 12 16:11:27 2011 +0300 Fix posix_memalign() usage when libavutil is compiled outside FFmpeg. To use posix_memalign() "#define _XOPEN_SOURCE 600" have to be defined. FFmpeg configure defines it from the command line through config.mak, but when libavutil is used outside of FFmpeg the define is missing. Signed-off-by: Ivan Kalvachev Signed-off-by: Michael Niedermayer commit bcedf2e519c60e8ffa05838c65a88934f1ead3bf Author: Uoti Urpala Date: Sun Apr 24 07:21:30 2011 +0300 asfdec: fix assert failure on invalid files Add an extra size validity check in asf_read_frame_header(). Without this asf->packet_size_left may become negative, which triggers an assertion failure later. commit 10291562f37d00fb3fb78ec86e0353e474c0eccc Author: Michael Niedermayer Date: Thu May 12 16:04:13 2011 +0200 Revert "asfdec: fix assert failure on invalid files" Reverting this pulled change as author considers this change buggy compared to his original version. This reverts commit 0bd433a916cd8d98fce47742fbf6d0f90ec941c4. commit 5f0bb0baefd506d684adfa1ad4259c65973b455e Author: Yusuke Nakamura Date: Thu May 12 05:28:27 2011 +0900 mov: Support edit list atom version 1. Signed-off-by: Diego Biurrun commit ced9556b6189de67dd740f5231c6f1807f3e3704 Author: MÃ¥ns RullgÃ¥rd Date: Thu May 12 13:21:49 2011 +0100 configure: Enable libpostproc automatically if GPL code is enabled. Enabling libpostproc automatically should give it more compile coverage and save the FATE box maintainers some configuration hassles. commit 0b8002fd6865f08d100be3c6ddb13efd4b09870d Author: ami_stuff Date: Thu May 12 12:16:43 2011 +0200 Add support for QT BMP 1bpp color mode Fix trac issue #188 Signed-off-by: Michael Niedermayer commit b7903ab16b7c17fa09497632a0472ab3157574ed Author: Thierry Foucu Date: Wed May 11 16:36:39 2011 -0700 If a MP3 file contains the string NSVs, the NSV probe will think it is a NSV file instead of a MP3 file. Check for 0xBEEF after a Video/Audio chunck for more accuracy. Signed-off-by: Michael Niedermayer commit e575685fad342b9a31e89c3897f7e105811f5194 Author: Clément BÅ“sch Date: Wed May 11 20:43:29 2011 +0200 Cosmetics: fix prototypes in oggdec Signed-off-by: Diego Biurrun commit 5780f41af5d9dcb4d32f06c026ecd146b143baf9 Author: Clément BÅ“sch Date: Wed May 11 20:43:27 2011 +0200 oggdec: fix memleak with continuous streams. This avoids the creation of a new AVStream instead of replacing it when a stream reset occurs (track change with some webradios for example). Signed-off-by: Diego Biurrun commit 2501d2f386be4ab252f547055610e746c826ca91 Author: Aurelien Jacobs Date: Thu Mar 24 01:54:15 2011 +0100 matroskaenc: add missing new line in av_log() call Signed-off-by: Aurelien Jacobs Signed-off-by: Anton Khirnov commit 14cf9e698dac48cacd5e7f378469afcbf96cf507 Author: Baptiste Coudurier Date: Wed Mar 30 08:47:30 2011 -0700 dnxhdenc: add AVClass in private context. Fixes private options. Signed-off-by: Anton Khirnov commit 304e983dc760176501b748ca99bcde23e7851013 Author: Baptiste Coudurier Date: Wed Mar 23 10:22:05 2011 -0700 movenc: fix yuv range in avid atoms used by dnxhd. yuv range: full 1 / normal 2 Signed-off-by: Anton Khirnov commit 7fe3207e250991d16381096327c74125bafe3b70 Author: Alex Converse Date: Sun Feb 27 16:29:21 2011 -0800 movenc: fix adpcm mono muxing. Signed-off-by: Anton Khirnov commit 6ae38aa3ce197905fb52a631c7dd1b2a5e535b3e Author: Baptiste Coudurier Date: Sun Feb 27 16:19:50 2011 -0800 mpegts: do not output known sized packet if an unbounded packet is already queued. Fix issue #2624. Signed-off-by: Anton Khirnov commit 9c3f5ef663f2f36e951945969f99776bb12a3e7a Author: Stefano Sabatini Date: Sun Mar 13 21:22:59 2011 +0100 ffprobe: tweak error message in open_input_file() Replace "codec (id=%d)" with "codec with id %d", slightly more readable. Signed-off-by: Anton Khirnov commit c7d22c5d678e4a1977071296df7c151693358156 Author: Peter Ross Date: Fri Mar 18 22:28:52 2011 +1100 patcheck: warn about assert usage Signed-off-by: Michael Niedermayer Signed-off-by: Anton Khirnov commit 92fe25875616c902047732aaff1fa70390be57c9 Author: Stefano Sabatini Date: Fri Mar 25 18:49:24 2011 +0100 configure: sort filter deps entries Signed-off-by: Anton Khirnov commit 0a6b1a9f21d5970a0439e32303535ed85f07673e Author: Diego Biurrun Date: Fri Apr 29 16:08:20 2011 +0200 Replace int_fast integer types with their sized standard posix counterparts. The _fast integer types provide no realworld benefits, but may introduce portability issues and are just plain ugly. commit be898457081ac2610ad4184272e9254e8922ff59 Author: Diego Biurrun Date: Fri Apr 29 20:17:43 2011 +0200 jfdct: Replace sized int_fast integer types with plain int/unsigned. int/unsigned is the natural memory access type for CPUs, using sized types for temporary variables, counters and similar just increases code size and can possibly cause a slowdown. commit 046f081b46c8479820409cf8f530b988221bd15b Author: Diego Biurrun Date: Wed May 11 17:52:51 2011 +0200 configure: Do not unconditionally add -D_POSIX_C_SOURCE to CPPFLAGS. Adding _POSIX_C_SOURCE to CPPFLAGS globally produces all sorts of problems since it causes certain system functions to be hidden on some (BSD) systems. The solution is to only add the flag on systems that really require it, i.e. glibc-based ones. This change makes BSD systems compile out-of-the-box without the need for adding specific flags manually. It also allows dropping a number of flags set manually on a file-per-file basis, but were only present to work around breakage introduced by the presence of _POSIX_C_SOURCE. Also add _XOPEN_SOURCE to CPPFLAGS for glibc systems. We use XSI extensions in several places already, so it is preferable to define it globally instead of littering source files with individual #defines only needed for glibc. commit 45faf7fcd335b91e41b0e3ba4e397a9640d8c694 Author: Thierry Foucu Date: Wed May 11 21:27:04 2011 -0700 nsv: Fix misdetection of MP3 files as NSV. If an MP3 file contains the string NSVs, the NSV probe will confuse it for an NSV file. Check for 0xBEEF after a Video/Audio chunk to achieve more accuracy. Signed-off-by: Diego Biurrun commit b3bbc6fdc588ff03d9d1d2f17ef6608cf1cfff90 Author: Clément BÅ“sch Date: Wed May 11 20:43:31 2011 +0200 oggdec: use explicit AVInputFormat struct initializers Signed-off-by: Diego Biurrun commit f95257d27c91c7e1981e1f6a53c7e9217a3fae98 Author: Clément BÅ“sch Date: Wed May 11 20:43:30 2011 +0200 oggdec: simplify ogg_probe Signed-off-by: Diego Biurrun commit 612122b187d711257eecd517e4049cef3bb0b7f0 Merge: 4ea216e 5705b02 Author: Michael Niedermayer Date: Thu May 12 04:51:24 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: (32 commits) 10-bit H.264 x86 chroma v loopfilter asm Port SMPTE S302M audio decoder from FFmbc 0.3. [Copyright headers corrected] Fix crash of interlaced MPEG2 decoding h264pred: fix one more aliasing violation. doc/APIchanges: fill in missing hashes and dates. flacenc: use proper initializers for AVOption default values. lavc: deprecate named constants for deprecated antialias_algo. aac: workaround for compilation on cygwin swscale: extend YUV422p support to 10bits depth tiff: add support for inverted FillOrder for uncompressed data Remove unused softfloat implementation. h264pred: fix aliasing violations. rotozoom: Eliminate French variable name. rotozoom: Check return value of fread(). rotozoom: Return an error value instead of calling exit(). rotozoom: Make init_demo() return int and check for errors on invocation. rotozoom: Drop silly UINT8 typedef. rotozoom: Drop some unnecessary parentheses. rotozoom: K&R coding style cosmetics rtsp: Only do keepalive using GET_PARAMETER if the server supports it ... Conflicts: Changelog cmdutils.c doc/APIchanges doc/general.texi ffmpeg.c ffplay.c libavcodec/h264pred_template.c libavcodec/resample.c libavutil/pixfmt.h libavutil/softfloat.c libavutil/softfloat.h tests/rotozoom.c Merged-by: Michael Niedermayer commit 4ea216e761e02d3f6973b316feaf3484be91a14f Author: Michael Niedermayer Date: Thu May 12 03:40:21 2011 +0200 libavformat/utils: Only consider dvb teletext timestamps for start time when they are consistent with the rest. This fixes Ticket51. Signed-off-by: Michael Niedermayer commit b8a4b0152a3a697e03fd28458098a514fcdee5d3 Author: Michael Niedermayer Date: Thu May 12 03:03:08 2011 +0200 error concealment: check last pictures motion_val before using it. Fixes NULL pointer dereference. Signed-off-by: Michael Niedermayer commit 1cafc23288b9d860b9f309c86a5f148b73c07270 Author: Michael Niedermayer Date: Thu May 12 02:26:22 2011 +0200 sws-PPC: fix after VOFW change. It seems sws-PPC did hardcode 2048 at various places instead of using VOFW. This also means that all past VOFW benchmarks on PPC are meaningless Signed-off-by: Michael Niedermayer commit c8f487deae75d4f25c2ec39ab484c1075f909bbd Author: Ronald S. Bultje Date: Wed May 11 19:15:14 2011 -0400 swscale: fix YUV420P 9/10bit support. Fix handling of input if not in native endianness, and add support for 9/10-bit output. This allows us to force endianness of YUV420P 9/10bit in the H264/10bit fate tests, which should fix them on big-endian systems. commit 83630f79eca40e0d662ce157585a6f4c961c5c14 Author: Michael Niedermayer Date: Wed May 11 23:58:17 2011 +0200 regtests: add grayscale qtrle Signed-off-by: Michael Niedermayer commit ce10e858a756f28b4d56e610152c9f7c9bae2643 Author: John Horigan Date: Sun May 8 11:52:54 2011 -0700 Added PIX_FMT_GRAY8 to the formats supported by the QuickTime RLE encoder The QuickTime RLE encoder only supports 16, 24, and 32-bit color. This patch adds support for 8-bit grayscale. Signed-off-by: John Horigan Signed-off-by: Michael Niedermayer commit 1d14edb7242ee231c9069533c109e1200814d288 Author: ami_stuff Date: Tue May 10 15:34:08 2011 +0200 Use VOFW 21503 as a default value for all types of the CPUs commit 4f038fdc23108adeab42bd06dfadf10f91cd80d5 Author: ami_stuff Date: Wed May 11 22:18:15 2011 +0200 Add "DAVC" FourCC This FourCC is used by "mpegable AVC" codec and the file encoded with this codec decodes correctly with FFmpeg's H264 decoder. Signed-off-by: Michael Niedermayer commit 99e07a4453732058df90885f80b3db3b4f37cb3c Author: anatoly Date: Tue Feb 22 12:04:50 2011 +0300 Fix crash of interlaced MPEG2 decoding commit a18eff49c03622c628913d0199dfa61e5c29f0d6 Author: Michael Niedermayer Date: Wed May 11 20:41:19 2011 +0200 av_compare_ts: Improve speed when calculations fit in 64bit. about 110 cpu cycles before 60 cpu cycles afterwards. Signed-off-by: Michael Niedermayer commit de545d2491c5d0013b16fec71696ab93e9997461 Author: Kyle Date: Wed May 11 20:22:33 2011 +0200 configure: Fix SDL detection on OSX and win32 commit 5705b02079449c685a3dd337fcc3a8b440dca4a0 Author: Jason Garrett-Glaser Date: Wed May 11 10:11:55 2011 -0700 10-bit H.264 x86 chroma v loopfilter asm Also delete some unused deblock asm macros. commit f1e7822e171c6d97a1fff3f456b738a9815db3f0 Author: Michael Niedermayer Date: Wed May 11 18:09:26 2011 +0200 fate: Disable h264-conformance-frext-pph10i4_panasonic_a. The file does not decode correctly yet the checksums match this wrongly decoded file. Thus the checksums must be wrong. Signed-off-by: Michael Niedermayer commit 9aa91043f30cee1419555c0e299c94e655b0930a Author: Baptiste Coudurier Date: Tue Apr 12 15:29:09 2011 -0700 Port SMPTE S302M audio decoder from FFmbc 0.3. commit c77b858c4cafe74cd663bdd1bc9d96a487b20e14 Author: Ronald S. Bultje Date: Wed May 11 17:22:41 2011 +0200 h264pred: fix one more aliasing violation. commit 0f6bbc5a0699f9eb52dcf856c0e6e981f7abe3bb Author: Michael Niedermayer Date: Wed May 11 16:32:35 2011 +0200 h264-fate: Fix 10bit H264 tests on big endian. framecrc returns different values when one swiches endianness, this apparently has been missed by "the fork" who added the 10bit fate tests. Sorry for missing this during the merge. Signed-off-by: Michael Niedermayer commit b44c8ad280c221691560ae9625421416e20c483f Author: Anatoly Nenashev Date: Sun Mar 27 21:41:48 2011 +0200 Fix crash of interlaced MPEG2 decoding Problem description, preliminary review discussion at http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/127731 commit d2bf42895ac30d228491a8a95a5908351dc32783 Author: Ronald S. Bultje Date: Wed May 11 08:30:02 2011 -0400 h264pred: fix one more aliasing violation. Signed-off-by: Anton Khirnov commit 36dc49b713f81708e5637c18748c6f666f732caa Author: Anton Khirnov Date: Wed May 11 13:56:42 2011 +0200 doc/APIchanges: fill in missing hashes and dates. commit 880fa2183051dfe6a7e44879361f674a906f5aa7 Author: Anton Khirnov Date: Wed May 11 13:45:12 2011 +0200 flacenc: use proper initializers for AVOption default values. default_val was recently changes from double to a union, current code wasn't updated for that. commit c9e81d0783345a7b3b573a03ba5fa79ea90cd8c1 Author: Anton Khirnov Date: Wed May 11 08:45:17 2011 +0200 lavc: deprecate named constants for deprecated antialias_algo. commit b75e53cc43a0eb90e252dffcbbfffa71811030ec Author: Michael Niedermayer Date: Wed May 11 15:35:06 2011 +0200 h264idct_template: fix include path Signed-off-by: Michael Niedermayer commit 083e715f339e4546e9be8a6e265360be87cca517 Author: Reinhard Tartler Date: Wed May 11 13:51:11 2011 +0200 aac: workaround for compilation on cygwin On cygwin, math.h needs to be included before float.h because of a bug in the system headers. Including libavutil/libm.h first works around this issue. Longer discussion of the topic: http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/128582 commit 5c511ad4ce20aff96ec587de1a8be6f28aed4544 Author: Baptiste Coudurier Date: Wed May 11 10:00:50 2011 +0200 swscale: extend YUV422p support to 10bits depth Signed-off-by: Michael Niedermayer commit d18e243f62844c6ee67baf3ca4d219c0f3da6969 Author: Michael Niedermayer Date: Wed May 11 13:56:12 2011 +0200 h264: merge _internal & template files. seems git missed them and we temporary lost our improvments in them. Signed-off-by: Michael Niedermayer commit b437f5b055497fc81b8061de593f3ef27657c1e3 Author: Stefano Sabatini Date: Mon May 9 21:59:20 2011 +0200 tiff: add support for inverted FillOrder for uncompressed data Fix decoding of file b.tif, trac issue #168. Signed-off-by: Diego Biurrun commit bea705752d6448578482cfa022944a9795388f14 Author: Diego Biurrun Date: Wed May 11 12:22:28 2011 +0200 Remove unused softfloat implementation. The softfloat functionality is unused, not installed and incomplete. On platforms without floating point units, the compiler provides a softfloat implementation so there is no point in carrying this code around locally. commit 2caf19e90f270abe1e80a3e85acaf0eb5c9d0aac Author: Ronald S. Bultje Date: Tue May 10 20:23:08 2011 -0400 h264pred: fix aliasing violations. Tested to fix Haiku H264/10bit fate failures, may also fix others. commit 3b6bbfa0631d237f2bbc85a7b43907733bea1e82 Author: Reimar Döffinger Date: Wed May 11 12:26:25 2011 +0200 Check syntax even if DEBUG is not defined. commit e1e0ca70eb0cd469b4ba757e3f72e7540ef04056 Author: Diego Biurrun Date: Mon May 9 13:00:04 2011 +0200 rotozoom: Eliminate French variable name. commit cbb0930f0ebdb2655296d7ae4424ee922168c5b7 Author: Diego Biurrun Date: Mon May 9 12:42:15 2011 +0200 rotozoom: Check return value of fread(). This fixes the warnings: tests/rotozoom.c:252: warning: ignoring return value of ‘fread’, declared with attribute warn_unused_result tests/rotozoom.c:254: warning: ignoring return value of ‘fread’, declared with attribute warn_unused_result commit 771339ca206468636a64a6041852068be2da3dd2 Author: Diego Biurrun Date: Mon May 9 11:16:55 2011 +0200 rotozoom: Return an error value instead of calling exit(). commit 2131e8590c447575a1c23bbc9f7e0bf9592d8997 Author: Diego Biurrun Date: Mon May 9 12:33:45 2011 +0200 rotozoom: Make init_demo() return int and check for errors on invocation. commit 5a37c12c82323c0b1f06cf4b8030bcabb554765d Author: Diego Biurrun Date: Mon May 9 12:26:00 2011 +0200 rotozoom: Drop silly UINT8 typedef. commit e9c10459a36869b5779a4c6cd52d879f23c6b294 Author: Diego Biurrun Date: Mon May 9 12:23:55 2011 +0200 rotozoom: Drop some unnecessary parentheses. commit f628559d9a600159576faff9735e069479c9d361 Author: Diego Biurrun Date: Mon May 9 11:45:13 2011 +0200 rotozoom: K&R coding style cosmetics commit 0b4949b51816bc2fd23ba4c4de183b877b58aa25 Author: Martin Storsjö Date: Mon May 9 20:11:16 2011 +0300 rtsp: Only do keepalive using GET_PARAMETER if the server supports it This is more like what VLC does. If the server doesn't mention supporting GET_PARAMETER in response to an OPTIONS request, VLC doesn't send any keepalive requests at all. After this patch, libavformat will still send OPTIONS keepalives if GET_PARAMETER isn't explicitly said to be supported. Some RTSP cameras don't support GET_PARAMETER, and will close the connection if this is sent as keepalive request (but support OPTIONS just fine, but probably don't need any keepalive at all). Some other cameras don't support using OPTIONS as keepalive, but require GET_PARAMETER instead. Signed-off-by: Martin Storsjö commit 3fd62c6e247468d792ce8f1d3c458017d1ea9eb5 Author: Stefano Sabatini Date: Wed Apr 20 13:13:09 2011 +0200 ffmpeg: call pre_process_video_frame() only if decoding is needed In output_packet(), move the pre_process_video_frame() call inside the if (ist->decoding_needed) { } block. This way pre_process_video_frame() is not called when stream-copy has been selected. Also simplify. Signed-off-by: Stefano Sabatini Signed-off-by: Anton Khirnov commit 2b95602e93226bd269676b0edcda5322b5be8444 Author: Stefano Sabatini Date: Sat Apr 16 23:18:22 2011 +0200 ffmpeg: reformat resample condition code in transcode() Signed-off-by: Stefano Sabatini Signed-off-by: Anton Khirnov commit 9aa797cd2873562e85d04ea45ef7f49ad2cb07b9 Author: Stefano Sabatini Date: Sat Apr 16 23:11:01 2011 +0200 ffmpeg: factorize resampling condition check in do_video_out() Simplify and improve readability. Signed-off-by: Stefano Sabatini Signed-off-by: Anton Khirnov commit c29c2eea8fb35682fdfdcb64c4890e8a25137b2a Author: Stefano Sabatini Date: Sun Apr 17 01:38:09 2011 +0200 ffmpeg: prefer "dec" over "ist->st->codec" in do_video_out() snippet Simplify, ease readability. Signed-off-by: Stefano Sabatini Signed-off-by: Anton Khirnov commit 2ecc5b70fb53d0e2e74b51d1d598af8c842afc68 Author: Stefano Sabatini Date: Sat Apr 16 22:58:13 2011 +0200 ffmpeg: improve reporting if size/pixel format changes Use av_log() rather than fprintf(stderr, ...), and show information related to the previous size/pixel format configuration. Consistent with the corresponding message issued in case of audio configuration change. Signed-off-by: Stefano Sabatini Signed-off-by: Anton Khirnov commit b568d6d94bda607e4ebb35be68181a8c2a9f5c50 Author: Stefano Sabatini Date: Sat Mar 26 15:26:45 2011 +0100 ffmpeg: warns the user when the selected pixel format is ignored Signed-off-by: Anton Khirnov commit 91199cfe55b1398b23a16b1f55df75e62e05198b Author: Benjamin Larsson Date: Tue Mar 8 15:29:46 2011 +0100 ffplay: add a dummy option -i so that it is easy to switch between ffmpeg -i "file" and ffplay -i "file". Signed-off-by: Anton Khirnov commit e3497907efb8b991c6de935ca8eca840f186e45b Author: Michael Niedermayer Date: Wed May 11 06:26:47 2011 +0200 swscale: remove fork bug that i missed in the merge. Signed-off-by: Michael Niedermayer commit b9660e2ac5958529a40a4a8d3a974e6bfe8eebb9 Author: Ronald S. Bultje Date: Wed May 11 06:25:25 2011 +0200 fix fate failures for 10bit H264 on some systems This is possibly a temporary solution commit 59eb12faff9505da49f54d499dd43404226e37f6 Merge: 580fa76 b667527 Author: Michael Niedermayer Date: Wed May 11 05:34:17 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: (30 commits) AVOptions: make default_val a union, as proposed in AVOption2. arm/h264pred: add missing argument type. h264dsp_mmx: place bracket outside #if/#endif block. lavf/utils: fix ff_interleave_compare_dts corner case. fate: add 10-bit H264 tests. h264: do not print "too many references" warning for intra-only. Enable decoding of high bit depth h264. Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder. Add support for higher QP values in h264. Add the notion of pixel size in h264 related functions. Make the h264 loop filter bit depth aware. Template dsputil_template.c with respect to pixel size, etc. Template h264idct_template.c with respect to pixel size, etc. Preparatory patch for high bit depth h264 decoding support. Move some functions in dsputil.c into a new file dsputil_template.c. Move the functions in h264idct into a new file h264idct_template.c. Move the functions in h264pred.c into a new file h264pred_template.c. Preparatory patch for high bit depth h264 decoding support. Add pixel formats for 9- and 10-bit yuv420p. Choose h264 chroma dc dequant function dynamically. ... Conflicts: doc/APIchanges ffmpeg.c ffplay.c libavcodec/alpha/dsputil_alpha.c libavcodec/arm/dsputil_init_arm.c libavcodec/arm/dsputil_init_armv6.c libavcodec/arm/dsputil_init_neon.c libavcodec/arm/dsputil_iwmmxt.c libavcodec/arm/h264pred_init_arm.c libavcodec/bfin/dsputil_bfin.c libavcodec/dsputil.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c libavcodec/h264_ps.c libavcodec/h264_refs.c libavcodec/h264dsp.c libavcodec/h264idct.c libavcodec/h264pred.c libavcodec/mlib/dsputil_mlib.c libavcodec/options.c libavcodec/ppc/dsputil_altivec.c libavcodec/ppc/dsputil_ppc.c libavcodec/ppc/h264_altivec.c libavcodec/ps2/dsputil_mmi.c libavcodec/sh4/dsputil_align.c libavcodec/sh4/dsputil_sh4.c libavcodec/sparc/dsputil_vis.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/dsputil_mmx.c libavformat/options.c libavformat/utils.c libavutil/pixfmt.h libswscale/swscale.c libswscale/swscale_internal.h libswscale/swscale_template.c tests/ref/seek/lavf_avi Merged-by: Michael Niedermayer commit ffc437c026dd0e1b8e5d9114163b4e95999b95fd Author: Alex Converse Date: Tue May 10 16:58:01 2011 -0700 cosmetics: Fix crazy formatting in resample. commit 3e00ababc49bc8ddd149c891199ba2d30beb3118 Author: Alex Converse Date: Tue May 10 14:24:05 2011 -0700 Allow resampling with no channel count change for up to 8 channels. commit 918a5409532e1218b011b5c079beb4eb5f45fdd4 Author: Alex Converse Date: Tue May 10 15:10:31 2011 -0700 Don't allow unsupported resampling configurations. commit 9f3d6ca4f16e9b1f6f89424e9d946bb3a6a40d91 Author: Jason Garrett-Glaser Date: Tue May 10 08:55:12 2011 -0700 Port x86 10-bit H.264 deblock asm from x264 commit 8ad77b65b548a6b2f4707265ebd7e97f956acf0b Author: Jason Garrett-Glaser Date: Tue May 10 07:08:24 2011 -0700 Update x86 H.264 deblock asm Includes AVX versions from x264. commit 580fa76c5c8b4372247221a4602527a060e2d5b4 Author: Baptiste Coudurier Date: Tue May 10 16:40:21 2011 -0700 Allocate per codec options, now that options are freed between inputs and outputs. commit 3732c483040f0309505f1aa896fdefef5083ba34 Author: Michael Niedermayer Date: Wed May 11 00:47:55 2011 +0200 error_concealment: Use previous pictures motion vectors when the current ones have been lost. Looks better for some cases, worse for others, overall not much difference. Its more correct though. Signed-off-by: Michael Niedermayer commit a811ec7cb5d6b31ddeef59bfaab074074f2e1a92 Author: Multiple Authors Date: Tue May 10 23:12:44 2011 +0200 Merging branch 'ffmpeg-mt/master' Just some cosmetics & comments, the only functional change "error_resilience: use s->last_picture for accessing last MVs." Is so buggy that it needs a full rewrite, guess -1.0 PSNR loss wasnt enough for ronald to realize there was a problem. commit b5e089924f2b74b1b2140ba24f4ee8e0e17c7567 Author: Robert Leatherwood Date: Wed May 11 00:57:42 2011 +0200 "Initialize" copy_tb like the other global variables. commit aa909d300f1be6bfa2db66aa1b3e73cf6fc9231f Author: Stefano Sabatini Date: Mon May 9 21:05:42 2011 +0200 tiff: prefer enum TiffCompr over int for TiffContext.compr Help debugging, safer. commit 1e97700fbaecc0262f654e0c8f75ee32590d721b Author: Stefano Sabatini Date: Mon May 9 19:21:26 2011 +0200 tiff: remove duplicated author information, fix @file doxy commit 687ff547fcdbf167c49be19332b188c5bd204562 Author: Stefano Sabatini Date: Mon May 9 19:19:04 2011 +0200 tiff: perform minor cleanups in the header Add link to official specifications, remove author duplication and others. commit b50217f6f7fa9c44f7f130661b3afd415a39200d Author: Stefano Sabatini Date: Tue May 10 10:22:24 2011 +0200 8svx: remove pointless comments commit 48dce86065484fa51c728e8ebdac7afaf03135be Author: Stefano Sabatini Date: Tue May 10 00:16:39 2011 +0200 8svx: add links to documentation resources commit baa1030286272b3af35215b7ae15cc02666da6a3 Author: Stefano Sabatini Date: Tue May 10 00:13:08 2011 +0200 8svx: remove duplicated author/file information commit 70b10db24cb4e65e3b7a97e7f9bedbf67a6c4373 Author: Stefano Sabatini Date: Mon May 9 23:58:20 2011 +0200 iff: remove get_image_data() and get_image_size() wrappers Remove one level of indirection, simplify code. commit 8b1171e93efaf60b24e209e64ea11bd9cbdeeb2e Author: Stefano Sabatini Date: Mon May 9 23:51:33 2011 +0200 iff: remove get_palette_size() wrapper Remove one level of indirection/improve readability. commit 83294a3251d3c6a3dc804b9e084ea09bf500ebf9 Author: Stefano Sabatini Date: Mon May 9 23:45:47 2011 +0200 iff: remove pointless get_palette_data() wrapper Also rename variable "extradata" to "palette" ff_cmap_read_palette() and extract_header(), more meaningful. commit 002e1f1eb33c22a42cbbf46a3627ab460171c12a Author: Maksym Veremeyenko Date: Tue May 10 15:12:40 2011 +0300 motion_est: fix ffmpeg compilation with DEBUG defined Remove the problematic av_dlog() call commit 3d929a607a49e65d66cc8101425b114a5dd5fd84 Author: Reimar Döffinger Date: Tue May 10 18:46:54 2011 +0200 mpegaudio: remove frame_count variable and its only usage, it is always 0. commit b66752790a94820c23b0ac994d6190dd9048582d Author: Anton Khirnov Date: Sat Apr 30 07:43:26 2011 +0200 AVOptions: make default_val a union, as proposed in AVOption2. This breaks API and ABI. commit dc05b6af3d18772f441388e73e8729dae124ecec Author: Andres Gonzalez Date: Thu Jan 27 10:14:21 2011 +0100 Added oggpagesize option for Ogg encoding. Allows setting a preferred page size. When set, if an Ogg stream buffer has enough data, a page is made, instead of filling maximum-size pages. commit eeaba924b790808de03674a4104d34ea8af52e72 Author: Michael Niedermayer Date: Tue May 10 17:31:32 2011 +0200 ffmpeg: Fix -t with files that do not have any timestamps. This for example fixes -t with some frext h264 reference streams. Signed-off-by: Michael Niedermayer commit b27b54de31af2ad449291514e790aacde650ded2 Author: Ronald S. Bultje Date: Tue May 10 08:44:49 2011 -0400 arm/h264pred: add missing argument type. commit 7bea13f111746eb7b34caa2cda46cc621728ee2a Author: Michael Niedermayer Date: Tue May 10 14:40:05 2011 +0200 swscale: Fix scaling for unscaled dithered planar convertions. This fixes some overflow in bright areas and ensures that the maximum brightness level is mapped to the maximum without cliping and without showing dither patterens in flat max brightness areas. Signed-off-by: Michael Niedermayer commit 86b29553f86471719adfb4ba86eec0a82f1eb347 Author: Ronald S. Bultje Date: Tue May 10 08:39:38 2011 -0400 h264dsp_mmx: place bracket outside #if/#endif block. Should fix compile on systems missing yasm/nasm. commit ecc297308ff3cb8b20359df44108ac299b22bdf1 Author: Vitor Sessak Date: Sat May 7 22:48:29 2011 +0200 lavf/utils: fix ff_interleave_compare_dts corner case. This should fix behavior introduced by commit 96573c0d7605672d69b42ae1dcf18764ce47c71a. Av_rescale_rnd() is not lossless so if two timestamps are equal after being rescaled they are not always actually identical. This patch use av_compare_ts() to get always a correct result. Signed-off-by: Ronald S. Bultje commit 23d10ce0150b4fed54131fce4c1a6e47378a88dd Author: Ronald S. Bultje Date: Fri May 6 21:46:54 2011 -0400 fate: add 10-bit H264 tests. commit e86fbe1751772a3b6790652ab382dcebaeec3aa8 Author: Ronald S. Bultje Date: Fri May 6 16:31:26 2011 -0400 h264: do not print "too many references" warning for intra-only. Fixes issue 2679. commit d545cf804c4a246285d75aae48741da5d2344993 Author: Oskar Arvidsson Date: Tue Mar 29 17:49:00 2011 +0200 Enable decoding of high bit depth h264. This patch completes the high bit depth h264 decoding support. Signed-off-by: Ronald S. Bultje commit 19a0729b4cfacfd90b8ee84ab0c093ff7e397e65 Author: Oskar Arvidsson Date: Tue Mar 29 17:48:59 2011 +0200 Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder. This patch lets e.g. dsputil_init chose dsp functions with respect to the bit depth to decode. The naming scheme of bit depth dependent functions is _[_] (i.e. the old clear_blocks_c is now named clear_blocks_8_c). Note: Some of the functions for high bit depth is not dependent on the bit depth, but only on the pixel size. This leaves some room for optimizing binary size. Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Ronald S. Bultje commit fcc0224e4fbd44ae268903185b0cf83560b13555 Author: Oskar Arvidsson Date: Tue Mar 29 17:48:58 2011 +0200 Add support for higher QP values in h264. In high bit depth, the QP values may now be up to (51 + 6*(bit_depth-8)). Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Ronald S. Bultje commit 6e3ef511d787ff632547059f8730396ff4498e70 Author: Oskar Arvidsson Date: Tue Mar 29 17:48:57 2011 +0200 Add the notion of pixel size in h264 related functions. In high bit depth the pixels will not be stored in uint8_t like in the normal case, but in uint16_t. The pixel size is thus 1 in normal bit depth and 2 in high bit depth. Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Ronald S. Bultje commit 44ca80df3445a59bc065924d8c6110fa10367d01 Author: Oskar Arvidsson Date: Tue Mar 29 17:48:56 2011 +0200 Make the h264 loop filter bit depth aware. Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Ronald S. Bultje commit 87ce8b495f0e73625bc583e01c07bcd3e67b95ab Author: Oskar Arvidsson Date: Tue Mar 29 17:48:55 2011 +0200 Template dsputil_template.c with respect to pixel size, etc. Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Ronald S. Bultje commit 5d4bd9cc8958205601f7a9088dd54ed3714d40da Author: Oskar Arvidsson Date: Tue Mar 29 17:48:54 2011 +0200 Template h264idct_template.c with respect to pixel size, etc. Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Ronald S. Bultje commit de3e760720ecc0c755cc2216ef9bf3dba39450a4 Author: Oskar Arvidsson Date: Mon May 9 11:18:37 2011 -0400 Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Ronald S. Bultje commit 325eefa2ca14b487120b164bc232e6c650fb20f3 Author: Oskar Arvidsson Date: Tue Mar 29 17:48:51 2011 +0200 Move some functions in dsputil.c into a new file dsputil_template.c. The functions moved are used when decoding h264. Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Ronald S. Bultje commit 15fb393be67c73f58d96c2c1bb187d037723835a Author: Oskar Arvidsson Date: Tue Mar 29 17:48:50 2011 +0200 Move the functions in h264idct into a new file h264idct_template.c. Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Ronald S. Bultje commit 5ada25245d4d74bdfc99b363934fe9a3de467eeb Author: Oskar Arvidsson Date: Tue Mar 29 17:48:49 2011 +0200 Move the functions in h264pred.c into a new file h264pred_template.c. Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Ronald S. Bultje commit 563c72dabb7ef34b667836c1b0e2008c08e89fa6 Author: Oskar Arvidsson Date: Mon May 9 10:58:40 2011 -0400 Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Ronald S. Bultje commit 42239ced656ddddb85eb9655e8a66d29065f0dad Author: Oskar Arvidsson Date: Tue Mar 29 17:48:47 2011 +0200 Add pixel formats for 9- and 10-bit yuv420p. Also add support for these formats in libswscale. Needed for high bit depth h264 decoding. Signed-off-by: Ronald S. Bultje commit e39e3abad4ce667f06d41097428695a7aad095fb Author: Oskar Arvidsson Date: Sun Apr 10 22:42:36 2011 +0200 Choose h264 chroma dc dequant function dynamically. Needed for high bit depth h264 decoding. Signed-off-by: Ronald S. Bultje commit dd561441b1e849df7d8681c6f32af82d4088dafd Author: Ronald S. Bultje Date: Mon May 9 09:48:21 2011 -0400 h264: DSP'ize MBAFF loopfilter. commit cb48fdf67e765694ffcbd2aaee2b72ab1cb44de6 Author: Alexander Strange Date: Tue May 10 01:53:46 2011 -0400 ffmpeg: Simplify decode loop condition to not use next_pts Signed-off-by: Ronald S. Bultje commit 188dea1dbfd8761133ca138bba0d8f19beac6c09 Author: Anton Khirnov Date: Sat Apr 2 12:28:01 2011 +0200 lavc: move some flac-specific options to its private context. commit bc97695af84304e5e95658ca26e00c6e7074eca4 Author: Stefano Sabatini Date: Sat Apr 16 23:14:44 2011 +0200 ffmpeg: remove unused fields AVOutputStream.original_width/height Signed-off-by: Stefano Sabatini Signed-off-by: Anton Khirnov commit f38d900fb8b27870ff8ac176ad07a01e08428b92 Author: Stefano Sabatini Date: Sat Apr 16 22:51:04 2011 +0200 ffmpeg: remove unused variable padding_src in do_video_out() Signed-off-by: Stefano Sabatini Signed-off-by: Anton Khirnov commit d1991f51f3298e91f9e4cca1f581b486fbd29ec3 Author: Michael Niedermayer Date: Mon Apr 18 13:04:33 2011 +0200 ffmpeg: fix negative verbosity. Signed-off-by: Anton Khirnov commit 3372ec327b09abe492399d662c903ed77b359d45 Author: Stefano Sabatini Date: Sat Apr 16 13:41:53 2011 +0200 cmdutils: add OPT_INT check in parse_number_or_die() Check that the value passed for an OPT_INT option is an int, fail otherwise. Signed-off-by: Anton Khirnov commit 0420bf09f7d297210df03b4467cb3945ae627bf6 Author: Stefano Sabatini Date: Sun Apr 3 21:54:57 2011 +0200 ffmpeg: rename configure_filters() to configure_video_filters() Mostly useful for the audio-filters branch, to make more apparent the distinction between configure_audio_filters() and configure_video_filters(). Signed-off-by: Stefano Sabatini Signed-off-by: Anton Khirnov commit 5d2c6f42d74680dbb2f94c16770114f18c2d2fd0 Author: Stefano Sabatini Date: Sat Mar 12 12:44:22 2011 +0100 cmdutils: remove list_fmts(), simplify The function was only used in opt_sample_fmt() for listing the sample formats. Move list_fmts() functionality directly into opt_sample_fmt(). Also fix the warning: ffmpeg.c: In function ‘opt_audio_sample_fmt’: ffmpeg.c:2877: warning: passing argument 1 of ‘list_fmts’ from incompatible pointer type cmdutils.h:163: note: expected ‘void (*)(char *, int, int)’ but argument is of type ‘char * (*)(char *, int, enum AVSampleFormat)’ Signed-off-by: Anton Khirnov commit c3e40410d4a932c6f27b0217e0ab705f03841078 Author: Takashi Mochizuki Date: Sun May 1 12:03:20 2011 +0900 Add missing CONFIG_AVFILTER check. Fix configure --disable-avfilter issue. Signed-off-by: Anton Khirnov commit b97b4b58a6e1ac595002b3e3f3469161771c6003 Merge: 67d4414 a88ef93 Author: Michael Niedermayer Date: Tue May 10 04:01:29 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: mpegaudiodec: group #includes more sanely mpegaudio: remove #if 0 blocks ffmpeg.c: reset avoptions after each input/output file. ffmpeg.c: store per-output stream sws flags. mpegaudio: remove CONFIG_MPEGAUDIO_HP option mpegtsenc: Clear st->priv_data when freeing it udp: Fix receiving RTP data over multicast rtpproto: Remove an unused variable regtest: fix wma tests NOT pulled: mpegaudio: remove CONFIG_AUDIO_NONSHORT regtest: separate flags for encoding and decoding Conflicts: ffmpeg.c Merged-by: Michael Niedermayer commit 67d441499a042edcfb0f8a120e6196d10b1d13db Author: Michael Niedermayer Date: Tue May 10 03:28:42 2011 +0200 seeking: Favor pkt->pos for generic index building where possible. See [FFmpeg-devel] [PATCH] Only using st->parser->pos when doing?repacking in the parser. Signed-off-by: Michael Niedermayer commit ca87d439065c705311d0a98076df3c021b187adb Author: Michael Niedermayer Date: Tue May 10 03:22:04 2011 +0200 configure: Revert sdl hunk of 4fa18c56. This breaks OSX Signed-off-by: Michael Niedermayer commit 08675bb39928fff0a31ecc068e290704a358739d Author: Michael Niedermayer Date: Tue May 10 03:15:42 2011 +0200 mem: Choose alignment at compile time depending on AVX enabledness. Signed-off-by: Michael Niedermayer commit 53789a27f8a2ca06563d9555013e20b191b2a705 Author: Michael Niedermayer Date: Tue May 10 00:37:20 2011 +0200 swscale: use Nbit code to handle !is16BPS(c->srcFormat) && is16BPS(c->dstFormat) Signed-off-by: Michael Niedermayer commit 42c9bd313f8cf0975e87078ced5a05c17ad45cc5 Author: Michael Niedermayer Date: Tue May 10 00:21:18 2011 +0200 swscale: Support dither in is16BPS(c->srcFormat) && !is16BPS(c->dstFormat) This is done by just letting the Nbit code handle it, which now can do it. Signed-off-by: Michael Niedermayer commit c4f7050bb1e449a9b45a98cc460c06bd89afa8b4 Author: Michael Niedermayer Date: Tue May 10 00:17:44 2011 +0200 swscale: support unscaled planar Nbit->8bit with non native endian source. Signed-off-by: Michael Niedermayer commit 09ff3cc77b0844d2c6cd4d36bc2770fc05f882f5 Author: Michael Niedermayer Date: Tue May 10 00:15:03 2011 +0200 swscale: fix unscaled yuv422p16be -> yuv422p10le Signed-off-by: Michael Niedermayer commit eb8aa13b54269f6a7c0a972b95b352f30603c194 Author: Michael Niedermayer Date: Tue May 10 00:06:36 2011 +0200 swscale: make DITHER_COPY() support non native endian source Signed-off-by: Michael Niedermayer commit a88ef93b4abbea9f18c8750113dc9e99931f2f8a Author: Mans Rullgard Date: Mon May 9 13:55:24 2011 +0100 mpegaudiodec: group #includes more sanely Signed-off-by: Mans Rullgard commit 0d849074a485b868552b3193a433a112be54e657 Author: Mans Rullgard Date: Mon May 9 13:08:08 2011 +0100 mpegaudio: remove #if 0 blocks Signed-off-by: Mans Rullgard commit 9c49ca0f19a99375dfa4fbe7cce4732667cf9ba0 Author: Michael Niedermayer Date: Mon May 9 22:02:44 2011 +0200 swscale: factor shift out of DITHER_COPY(). Signed-off-by: Michael Niedermayer commit 300e497b5fe4cd72031c175c74bcfa58239d991b Author: Michael Niedermayer Date: Mon May 9 21:38:46 2011 +0200 swscale: factorize DITHER_COPY() Signed-off-by: Michael Niedermayer commit 173544077316c448cefc79c7e595021b41249a1a Author: Michael Niedermayer Date: Mon May 9 21:23:45 2011 +0200 fifo: use av_freep() With this change libavutil uses av_freep() everywhere where it makes sense. Remaining av_free() use in it has the used pointer become inaccessible quickly soo zeroing makes no sense. Signed-off-by: Michael Niedermayer commit 19615089a044520432b8b28e0ed555cc0195416a Author: Anton Khirnov Date: Sat May 7 08:55:25 2011 +0200 ffmpeg.c: reset avoptions after each input/output file. This is consistent with how all the other options work. commit 1435f2fa72b142b11e92a0c2715fd9516364e7db Author: Anton Khirnov Date: Mon May 9 16:36:57 2011 +0200 ffmpeg.c: store per-output stream sws flags. commit 6bb6fb05ba66ce42ca17c930d81d3e9cf37ab34d Author: Mans Rullgard Date: Mon May 9 12:40:37 2011 +0100 mpegaudio: remove CONFIG_MPEGAUDIO_HP option The low quality mode is off by default and never tested. The high quality mode is also plenty fast enough. Signed-off-by: Mans Rullgard commit ed87375dd555a1e7798dcd56c967af0171525a26 Author: Martin Storsjö Date: Mon May 9 16:29:01 2011 +0300 mpegtsenc: Clear st->priv_data when freeing it If not cleared, the caller might try to free it. Signed-off-by: Martin Storsjö commit a7ea5e3d35f30180ad69b86e6328f434e29119dc Author: Martin Storsjö Date: Mon May 9 16:56:56 2011 +0300 udp: Fix receiving RTP data over multicast Earlier, AVIO_RDWR was handled as READ, and all the checks for the AVIO_WRONLY flag explicitly meant the write-only case. When changed from old AVIO/URL contants to AVIO_FLAG in 59d96941f0285a5, these comparisons were updated incorrectly, by mapping checks for AVIO_WRONLY to checks for AVIO_FLAG_WRITE. When receiving RTP over UDP, the urlcontext is opened with READ_WRITE flags. This patch updates the flag comparisons to check for the same conditions as the code did prior to 59d96941f0285a5. Signed-off-by: Martin Storsjö commit f9a6cfdd040991bfdbcf2bc97de6666a2ddcd97f Author: Martin Storsjö Date: Mon May 9 16:50:03 2011 +0300 rtpproto: Remove an unused variable Signed-off-by: Martin Storsjö commit 38bb5a5434f913451aa512624a92b12b9925690f Author: Michael Niedermayer Date: Mon May 9 17:50:34 2011 +0200 mpeg4videoenc: Support negative timestamps. Signed-off-by: Michael Niedermayer commit 282e8d4b4fba0c54d4cc6dbd54d271a514370b08 Author: Michael Niedermayer Date: Mon May 9 17:49:25 2011 +0200 avienc: Update 2 debug statements to match the current code. Signed-off-by: Michael Niedermayer commit 51927883213dfe9e8469f5d3c21ef041eb1f7236 Author: Michael Niedermayer Date: Mon May 9 17:47:22 2011 +0200 avutil: add divide & modulo that round like unsigned ones do that is down. Signed-off-by: Michael Niedermayer commit 5deedf3552819e5bea3327a450155bb57643a999 Author: Michael Niedermayer Date: Mon May 9 16:05:29 2011 +0200 h264probe: update to latest spec. Signed-off-by: Michael Niedermayer commit ecfc5e0b72eb24736cf1fcf9e91ee31f34626b47 Author: Mans Rullgard Date: Mon May 9 12:00:56 2011 +0100 regtest: fix wma tests This adds $DEC_OPTS to the wma decode commands, making tests pass on systems where the bitexact flag is needed. Signed-off-by: Mans Rullgard commit 3a2e80ecbc893cbe2ae5bfb7282e4588e7ad1fa5 Author: Mans Rullgard Date: Sun May 8 21:44:12 2011 +0100 mpegaudio: remove CONFIG_AUDIO_NONSHORT This fake option cannot be enabled by normal means, and the floating-point decoder should provide the higher quality this option presumably was intended for. Signed-off-by: Mans Rullgard commit eeadaa6bc09dbecccfe3d227a336f6cdeba0b39a Author: Mans Rullgard Date: Sat May 7 13:57:21 2011 +0100 regtest: separate flags for encoding and decoding This separates encoding and decoding flags, and passes them together with the related file argument instead of all at the start of the command line. Signed-off-by: Mans Rullgard commit 6841c8c5791e857a3327411f23c13b0d28f69f1f Merge: 25308af 847aaec Author: Michael Niedermayer Date: Mon May 9 04:27:07 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: log: Fix an oob array read. cosmetics: trim trailing whitespace in postproc Ban strncpy() it's too easy to misuse. psymodel: Remove wrapper functions. aacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and 'w'. regtest: remove redundant flags in jpg test regtest: use run_ffmpeg in do_image_formats regtest: simplify encoding functions ffmpeg.c: check for interlaced flag in the correct place. Merged-by: Michael Niedermayer commit 25308afbb2f7d6d9cb1e36476bc5aa0b3831c703 Author: Michael Niedermayer Date: Mon May 9 04:17:24 2011 +0200 wtvdec: Avoid gmtime_r() it breaks compile on windows. Better solutions welcome, this is just a quick fix to unbreak compile. Signed-off-by: Michael Niedermayer commit bce0d92359176ba57c75f9018747a78d94f62f5f Author: Michael Niedermayer Date: Mon May 9 04:04:24 2011 +0200 developer.texi: update for git Signed-off-by: Michael Niedermayer commit 0584d22eb4446319b5ba02cc990cddfbc68ae984 Author: Luca Barbato Date: Mon May 9 04:02:57 2011 +0200 Typo fix. commit 6c5c8750b983f8b32983f4a3598ae2cb979d78d5 Author: Michael Niedermayer Date: Mon May 9 04:00:31 2011 +0200 Patch checklist:Suggest adding a regression test Signed-off-by: Michael Niedermayer commit 3df9150d6971e8d48e556ec83caa5adea14c6e7e Author: Michael Niedermayer Date: Mon May 9 03:05:59 2011 +0200 doc:Partial update of our issue tracker doc. More work needed, volunteers welcome. Signed-off-by: Michael Niedermayer commit fddf0521c6aca3eef25695094da6d12cb9af183d Author: Peter Ross Date: Sun May 8 20:14:47 2011 +0200 wtv: calculate ole date correctly (is seconds since 1899-12-30) commit 8acab7ae5bbcb589c556425453ac3d851d35021f Author: Peter Ross Date: Sun May 8 20:13:59 2011 +0200 wtv: detect ole date overflow commit 3dd779eb0affdd6d597291a5cc6215a138f71495 Author: Michael Niedermayer Date: Mon May 9 00:22:12 2011 +0200 swscale: implement Nbit->non native endian 16bit. Fixes v210. Signed-off-by: Michael Niedermayer commit f2bfdc3836afe266c7fe04d3c744acd0a72889b4 Author: Michael Niedermayer Date: Sun May 8 23:57:52 2011 +0200 fate: add 9/10 BE pixdesc checksums Signed-off-by: Michael Niedermayer commit 847aaec682f2bbfaac55ee623364dd4527e0f341 Author: Alex Converse Date: Thu May 5 22:33:31 2011 -0700 log: Fix an oob array read. commit c38d9780eb5397670c94634f3fd8d489e942c140 Author: Alex Converse Date: Thu May 5 22:33:30 2011 -0700 cosmetics: trim trailing whitespace in postproc commit 15695541538ae118ffedb8e8c821d242caaa0be4 Author: Alex Converse Date: Tue May 3 11:21:49 2011 -0700 Ban strncpy() it's too easy to misuse. commit b58e29857230eb59cfec4642522258a965f2c440 Author: Nathan Caldwell Date: Fri May 6 01:19:52 2011 -0600 psymodel: Remove wrapper functions. Instead use the function pointers directly. commit 5b29af624fe8be5379fd649019a04ff44bfde04f Author: Nathan Caldwell Date: Fri May 6 01:19:51 2011 -0600 aacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and 'w'. commit 554d3ad73014a7f7986520c002ff61741ddfdb9d Author: Stefano Sabatini Date: Sun May 8 00:50:08 2011 +0200 pnmdec: reindent after the previous commit commit 4a745b41770893116405c22f832192510f9bcc9b Author: Stefano Sabatini Date: Sun May 8 00:47:14 2011 +0200 pnmdec: add support for mono images with non-space-separated pixel digits When the file to decode contains a sequence of binary values like "1101110...", decode_frame() was reading the sequence of digits like a unique integer value, which was resulting in integer overflows. The change add support for parsing non-space-separated pixel digits for mono formats, in particular fix decoding of file battrace.pbm, and fix trac issue #154. commit b0e1d0d9ee08f12db52b6938894b554c8404ccf9 Author: Michael Niedermayer Date: Sun May 8 18:51:55 2011 +0200 ffv1enc: support PIX_FMT_YUV420P10 & PIX_FMT_YUV422P10 Signed-off-by: Michael Niedermayer commit 74bf9d62311a96a67f01269779d92386a15ce592 Author: Baptiste Coudurier Date: Sun May 8 17:58:20 2011 +0200 v210enc:clip values according to specifications Signed-off-by: Michael Niedermayer commit 3e002747d15475ed9e6ec13689f2296b04b27fef Author: Baptiste Coudurier Date: Sun May 8 17:57:54 2011 +0200 v210enc: switch to PIX_FMT_422P10 Signed-off-by: Michael Niedermayer commit 807a058e8b6e272f0fd83b44ad2c737495a2319c Author: Baptiste Coudurier Date: Sun May 8 17:54:20 2011 +0200 v210dec: switch to PIX_FMT_422P10 Signed-off-by: Michael Niedermayer commit 4737a59373318cf47994c4b4e250a064d95f3088 Author: Stefano Sabatini Date: Sun May 8 19:26:22 2011 +0200 ffv1: set internal frame defaults Another fix missed before the vsrc_buffer changes. commit b9e608492a1458ae3376e8aeacfeca6a3452a6ff Author: Baptiste Coudurier Date: Sun May 8 14:20:57 2011 +0200 swscale: 9,10 bits pixel format output support Signed-off-by: Michael Niedermayer commit 299cbe2c9b0e883bda4042ea8b4f1476216d0ea1 Author: Baptiste Coudurier Date: Sun May 8 14:06:04 2011 +0200 PIX_FMT_422P10 support Signed-off-by: Michael Niedermayer commit af3c8f823018ef8c07b25c8834d8032093a49418 Author: Michael Niedermayer Date: Sun May 8 13:20:22 2011 +0200 adpcmenc:Optimize adpcm_ima_qt_compress_sample() Signed-off-by: Michael Niedermayer commit 35d3d44a84870eefbc57bde80bd52a46b598bfa7 Author: Baptiste Coudurier Date: Sun May 8 13:15:48 2011 +0200 adpcmenc: fix QT IMA ADPCM encoder Signed-off-by: Michael Niedermayer commit b3d5a4b06e344be5d5a5d64681c67c22974be937 Author: Baptiste Coudurier Date: Sun May 8 13:13:17 2011 +0200 adpcmdec: Fix QT IMA ADPCM decoder Signed-off-by: Michael Niedermayer commit fc7314b31c06e706da53d28b64e8459bb45d2756 Author: Mans Rullgard Date: Sat May 7 13:52:04 2011 +0100 regtest: remove redundant flags in jpg test Signed-off-by: Mans Rullgard commit 765f72f8c43650329b2f47cf7ed4a9a9836505bd Author: Mans Rullgard Date: Sat May 7 13:33:00 2011 +0100 regtest: use run_ffmpeg in do_image_formats Signed-off-by: Mans Rullgard commit 2728fd905326e2ca2867210b68e598d88a36e53c Author: Mans Rullgard Date: Sat May 7 11:55:48 2011 +0100 regtest: simplify encoding functions The video encoding options were needlessly split in two parameters which are merged. The do_audio_encoding function did not use its second argument, so this can be removed. Signed-off-by: Mans Rullgard commit 648e55ff1beea72b53f8fb231b3ef0fb16cd3e62 Author: Anton Khirnov Date: Fri May 6 17:59:15 2011 +0200 ffmpeg.c: check for interlaced flag in the correct place. In the corresponding codec context, not global options storage. commit 6d6b0c96fdc576f4643e3d4066e5ebebdb693ade Merge: 732ff29 994de19 Author: Michael Niedermayer Date: Sun May 8 03:29:51 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: drawtext: add documentation for the shadow parameters drawtext: add shadow support. drawtext: factor draw_glyphs. drawtext: fix and optimize yuv blend. drawtext: get rid of divisions in the inner loop. drawtext: simplify chroma blend and fix chroma alpha. lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo Conflicts: configure libavfilter/avfilter.h libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer commit 732ff29bff1b42c9471d7aa699efae6ffd1b5d61 Author: Michael Niedermayer Date: Sun May 8 01:26:43 2011 +0200 svq1dec: simpify mean calculation. Signed-off-by: Michael Niedermayer commit 8f5729d54dbbe48e87c440f5afb5f5f52c9f6052 Author: Michael Niedermayer Date: Sun May 8 01:26:07 2011 +0200 svq1dec: replace /2 by >>1 Signed-off-by: Michael Niedermayer commit 0257ac8f12099e0c4d784e0db219584cbb739ce2 Author: Michael Niedermayer Date: Sun May 8 01:24:37 2011 +0200 pnm: Fix spurious error message. Signed-off-by: Michael Niedermayer commit 7030501383ec630207f9a14c1448bcfc265499f9 Author: Stefano Sabatini Date: Sat May 7 21:32:52 2011 +0200 libopenjpeg: set internal frame defaults Fix ffmpeg decoding, which was broken after the recent changes in vsrc_buffer. commit b06397acd458abc1fa73cf23b20de5b17253f283 Author: Reimar Döffinger Date: Sat May 7 20:11:49 2011 +0200 Fix function pointer type to match function it is assigned. commit 80264dc4222312d563053cb677f7c2cb0e4c0935 Author: Reimar Döffinger Date: Sat May 7 20:06:33 2011 +0200 Store pointers in a less messy way in SWSContext. commit d3445a911c426c4a4b1e6617580e38f481d981f8 Author: Reimar Döffinger Date: Sat May 7 19:48:00 2011 +0200 Remove unused variable. commit 48b9b7edb3df7b9849518573373c598e0df68fd2 Author: Reimar Döffinger Date: Sat May 7 19:42:36 2011 +0200 Replace deprecated url_fseek by avio_seek. commit 5ce33e6bc51e853e96c7d4ae5294f52001538373 Author: Reimar Döffinger Date: Sat May 7 19:39:11 2011 +0200 Move ifdef to avoid unused variable warnings. commit 179536420543048e9504955177d78365ba9d3722 Author: Reimar Döffinger Date: Sat May 7 19:33:21 2011 +0200 Remove unused variables. commit 8c3651f4a516a531a42e55e0bf4e83edb65a7b89 Author: Reimar Döffinger Date: Sat May 7 19:28:45 2011 +0200 Fix printf format string, fixes a warning. commit 7deaa2b8bddfae5d3a7121a76ff31a098b85389f Author: Michael Niedermayer Date: Sat May 7 19:44:21 2011 +0200 riffenc/ffmpeg: Fix stream copy Signed-off-by: Michael Niedermayer commit 99119bdffe17ac8919f0f97ace61251ad4bc6a2a Author: Michael Niedermayer Date: Sat May 7 16:54:06 2011 +0200 ffplay: fix null pointer read when codec unavilable. Signed-off-by: Michael Niedermayer commit 6fd00e9dd94ac3aecf4fa14ca6fa23c395215ac9 Author: Reimar Döffinger Date: Sat May 7 17:49:42 2011 +0200 aacdec: add decode_channel_map overread check All decode_channel_map calls together can easily read more data than the amount of padding available. Thus below patch adds an input length check before reading them. Fixes some invalid reads with sample from http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1138 commit 5631729c3de589b45498af5272b47b0792ca07d4 Author: Reimar Döffinger Date: Sun Apr 24 17:34:39 2011 +0200 Increase TS packet size detection buffer. Fixes warning message with ticket #68. commit 90f5e991be3a28a2caa06132d995c0daef911a56 Author: Reimar Döffinger Date: Sun Apr 24 17:33:48 2011 +0200 Assume some TS packet size instead of failing completely. Fixes ticket #68. commit 5901cd6236d97b34fe59a47ba0fd6da8f647d1f1 Author: jan gerber Date: Sat May 7 15:31:04 2011 +0200 oggdec:Correct duration Based on a patch by Reimar Döffinger. Signed-off-by: Michael Niedermayer commit c8981edd902e40185b80ddb77a229104deb7c7e1 Author: Michael Niedermayer Date: Sat May 7 15:28:39 2011 +0200 Only add 1 byte to av_malloc(0) when it actually returned NULL Signed-off-by: Michael Niedermayer commit 91ff05f6ac5c65a6cd3701d5a7cdcfb6ccfd87e4 Author: Michael Niedermayer Date: Sat May 7 15:28:07 2011 +0200 Make av_realloc(0) behave like our av_malloc(0) Signed-off-by: Michael Niedermayer commit ea7f73c52ea82b792568127ee7e7671c2640bbcd Author: Stefano Sabatini Date: Sat May 7 12:44:18 2011 +0200 vsrc_buffer: during init, print information about timebase and sample aspect ratio commit 64c06615d2b99fb9f4ffd6226d0e5787b44a41e2 Author: Stefano Sabatini Date: Mon May 2 09:52:11 2011 +0200 vsrc_buffer: simplify av_vsrc_buffer_add_frame*() interface Now that pix_fmt, width, and height are directly embedded in the AVFrame, there is no need to pass these values as separate arguments. commit 01042d4123b6e0a4c15d6828f835bd648eb03d38 Author: Stefano Sabatini Date: Mon May 2 02:15:15 2011 +0200 lavc: set defaults in internal codec frames This is required specifically for setting frame->format to -1, otherwise it will be set to 0 = PIX_FMT_YUV420P and code reading the format from the output decoded frame will get misled. In particular fix regressions occurring with the pending vsrc_buffer patch. commit 2beac7c325583160bdf2978de6e87176b9146da0 Author: Stefano Sabatini Date: Fri May 6 11:30:27 2011 +0200 ffmpeg: rename ost->pict_tmp to ost->resample_frame The new name is more consistent with the employed naming scheme, and more meaningful. commit 04c373c1e98c2f62632eb3cd12726945173225ea Author: Stefano Sabatini Date: Fri May 6 11:14:15 2011 +0200 ffmpeg: prefer dec/enc over ost/ist->st->codec in do_video_out() Compact code, improve readability. commit a851fa7fecc7dbf681b046c8ddcd46bd842c792f Author: Stefano Sabatini Date: Fri May 6 11:10:02 2011 +0200 ffmpeg: move resample_changed check within the #if !CONFIG_AVFILTER The check and the corresponding message in do_video_out() are unnecessary in the libavfilter path, as a similar check and message are performed within the buffer source. commit 70c24b2171f5004821e522048c75dd3c57b7d233 Author: Stefano Sabatini Date: Fri May 6 11:06:58 2011 +0200 ffmpeg: remove useless intermediary variable resample_dst in do_video_out() commit f5a669c229425cdac828c230addf10d6d9cbe3a7 Author: Stefano Sabatini Date: Mon May 2 09:35:38 2011 +0200 ffmpeg: simplify mid-stream reconfiguration when libavfilter is disabled Implement lazy initialization of the image resample context, so that the initialization code does not need to be duplicated. Also manage the case in which resample/size change mid-stream. For each packet the code computes if resampling is needed. Previously the resample check was done only at the initialization, in case size/format changed and no resample was detected at the init stage ffmpeg was silently exiting. commit 566666caf3a09d6254edaa99d222eddb6fe2986b Author: Stefano Sabatini Date: Sun May 1 14:47:05 2011 +0200 lavfi: add libavfilter/avcodec.h and avfilter_copy_frame_props() avfilter_copy_frame_props() avoids code duplication and increases robustness. The added files libavfilter/avcodec.[ch] are used for containing utilities useful for gluing togheter libavfilter and libavcodec. commit 18ded93ab3db5996cd86fe2f5b36ba3c4bd58711 Author: Stefano Sabatini Date: Sun May 1 14:10:20 2011 +0200 lavc: add format field to AVFrame The format is a per-frame property, having it in AVFrame simplify the operation of extraction of that information, since avoids the need to access the codec/stream context. commit 22333a6b19f59ebc83933b910069d00c445d01ed Author: Stefano Sabatini Date: Sun May 1 14:02:08 2011 +0200 lavc: add width and height fields to AVFrame width and height are per-frame properties, setting these values in AVFrame simplify the operation of extraction of that information, since avoids the need to check the codec/stream context. commit 314374e57978bd215ae42d5444f0e76f2bebdc27 Author: Reimar Döffinger Date: Sat May 7 10:00:03 2011 +0200 Use MAP_FAILED to check for mmap failure instead of manually recreating the value. commit 994de197c0d5dcf38d5ab68f8f03f37a890a4458 Author: Stefano Sabatini Date: Sat Apr 2 11:27:09 2011 +0200 drawtext: add documentation for the shadow parameters Signed-off-by: Anton Khirnov commit c5420f100f9c5330817b2b76a88668199e1dfb04 Author: Michael Niedermayer Date: Tue Feb 22 01:41:52 2011 +0100 drawtext: add shadow support. Signed-off-by: Michael Niedermayer Signed-off-by: Anton Khirnov commit e73127a44399d4e90a4fbda800ad5b4bcb286073 Author: Michael Niedermayer Date: Tue Feb 22 01:11:35 2011 +0100 drawtext: factor draw_glyphs. Signed-off-by: Michael Niedermayer Signed-off-by: Anton Khirnov commit a5b81c317e7db9015ebbf838bc065e4d183bf61a Author: Michael Niedermayer Date: Tue Feb 22 00:54:48 2011 +0100 drawtext: fix and optimize yuv blend. Signed-off-by: Michael Niedermayer Signed-off-by: Anton Khirnov commit 3953a88014c3dae3b73c105a7aa5d4e44e3a9ef0 Author: Michael Niedermayer Date: Tue Feb 22 00:43:19 2011 +0100 drawtext: get rid of divisions in the inner loop. Signed-off-by: Michael Niedermayer Signed-off-by: Anton Khirnov commit e74bf3f3684ab92f0a7ceac3fb23ed6c400beb9a Author: Michael Niedermayer Date: Tue Feb 22 00:23:31 2011 +0100 drawtext: simplify chroma blend and fix chroma alpha. Signed-off-by: Anton Khirnov commit a5b64584f3ee1ffff5280b5be8425591725f844a Author: Stefano Sabatini Date: Mon Feb 21 01:02:29 2011 +0100 lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo With the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats * fix minor errors and typos in the filter description * extend/clarify examples in the filter description Signed-off-by: Anton Khirnov commit f44967b1b548413830324f6c64f78032f9cbecc3 Author: Reimar Döffinger Date: Sat May 7 09:58:38 2011 +0200 Use av_fast_malloc instead of av_fast_realloc. Avoids a memleak, is less code and might be faster. commit 6266c515389a2d77951b204ff21c9eeb67758fdf Author: Reimar Döffinger Date: Sat May 7 09:47:35 2011 +0200 Simplify condition. commit 20e5d64a1a4ce0fed3399f4b09e781c52091e854 Author: Reimar Döffinger Date: Wed May 4 21:30:56 2011 +0200 msvideo1enc: minor cosmetic cleanup, use FFALIGN, avoid calculating value twice and add a missing "const". commit e5a85164b100620fe529bae0ce623956f0bab2e9 Merge: c60d2be 45a811b Author: Michael Niedermayer Date: Sat May 7 04:14:09 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: mov: fix composition timestamps on movie fragments. wmavoice: Use proper size in memeset(). commit c60d2be5510044edf01d813363e39841db3d751a Author: Michael Niedermayer Date: Tue Apr 26 03:50:56 2011 +0200 mp3enc:simplify Signed-off-by: Michael Niedermayer commit e1e8a8ded431ee5e0e6fee5693d4b8f7e7eaa527 Author: Michael Niedermayer Date: Tue Apr 26 03:49:53 2011 +0200 mp3enc:better variable name for the frames field file postion. Signed-off-by: Michael Niedermayer commit 4382bc2ceb3582901f64f093bbab12c8ca8b4672 Author: Michael Niedermayer Date: Tue Apr 26 03:45:48 2011 +0200 mp3enc: drop nested structs Signed-off-by: Michael Niedermayer commit f2a90c3b3456ade0cff94ebd3b787a05305e50f0 Author: Michael Niedermayer Date: Tue Apr 26 03:31:02 2011 +0200 mp3enc:use FFMIN() Signed-off-by: Michael Niedermayer commit 01be9331c7c1e65fa5597739bc7bd9121a2d4571 Author: Michael Niedermayer Date: Tue Apr 26 03:24:28 2011 +0200 mp3enc:Drop unneeded floating point math. Signed-off-by: Michael Niedermayer commit ec9a5deb20f886ad239b4ed0c8d199a78c40944d Author: Michael Niedermayer Date: Tue Apr 26 03:22:21 2011 +0200 mp3enc: drop sum and count bytes instead of bitrates from decoded headers. Signed-off-by: Michael Niedermayer commit 7d62475656af60a061b5186b96a519e4aeac892a Author: Michael Niedermayer Date: Tue Apr 26 03:06:51 2011 +0200 mp3enc: remove unneeded ifdef Signed-off-by: Michael Niedermayer commit 173c975ead9bd9234956cceb3a9b2ed58dfbe213 Author: Michael Niedermayer Date: Tue Apr 26 03:06:04 2011 +0200 mp3enc: remove unneeded static const variables. Signed-off-by: Michael Niedermayer commit d62bf5d4e73250295c0a652e151498c5b19cbd63 Author: Peter Belkner Date: Sat May 7 02:23:28 2011 +0200 mp3enc: mux a XING header The patch below provides exactly that to the MP3 muxer. A XING header containing * the numer of frames, * the size, and * a TOC is generated. It's based on an idea by Anton Khirnov (restricted to the number of frames) found at http://patches.ffmpeg.org/patch/1891/ The TOC is generated as found in lame's "VbrTag.c". According to my tests the following reproduces the number of frames, the size and the TOC in "c.mp3" from "b.mp3" (except a shift due to shorter XING header generated by FFmpeg): lame -V2 a.wav b.mp3 ffmpeg -i b.mp3 -acodec copy -y c.mp3 commit c34cb130b6bf3e957484fd236c1ba477720882c0 Author: Michael Niedermayer Date: Sat May 7 01:02:38 2011 +0200 avfilter: dont use AVFilterLink as priv for pictures as its freed too early. Signed-off-by: Michael Niedermayer commit 21d84246d522d8f1b2435bb64089ca0098379680 Author: Michael Niedermayer Date: Sat May 7 00:01:33 2011 +0200 avfilter: Fix ticket82 / fix initial buffer values. Signed-off-by: Michael Niedermayer commit 39f66edbeae5ccabefe38b2fcb25d6c242d868c0 Author: Michael Niedermayer Date: Fri May 6 23:53:06 2011 +0200 AVFilter: use picture pool to avoid malloc(). Signed-off-by: Michael Niedermayer commit fa3eddc0110cb237cd57c3e82cafdbcbf798b3a1 Author: Michael Niedermayer Date: Fri May 6 23:37:43 2011 +0200 avfilter_unref_buffer: favor av_freep() Signed-off-by: Michael Niedermayer commit c25a8d7dfbdd5f2cf3c275c51697cf0941bbbdcf Author: Michael Niedermayer Date: Fri May 6 19:30:14 2011 +0200 mpegvideo: fix 422 lowres Signed-off-by: Michael Niedermayer commit a565c7b7f2e03a769a821c49818c66474bfaf7fd Author: Michael Niedermayer Date: Fri May 6 17:39:31 2011 +0200 aiffdec:Rewrite get_meta() Signed-off-by: Michael Niedermayer commit 423986fc09e3c674c2c8ac273d0ef094c379b497 Author: JULIAN GARDNER Date: Fri May 6 17:09:22 2011 +0200 Allow encodiing empty subtitles. commit 95f163b33b4f13cfe650f53ee2c3746788122def Author: Michael Niedermayer Date: Fri May 6 15:19:27 2011 +0200 swscale: Dither for unscaled 10->8bit per channel Signed-off-by: Michael Niedermayer commit 7915e038c6ff70fd7b109a68c0064755648b0d14 Author: Michael Niedermayer Date: Fri May 6 13:18:55 2011 +0200 swscale: dont reshuffle bytes Signed-off-by: Michael Niedermayer commit 45a811b512b47acf060247ad0bc7022cada5533b Author: Yusuke Nakamura Date: Fri Apr 29 23:39:29 2011 +0900 mov: fix composition timestamps on movie fragments. This fixes, for instance, the case that there is a track that has some samples with composition time offset and has a track run without sample-composition-time-offsets-present. commit 869303bebd0c25dc10d88139d6a603eb6b50c71d Author: Alex Converse Date: Thu May 5 11:10:19 2011 -0700 wmavoice: Use proper size in memeset(). sizeof(array_functrion_argument) gives the size of the pointer type not the size of the array to which it points. commit 6dc30b25c5513f6f02077825411377e167415d52 Merge: 1875284 762f95e Author: Michael Niedermayer Date: Fri May 6 04:28:12 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: configure: warn if pkg-config is missing Merged-by: Michael Niedermayer commit 187528441ab936c102b8e72f38925cc10fc14abc Author: Michael Niedermayer Date: Fri May 6 03:52:16 2011 +0200 avidec: correct frame_offset for seeking Signed-off-by: Michael Niedermayer commit cde55897178fb79d194f9f4951a220fb7ca4cda9 Author: Carl Eugen Hoyos Date: Fri May 6 03:27:53 2011 +0200 Silence a warning if pkg_config is not installed. commit ccd77fe59bba01ae791f84cb08a3eff0cd76c11e Author: Michael Niedermayer Date: Fri May 6 02:19:25 2011 +0200 Makefile:Put lost tab back. Signed-off-by: Michael Niedermayer commit 5e24098b84424b4cf449d809d1027c49fb06c375 Author: Michael Niedermayer Date: Thu May 5 23:54:31 2011 +0200 avidec: detect mpeg4 keyframes in indexless avi Signed-off-by: Michael Niedermayer commit 0fa8d19987f03444365a5c7f73b7ecf1520b011e Author: Baptiste Coudurier Date: Wed May 4 18:45:36 2011 -0700 In svq3 decoder, check negative mb_type, fix potential crash. Signed-off-by: Michael Niedermayer commit 6c2845600d984d75c4d22a2f4b9cb1c628babb78 Author: Francesco Cosoleto Date: Tue May 3 14:25:43 2011 +0200 fate: mention fate documentation in the error message Signed-off-by: Francesco Cosoleto Signed-off-by: Michael Niedermayer commit 757ec2d7e74dbe96129cc0f8db7fd3c60f701270 Author: Michael Niedermayer Date: Thu May 5 21:27:57 2011 +0200 MPEG: support 4:4:4 lowres Signed-off-by: Michael Niedermayer commit 59b9c75d0ec2cabde50338a40304008a6bf97598 Author: Michael Niedermayer Date: Thu May 5 21:27:09 2011 +0200 MPEG: support 4:4:4 intra lowres Signed-off-by: Michael Niedermayer commit 762f95e4cbccad7f31607e5c0163d097b01332dc Author: Mans Rullgard Date: Thu May 5 16:45:12 2011 +0100 configure: warn if pkg-config is missing Signed-off-by: Mans Rullgard commit 55bfb98fc622583a407200c9be2c9e2f39a61950 Author: Stefano Sabatini Date: Wed May 4 00:47:53 2011 +0200 lavfi-regression: provide filter arguments to showfiltfmts In do_lavfi_pixfmts(), provide the filter arguments to showfiltfmts, since some filter may require non-null or non-empty argument string for working properly. commit e5272e729e9991c1705f53e0bf421e8026fab0c9 Author: Stefano Sabatini Date: Tue May 3 23:31:14 2011 +0200 eval: add sqrt function for computing the square root commit 5d2ce3a7782ade1ea661c139b58e2ab5389aaf17 Author: Stefano Sabatini Date: Thu May 5 01:05:07 2011 +0200 configure: add strong dependencies for movie source and mp filter commit 2264c1108135380c49fdf0aef97520bf77a6ed37 Author: Baptiste Coudurier Date: Thu May 5 15:17:51 2011 +0200 SVQ3: do not modify const input buffer Signed-off-by: Michael Niedermayer commit b0e7a932e6ea9bb83e7e15c4cd4c1bda110d16e2 Author: Baptiste Coudurier Date: Thu May 5 14:40:26 2011 +0200 SVQ3: Check that things match up after a frame. Signed-off-by: Michael Niedermayer commit 8811679c8e6bcb5911f4749594c31e7fd1f5dfff Author: Baptiste Coudurier Date: Thu May 5 14:18:33 2011 +0200 SVQ3: Move svq3 specific fields to their own context. Signed-off-by: Michael Niedermayer commit 175714c0c34025d642f529af5809dcb48c5ceb0c Author: Michael Niedermayer Date: Thu May 5 15:35:54 2011 +0200 ffplay: set CODEC_FLAG_EMU_EDGE earlier Signed-off-by: Michael Niedermayer commit b000b86e1dd03c4ff89cd63a6fa88fc280947c94 Merge: 9a5624a af1ca24 Author: Michael Niedermayer Date: Thu May 5 03:09:48 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: (23 commits) doc: Check standalone compilation before submitting new components. Fix standalone compilation of pipe protocol. Fix standalone compilation of ac3_fixed encoder. Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders. Fix standalone compilation of IMC decoder. Fix standalone compilation of WTV demuxer. Fix standalone compilation of MXPEG decoder. flashsv: K&R cosmetics matroskaenc: fix memory leak vc1: make overlap filter for I-frames bit-exact. vc1dec: use s->start/end_mb_y instead of passing them as function args. Revert "VC1: merge idct8x8, coeff adjustments and put_pixels." Replace strncpy() with av_strlcpy(). indeo3: Eliminate use of long. get_bits: make cache unsigned to eliminate undefined signed overflow. asfdec: fix assert failure on invalid files avfilter: check malloc return values. Not pulled as reason for reindent is not pulled: mpegvideo: reindent. nutenc: check malloc return values. Not pulled due to much simpler solution in ffmpeg *: don't av_malloc(0). ... Conflicts: doc/developer.texi libavcodec/Makefile libavcodec/get_bits.h libavcodec/mpegvideo.c libavformat/Makefile libavutil/log.c Merged-by: Michael Niedermayer commit 9a5624a0f1b205e966391645a512c6dccdce42cd Author: Michael Niedermayer Date: Thu May 5 02:20:20 2011 +0200 rgb24toyv12: break out in the middle before out of array reads. Signed-off-by: Michael Niedermayer commit b93e12fdf4392570ce87143fb36c4f2f1d1c8ba1 Author: alexandru_mg3 Date: Thu May 5 01:42:53 2011 +0200 ffplay: fix memleak if avfilter is disabled commit 10ff2967ea8d17f7e46599497214280a21ca409a Author: Michael Niedermayer Date: Thu May 5 00:52:03 2011 +0200 file: Fix mmap error check. Signed-off-by: Michael Niedermayer commit 6dafa7065bfc0634398879d7069582bbe0b3a8f2 Author: Michael Niedermayer Date: Wed May 4 23:30:14 2011 +0200 configure: jack currently needs sem_timedwait() Should fix ticket99 and ticket43 by disabling jack. Signed-off-by: Michael Niedermayer commit 705c65208ad3abbb6ddda1e84103d497f651a1dd Author: Michael Niedermayer Date: Wed May 4 22:14:22 2011 +0200 ffplay: removed unused variable channels. Signed-off-by: Michael Niedermayer commit 5258f64a14713499cf84840b3ab3a1ee7cdcaeb8 Author: Michael Niedermayer Date: Wed May 4 22:06:41 2011 +0200 Disable warnings for casting pointers to integers, there is nothing wrong with that. Signed-off-by: Michael Niedermayer commit 3e173a14e99f350d03e1a420fa8f6d3a5e659c17 Author: Michael Niedermayer Date: Wed May 4 21:57:08 2011 +0200 swscale: fix src type Signed-off-by: Michael Niedermayer commit 334187ade78405bb133be0d8551e453aad6eeedb Author: Michael Niedermayer Date: Wed May 4 21:42:08 2011 +0200 Fix "libavcodec/dfa.c:189: warning: unused variable ‘frame_end’" Signed-off-by: Michael Niedermayer commit e822c237b3f78bb6f0f6ba5219a2a6cab3b27ce4 Author: JULIAN GARDNER Date: Wed May 4 20:44:14 2011 +0200 dvbsubdec: Split delete_state() commit 9522a752bf4179b69fa9e334ee755405ba8f4459 Author: Michael Niedermayer Date: Wed May 4 19:01:42 2011 +0200 xsubenc: only 1 rectangle is supported so dont allow 0 as it would crash. Signed-off-by: Michael Niedermayer commit d7c91c4ceac07c0274e06f2aa19b2fee8337dd47 Author: Justin Ruggles Date: Mon Feb 28 13:20:41 2011 -0500 sonic: fix sonic decoder to match encoder for sample rates other than 44100. commit 105a3c7a6be5c381c1d5247692ecc09d23606260 Author: Michael Niedermayer Date: Wed May 4 21:31:07 2011 +0200 bitstream_reader: Try to fix "get_bits.h:305:45: warning: variable ‘re_cache’ set but not used [-Wunused-but-set-variable]" Signed-off-by: Michael Niedermayer commit af1ca249e8eb685823dd0dade3aa3c1d119a61ec Author: Diego Biurrun Date: Wed May 4 20:54:53 2011 +0200 doc: Check standalone compilation before submitting new components. commit 8799541a0a7bd84c04a2fac73bf819aaf53fc302 Author: Diego Biurrun Date: Wed May 4 19:20:03 2011 +0200 Fix standalone compilation of pipe protocol. file_check() is not only used by the file protocol, adjust #ifdef accordingly. commit 3d2690592577ad4b4318cc7a6dcab63481a5acae Author: Diego Biurrun Date: Wed May 4 19:17:30 2011 +0200 Fix standalone compilation of ac3_fixed encoder. commit a33657ce5b065df045c7567517641f40e7aab1f8 Author: Diego Biurrun Date: Wed May 4 18:48:51 2011 +0200 Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders. commit 56c8227d465fe50ea48790ae316a82cafd9e822b Author: Diego Biurrun Date: Wed May 4 18:48:26 2011 +0200 Fix standalone compilation of IMC decoder. commit 61165a1bba939e520d01b5f029100fd700b51f2f Author: Diego Biurrun Date: Wed May 4 18:47:07 2011 +0200 Fix standalone compilation of WTV demuxer. commit 091018e0dd0e2600b62324bce0e7146d7d300f44 Author: Diego Biurrun Date: Wed May 4 14:21:27 2011 +0200 Fix standalone compilation of MXPEG decoder. commit 35e376b0d25ec2e5bff25ca24c2d741cccb27b10 Author: Diego Biurrun Date: Tue May 3 16:08:53 2011 +0200 flashsv: K&R cosmetics commit 3acc44b7395f5688699df4d1dd30e0483b7f7b72 Author: Michael Niedermayer Date: Wed May 4 20:25:33 2011 +0200 bitstream reader: remove unneeded variable initilization. Signed-off-by: Michael Niedermayer commit eddd580b743692bc930692cb0c5a3e930ab45ad4 Author: Mans Rullgard Date: Wed May 4 17:57:37 2011 +0100 matroskaenc: fix memory leak This fixes a memory leak occurring when no cue points are defined since commit 91819763. Signed-off-by: Mans Rullgard commit 7d2e03afc8573f959aa3641eea5c9f981466bcd8 Author: Ronald S. Bultje Date: Wed May 4 07:40:53 2011 -0400 vc1: make overlap filter for I-frames bit-exact. commit 5c9f147e055c732b1b2a0c8350b4d08b9b30e0cd Author: Ronald S. Bultje Date: Mon May 2 22:09:02 2011 -0400 vc1dec: use s->start/end_mb_y instead of passing them as function args. commit 18b6a69ce9fcbd12476cfbe8ca9cd7e148dc21c5 Author: Ronald S. Bultje Date: Wed May 4 07:35:30 2011 -0400 Revert "VC1: merge idct8x8, coeff adjustments and put_pixels." This reverts commit f8bed30d8b176fa030f6737765338bb4a2bcabc9. The reason for this is that the overlap filter, which runs after IDCT, should run on unclamped values, and thus IDCT and put_pixels() cannot be merged if we want to attempt to be bitexact. commit 1a5e4fd8c5b99478b4e08a69261930bb12aa948b Author: Alex Converse Date: Tue May 3 11:19:31 2011 -0700 Replace strncpy() with av_strlcpy(). commit aab6374bbe2b6ce4ca82141be6a5b7b8875bf051 Author: Alex Converse Date: Sun Apr 24 17:33:37 2011 -0700 indeo3: Eliminate use of long. commit 47bc52f8216d9de3e50160adb929620ac31ede99 Author: Alex Converse Date: Tue Apr 26 09:09:05 2011 -0700 get_bits: make cache unsigned to eliminate undefined signed overflow. commit 0bd433a916cd8d98fce47742fbf6d0f90ec941c4 Author: Uoti Urpala Date: Sun Apr 24 07:21:30 2011 +0300 asfdec: fix assert failure on invalid files Add an extra size validity check in asf_read_frame_header(). Without this asf->packet_size_left may become negative, which triggers an assertion failure later. Signed-off-by: Ronald S. Bultje commit 0699dbb8478886826dedb1c33a0b74142a1cd863 Author: Ronald S. Bultje Date: Tue May 3 21:25:40 2011 -0400 avfilter: check malloc return values. commit d969e93a72102a4162a1b20ec0b4fe22c69f3ff7 Author: Ronald S. Bultje Date: Tue May 3 08:23:41 2011 -0400 mpegvideo: reindent. commit 76432655056b9c1477ade550e4b6d277556eb6b2 Author: Ronald S. Bultje Date: Tue May 3 08:19:42 2011 -0400 nutenc: check malloc return values. commit f8af93ab99a132c268e4ce83736762555e928b96 Author: Ronald S. Bultje Date: Wed Apr 27 08:29:09 2011 -0700 avfilter: don't av_malloc(0). commit 25588d3b8a556eb5d0d3239d8c6aee968ea18896 Author: Ronald S. Bultje Date: Wed Apr 27 08:29:02 2011 -0700 nutenc: don't av_malloc(0). commit fb22c237152ea62f51b8e1c96a782bae4c8709c1 Author: Ronald S. Bultje Date: Wed Apr 27 08:28:51 2011 -0700 mpegvideo: don't av_malloc(0). commit f8b1245922cf4c7692750e9198cf57598f9647d5 Author: Ronald S. Bultje Date: Wed Apr 27 15:42:16 2011 -0700 asfdec: fix parsing of packets that overrun into padding. Signed-off-by: Ronald S. Bultje commit 707e8612e85ba83fcbbfc56be3f4ab24af7e98fb Merge: b5f2089 8ce67bc Author: Michael Niedermayer Date: Wed May 4 04:06:26 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: Implement fate-rsync target Make ffmpeg support generic data stream Conflicts: cmdutils.h Merged-by: Michael Niedermayer commit b5f20892c960ab9058c74703b29d7bf9d248bd36 Author: Michael Niedermayer Date: Sun Feb 13 00:23:47 2011 +0100 msvideo1 regression test Signed-off-by: Michael Niedermayer commit e4be3485af1fe39ee97ecbbda9b5abf4d5941853 Author: Kostya Shishkov Date: Sun Jan 23 15:58:23 2011 +0100 MS Video 1 encoder commit 8ce67bcabe7f50622430c11c3384675f095c78b5 Author: Reinhard Tartler Date: Sun May 1 16:48:40 2011 +0200 Implement fate-rsync target commit e3b540b42464395eadbc42b87331589e2e9e4301 Author: Luca Barbato Date: Thu Apr 14 13:32:36 2011 +0200 Make ffmpeg support generic data stream The patch is the first step to support -dcodec copy commit c402ce418a9e7b456c383e097ad772f218a004c7 Author: ami_stuff Date: Fri Apr 29 01:20:10 2011 +0200 Remove lowres support from wmv2 decoder lowres option crashes with wmv2 files which I have for test, so I think it's better to remove the support to the time when lowres will be really supported by this codec Signed-off-by: Michael Niedermayer commit 2525821f1aadf34e3c874c669feb6be27249e881 Merge: 7d70d19 4773d90 Author: Michael Niedermayer Date: Tue May 3 04:08:23 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: vp8: frame-multithreading. Duplicate Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*. Duplicate Replace deprecated av_get_pict_type_char() with av_get_picture_type_char(). Bug spoted&removed in last merge: dpx: Do not use DPX encoder for decoding. Conflicts: ffmpeg.c ffplay.c libavcodec/h264.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c Merged-by: Michael Niedermayer commit 7d70d1937a5c1a3fda8b988e3bccbb4a04ff3ae7 Author: Carl Eugen Hoyos Date: Tue May 3 01:09:30 2011 +0200 Support decoding of 24 bit True Audio samples- Many samples will fail because "Output buffer size is too small." commit 4cf2e30f056f092f4b04d516ee45ceb1ec7f268e Author: Carl Eugen Hoyos Date: Tue May 3 01:06:18 2011 +0200 Support decoding of 8 bit True Audio samples- Many samples will fail because "Output buffer size is too small." commit fba418e6708a5271e933be27f346759e3d616e7c Author: Carl Eugen Hoyos Date: Tue May 3 01:02:07 2011 +0200 Do not assume AV_SAMPLE_FMT_S16 as tta sample format. commit 3b4621acbb9b0b1f69dae3f14b01762fce912309 Author: Alexandre Colucci Date: Mon May 2 18:55:02 2011 +0200 Fix init_get_bits length argument for init_get_bits. Do not use rlelen for buffer size in init_get_bits, it is only the size of the data for the first field. Since it is not reliable, just use the size of the whole buffer. Additional comments add removal of unused rlelen variable by Reimar Döffinger. commit 884f678cfdc40561d780df708e2c7b58452d2e1e Author: ami_stuff Date: Mon May 2 01:45:05 2011 +0200 Add *.j2k extension to JPEG2000 decoder Some files with *.j2k extension can be found for example here: http://www.openjpeg.org/index.php?menu=samples Signed-off-by: Michael Niedermayer commit cf16104ad13f6c558ea386e5fa55a67e2b378f5e Author: Reimar Döffinger Date: Sat Apr 30 23:00:17 2011 +0200 Change guess_palette so its output matches the most common palette. This means it uses full brightness range and brightness increasing instead of decreasing with index of non-opaque color. Based on patch by Alexandre Colucci [alexandre elgato com] commit 148ffcd2ce116cadb0efdbacc358851222c808d0 Author: Reimar Döffinger Date: Sat Apr 30 11:55:36 2011 +0200 Make DV (sub) demuxer set proper pkt->pos values. This makes the avi demuxer create packets with proper pos values with the file from ticket #140. commit 4773d904211ec07688418eb9bb78df6467c1ca2f Author: Ronald S. Bultje Date: Mon May 2 09:55:52 2011 -0400 vp8: frame-multithreading. Tested on a Mac Pro, 2 CPUs, 2 cores each, OSX 10.6.6: time ./ffmpeg -v 0 -vsync 0 -threads [1234] -i \ ~/Downloads/sintel_trailer_1080p_vp8_vorbis.webm \ -f null -vcodec rawvideo -an - 1: 0m14.630s (89.9 fps) 2: 0m8.056s (163.2 fps) 3: 0m5.882s (223.6 fps) 4: 0m4.952s (265.6 fps) time ./ffmpeg -v 0 -vsync 0 -threads [1234] -i \ ~/Downloads/Elephants_Dream-720p-Stereo.webm \ -f null -vcodec rawvideo -an - 1: 1m12.962s (215.1 fps) 2: 0m44.682s (351.2 fps) 3: 0m31.183s (503.2 fps) 4: 0m25.284s (620.6 fps) Signed-off-by: Anton Khirnov commit f97905e61d7cb86987d7d4f5fabcfc0d6b57ddbb Author: Stefano Sabatini Date: Mon May 2 12:35:39 2011 +0200 scale: fix leak occurring when a scale filter is reconfigured This currently only occurrs in vsrc_buffer in case of mid-stream size/format change. Fix trac issue #124. commit 0f1ef8a316470977ae092635ada2720d8ed50c4e Author: Stefano Sabatini Date: Mon May 2 01:41:28 2011 +0200 vsrc_buffer: improve reporting in case of format/size change commit ce5e49b0c2c11ec153834677fc5c903dd71d4e6e Author: Stefano Sabatini Date: Thu Apr 28 01:40:44 2011 +0200 replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_* commit 301183d9be4e426d472d4be8c84095c853cb8ac4 Author: Stefano Sabatini Date: Thu Apr 28 01:03:28 2011 +0200 replace deprecated av_get_pict_type_char() with av_get_picture_type_char() commit 975a1447f76e8d30fc01e6ea5466c84faf3d76e4 Author: Stefano Sabatini Date: Fri Apr 29 18:53:57 2011 +0200 Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*. Signed-off-by: Diego Biurrun commit 6209669de4a0aa056ae05b0a2c78eaf2ca489b23 Author: Stefano Sabatini Date: Fri Apr 29 16:37:23 2011 +0200 Replace deprecated av_get_pict_type_char() with av_get_picture_type_char(). Signed-off-by: Diego Biurrun commit b178cd76b27ad317e6a93db63f5630f268ce21fe Author: Kostya Shishkov Date: Mon May 2 10:37:36 2011 +0200 dpx: Do not use DPX encoder for decoding. 10l to the one who hasn't checked this. commit 66b1f210c024a08ba00e4a730e64940d248b8717 Author: Michael Niedermayer Date: Mon May 2 04:25:42 2011 +0200 Revert "avio: Fix the deprecated fallback URL-prefixed open flags" This reverts commit 5b81e295931bad4dac0af29333b4e2a203b3f4d4. commit d4b98d475f8abf9f05ebe91b3fce341aa4b902ee Merge: 8d8962c 1a9f9f8 Author: Michael Niedermayer Date: Mon May 2 04:18:04 2011 +0200 Merge commit '1a9f9f8' into oldabi * commit '1a9f9f8': (98 commits) Do not drop packets with no valid ->pos set as e.g. DV-in-AVI produces. FFMPEG: support demuxer specific options. Signed-off-by: Michael Niedermayer AVIDEC: use_odmc demuxer specific option. (mostly an exmaple for demuxer specific options) Signed-off-by: Michael Niedermayer LAVFAPI: demuxer specific options. (someone please add doxy) Signed-off-by: Michael Niedermayer output_example: use avformat_alloc_output_context() Signed-off-by: Michael Niedermayer LAVFAPI: avformat_alloc_output_context() / simplify usage of muxers. Signed-off-by: Michael Niedermayer LAVF API: remove AVOutputFormat.set_parameters() the field is unused. Signed-off-by: Michael Niedermayer CrystalHD: Add auto-detection of packed b-frame bug. lavc: remove disabled avcodec_decode_video() code Read the album_artist, grouping and lyrics metadata. In libx264 wrapper, change wpredp to a codec specific option. AMV: disable DR1 and don't override EMU_EDGE lavf: inspect more frames for fps when container time base is coarse Fix races in default av_log handler flashsv2enc: regression test. Signed-off-by: Michael Niedermayer vorbis: Replace sized int_fast integer types with plain int/unsigned. Remove disabled non-optimized code variants. bswap.h: Remove disabled code. Remove some disabled printf debug cruft. Replace more disabled printf() calls by av_dlog(). ... Conflicts: libavcodec/options.c libavcodec/qpeg.c libavfilter/avfilter.h libavformat/avformat.h Merged-by: Michael Niedermayer commit 8d8962ca3e95b1ce86ab505498e7cd3ec89fa996 Author: Michael Niedermayer Date: Mon May 2 04:10:59 2011 +0200 Revert "lavc: remove FF_API_HURRY_UP cruft" This reverts commit e7021c0ed5d1265d5b4f0f01a01f840196a70415. commit 329559ae502a8d63bb04c0c3852caa48ac405ccc Author: Michael Niedermayer Date: Mon May 2 04:10:51 2011 +0200 Revert "lavc: remove FF_API_RATE_EMU cruft" This reverts commit 694c142434f1b775c93cb2586eebf7ddd5ef6aa8. commit 0b3a88fe1585f9d5d64da89417c0f8cc6788526a Author: Michael Niedermayer Date: Mon May 2 04:10:44 2011 +0200 Revert "lavc: remove FF_API_MB_Q cruft" This reverts commit 6deae83e555982d86ef8cc68b804495092216fc4. commit 563fe360c356c0144badd63063c16dae989b5379 Merge: 73a502d d7e5aeb Author: Michael Niedermayer Date: Mon May 2 04:10:19 2011 +0200 Merge commit 'd7e5aeb' into oldabi * commit 'd7e5aeb': (24 commits) Fix runtime CPU detection in libswscale. ac3enc: correct the flipped sign in the ac3_fixed encoder Eliminate pointless '#if 1' statements without matching '#else'. Add AVX FFT implementation. Increase alignment of av_malloc() as needed by AVX ASM. Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX. mjpeg: Detect overreads in mjpeg_decode_scan() and error out. documentation: extend documentation for ffmpeg -aspect option APIChanges: update commit hashes for recent additions. lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums aac: add headers needed for log2f() lavc: remove FF_API_MB_Q cruft lavc: remove FF_API_RATE_EMU cruft lavc: remove FF_API_HURRY_UP cruft pad: make the filter parametric vsrc_movie: add key_frame and pict_type. vsrc_movie: fix leak in request_frame() lavfi: add key_frame and pict_type to AVFilterBufferRefVideo. vsrc_buffer: add sample_aspect_ratio fields to arguments. lavfi: add fieldorder filter ... Conflicts: libavcodec/version.h libavfilter/avfilter.h libavutil/avutil.h Merged-by: Michael Niedermayer commit c3f5b8112573245fc5056a49477749df4ed1d0ea Merge: 3862ebb ad1862d Author: Michael Niedermayer Date: Mon May 2 03:37:36 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: ALPHA: Replace sized int_fast integer types with plain int/unsigned. Duplicate DPX image encoder Duplicate DPX decoder: read sample aspect ratio Duplciate DPX decoder: add buffer size checks. ac3enc: clip large coefficient values and negative exponents rather than using av_assert2(). ac3enc: do not store a bandwidth code for each channel. ac3enc: remove bandwidth reduction as fallback for bit allocation failure. ac3enc: merge compute_exp_strategy_ch() into compute_exp_strategy() ac3enc: return error if frame+exponent bits are too large instead of using av_assert2(). ac3enc: differentiate between current block and reference block in bit_alloc() ac3enc: simplify exponent_init() by calculating exponent_group_tab[] based on exponent group sizes. ac3enc: simplify stereo rematrixing decision options Include both URLs: Update URL to fate samples Conflicts: Changelog doc/fate.txt libavcodec/ac3enc.c libavcodec/dpxenc.c libavcodec/version.h Merged-by: Michael Niedermayer commit 3862ebba23cc9a76a004edd4c12d0b853a0426cd Author: Michael Niedermayer Date: Sun May 1 22:40:01 2011 +0200 AVOptions: av_set_string3() allow NULL strings Signed-off-by: Michael Niedermayer commit 007d352c1ca73ffbfa249af51c26abf933c3c842 Author: Michael Niedermayer Date: Sun May 1 17:50:34 2011 +0200 dct-test: Support testing bits>8 Signed-off-by: Michael Niedermayer commit c92a9d069e8be8f0d71c9e48bed508f32b5d7c2a Author: Michael Niedermayer Date: Sun May 1 16:59:47 2011 +0200 ffplay: demuxer specific options support Signed-off-by: Michael Niedermayer commit 5edb23295edf9bffd94f08b7475632473c0453bd Author: zhentan feng Date: Sun May 1 21:13:18 2011 +0200 WTV: Add ff_ prefix to the moved fields. Signed-off-by: Michael Niedermayer commit 5ab826c165916a301ee748ee5a1d68cf788d5d2f Author: zhentan feng Date: Sun May 1 21:12:02 2011 +0200 WTV:move the common variable used by wtvdec.c and wtvenc.c to a new file wtv.h and wtv.c. Signed-off-by: Michael Niedermayer commit 80a330679f5916a868227fabcecc4889cc402a61 Author: zhentan feng Date: Sun May 1 21:10:00 2011 +0200 rename wtv.c to wtvdec.c Signed-off-by: Michael Niedermayer commit ad1862d64ae28251e2740e437bbc639492a374a0 Author: Diego Biurrun Date: Fri Apr 29 20:15:00 2011 +0200 ALPHA: Replace sized int_fast integer types with plain int/unsigned. int/unsigned is the natural memory access type for CPUs, using sized types for temporary variables, counters and similar just increases code size and can possibly cause a slowdown. commit e27ce0eea36b7631ad26a8f41b93855e3ae7e8f9 Author: Peter Ross Date: Sat Mar 26 15:12:35 2011 +1100 DPX image encoder commit 406629150cae78a15d7c04b049511b03740b6bfc Author: Peter Ross Date: Fri Apr 1 23:23:28 2011 +1100 DPX decoder: read sample aspect ratio Signed-off-by: Michael Niedermayer commit 3777ea13fbf690003f8b0d83a8bffb6e1d71c3df Author: Reimar Döffinger Date: Fri Mar 25 18:58:07 2011 +0100 DPX decoder: add buffer size checks. commit 63b1866ae1e19ff0d694746a84e2eac859cda462 Author: Justin Ruggles Date: Fri Apr 15 23:18:33 2011 -0400 ac3enc: clip large coefficient values and negative exponents rather than using av_assert2(). commit 177fed4e9baa43bdcfb6771195eb85f19412c23e Author: Justin Ruggles Date: Fri Apr 15 22:49:05 2011 -0400 ac3enc: do not store a bandwidth code for each channel. Although AC-3 allows it, it's not very useful. The encoder uses the same code for all full-bandwidth channels. commit a1d0f511fc3a758146d9384ccaab31743d8bd600 Author: Justin Ruggles Date: Fri Apr 15 22:45:05 2011 -0400 ac3enc: remove bandwidth reduction as fallback for bit allocation failure. It was only needed at low bitrates, which now already use a low bandwidth, so the bandwidth reduction is no longer needed. commit ba6bce5140f09ed84d54f93fd5c816cbcf150c90 Author: Justin Ruggles Date: Fri Apr 15 22:43:25 2011 -0400 ac3enc: merge compute_exp_strategy_ch() into compute_exp_strategy() commit 4142487d1cd8c555e13f156d1cc89f838099db10 Author: Justin Ruggles Date: Fri Apr 15 19:56:42 2011 -0400 ac3enc: return error if frame+exponent bits are too large instead of using av_assert2(). This can occur in some very rare cases with low bitrates. commit 987fe2dc55c2de4dd798cbd0ebcdae6a066faff7 Author: Justin Ruggles Date: Fri Apr 15 19:55:09 2011 -0400 ac3enc: differentiate between current block and reference block in bit_alloc() commit 6b2636bba68880450749b3d36a99d584c031342e Author: Justin Ruggles Date: Fri Apr 15 19:51:06 2011 -0400 ac3enc: simplify exponent_init() by calculating exponent_group_tab[] based on exponent group sizes. commit e0b33d479cf1cb96e4300b82309e26e6f9c50d6c Author: Justin Ruggles Date: Fri Apr 15 19:22:42 2011 -0400 ac3enc: simplify stereo rematrixing decision options commit 636ee66f1c188de9d92cb794f8765390d8177c42 Author: Reimar Döffinger Date: Sat Apr 30 23:19:04 2011 +0200 Fix data_size handling for AC3 and dca decoders. They use now code identical to the AAC decoder. The AC3 decoder previously did not check the data_size and the dca decoder checked against and set wrong values for float. commit a28b0587455f1ed4ac9ac955cc95f95656019ce4 Author: Reinhard Tartler Date: Sun May 1 14:34:31 2011 +0200 Update URL to fate samples commit 35fe66abbc9a6d151cedbc8d0261dc007aa71fe2 Author: Stefano Sabatini Date: Fri Apr 29 13:12:39 2011 +0200 lavfi: rename AVFilterBufferRefVideoProps.pixel_aspect to sample_aspect_ratio Improve consistency with libavcodec. This breaks libavfilter API/ABI. The non-sequential 2.1.0 -> 2.4.0 bump is due to the mess previously done with the lavfi minor number. commit 77e9dee8aefa3fca75984226f66bf004bb8f9e13 Author: Stefano Sabatini Date: Fri Apr 29 13:04:47 2011 +0200 lavc: add a sample_aspect_ratio field to AVFrame The sample aspect ratio is a per-frame property, so it makes sense to define it in AVFrame rather than in the codec/stream context. Simplify application-level sample aspect ratio information extraction, and allow further simplifications. commit 1ba57272429fc6c86e39cd236e2b32ac545e1488 Author: Stefano Sabatini Date: Fri Apr 29 12:28:44 2011 +0200 lavc: add a pkt_pos field to AVFrame This is similar to what was done with pkt_pts. This simplifies the operation of extracting the pos information from the AVPacket, and allows further simplifications. commit aba0278e9fe8e66c078588efe66f6af4db432770 Author: Carl Eugen Hoyos Date: Sun May 1 06:39:08 2011 +0200 Fix compilation in some cases if the flac decoder was disabled. flac.o implies vorbis_data.o because of flac channel layout. commit c059d7aa57391f2216808dbf2afdcb9e0a835ab5 Author: Michael Niedermayer Date: Sun May 1 02:32:41 2011 +0200 H264: Fix intra only decoding. This possibly fixes issue2679 Signed-off-by: Michael Niedermayer commit 0ae4aba649dffd6de4594715be06e1ec39d374d5 Author: Michael Niedermayer Date: Sun May 1 02:32:16 2011 +0200 H264:Print short+long+max values when they dont match up. Signed-off-by: Michael Niedermayer commit 7ac85f4be840361d55db302ac476ced28297a061 Author: Michael Niedermayer Date: Sun May 1 02:31:42 2011 +0200 H264:use av_assert0() for frame num check Signed-off-by: Michael Niedermayer commit 0e5758d1013dbf68b4b0ea1ad847d52769d475db Author: Michael Niedermayer Date: Sun May 1 02:31:01 2011 +0200 H264: print nal_ref_idc too for debug Signed-off-by: Michael Niedermayer commit e12926393b3477e8c324268d3281ae9975f58435 Author: Mike Scheutzow Date: Thu Apr 28 10:14:26 2011 -0400 Fix decoding of mpegts streams with h264 video that does *NOT* have b frames One of the causes of this bug is that the h264 parser defaults low_delay to 1, but the h264 codec defaults low_delay to 0. Really Ugly. After many hours of looking at this, I'm still not sure how has_b_frames is *intended* to behave, but to me the implementation appears way more complicated than it ought to be. My patch relies on the encoder to set an optional field in the SPS. This works for libx264 streams, but I'm not sure that all h264 encoders will set it. commit 8556406d38dc2307dd3f187c4528d64f5c350d5f Author: ami_stuff Date: Sun May 1 00:38:25 2011 +0200 lavc: lowercase the FRWU codec name This is more consistent with all the other codec names. Signed-off-by: Stefano Sabatini commit ffb5a0d533498102c31aa131bc91a4cce868b0a8 Merge: 1a9f9f8 85770f2 Author: Michael Niedermayer Date: Sun May 1 00:21:56 2011 +0200 Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45' * commit '85770f2a2651497861ed938efcd0df3696ff5e45': AVOptions: make default_val a union, as proposed in AVOption2. Move ff_dynarray_add to lavu and make it public. lavf: remove duplicate assignment in avformat_alloc_context. lavf: use designated initializers for AVClasses. options: simplify av_find_opt by using av_next_option. Merged-by: Michael Niedermayer commit 1a9f9f81b1244b952126bb65bc741b04d3534f81 Author: Reimar Döffinger Date: Sat Apr 30 11:49:49 2011 +0200 Do not drop packets with no valid ->pos set as e.g. DV-in-AVI produces. Fixes ticket #140. commit fa1195227ff010bc22472688587fdcfa620f69de Author: Michael Niedermayer Date: Sat Apr 30 21:38:40 2011 +0200 FFMPEG: support demuxer specific options. Signed-off-by: Michael Niedermayer commit ffdc49df25ec275c17e7f3e0ae5893185e3d9b93 Author: Michael Niedermayer Date: Sat Apr 30 21:37:11 2011 +0200 AVIDEC: use_odmc demuxer specific option. (mostly an exmaple for demuxer specific options) Signed-off-by: Michael Niedermayer commit 492026209b9b58eaf6d2ea56423f6b1e1a8a76a5 Author: Michael Niedermayer Date: Sat Apr 30 21:35:48 2011 +0200 LAVFAPI: demuxer specific options. (someone please add doxy) Signed-off-by: Michael Niedermayer commit ce62b35c313c2618c2e3b49cae3441b3a7dd29fe Author: Michael Niedermayer Date: Sat Apr 30 20:44:09 2011 +0200 output_example: use avformat_alloc_output_context() Signed-off-by: Michael Niedermayer commit 7d727f1338fb23ce26975ba0e5487d2fa5783d16 Author: Michael Niedermayer Date: Sat Apr 30 20:43:16 2011 +0200 LAVFAPI: avformat_alloc_output_context() / simplify usage of muxers. Signed-off-by: Michael Niedermayer commit a2eef3e9f579db4278ff32cba6281452a163b05f Author: Michael Niedermayer Date: Sat Apr 30 20:03:16 2011 +0200 LAVF API: remove AVOutputFormat.set_parameters() the field is unused. Signed-off-by: Michael Niedermayer commit 8de45adb37bb0591626645e1f7d1303339b2bc9f Author: Philip Langdale Date: Wed Apr 20 21:43:29 2011 -0700 CrystalHD: Add auto-detection of packed b-frame bug. I still don't fully understand the cause but the difference between the samples that trigger the bug and the samples that don't is that the former uses delay frames and the later uses drop frames as placeholders for the packed frame. So, if we see the one type of frame, we can assume the bug will or won't be present. Right now, I'm detecting the frame types by size, which may not be safe in general, but given the specific codec and file type, I expect any scenario where we encounter these frames where they aren't being used for b-frame packing won't care one way or another whether the work around is in effect or not. Signed-off-by: Philip Langdale commit d5551265f3004d70bb349aa06bc16ce3225c6f4d Author: Stefano Sabatini Date: Sat Apr 30 11:55:06 2011 +0200 lavc: remove disabled avcodec_decode_video() code Fix warning: libavcodec/utils.c: At top level: libavcodec/utils.c:714:5: warning: "FF_API_VIDEO_OLD" is not defined Also fix trac issue #139. commit 543f3db9784348499a1ac1088373e2fb9100d4c0 Author: Reimar Döffinger Date: Sun Apr 24 17:02:09 2011 +0200 Read the album_artist, grouping and lyrics metadata. Our muxer writes these out, so we really should support reading them. Fixes ticket #30. commit 85770f2a2651497861ed938efcd0df3696ff5e45 Author: Anton Khirnov Date: Sat Apr 30 07:43:26 2011 +0200 AVOptions: make default_val a union, as proposed in AVOption2. This breaks API and ABI. commit 97dc86b793efb9c6ac604cdfff4027fe27efa12c Author: Baptiste Coudurier Date: Fri Apr 29 14:13:19 2011 -0700 In libx264 wrapper, change wpredp to a codec specific option. commit be315a3232d96a2704e276f1ebe870a4d249d090 Merge: 500bf39 7089265 Author: Michael Niedermayer Date: Sat Apr 30 01:40:29 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: Duplicate AMV: disable DR1 and don't override EMU_EDGE Duplicate lavf: inspect more frames for fps when container time base is coarse Wrong and we have correct fix: Fix races in default av_log handler vorbis: Replace sized int_fast integer types with plain int/unsigned. Remove disabled non-optimized code variants. NO bswap.h: Remove disabled code. Remove some disabled printf debug cruft. Replace more disabled printf() calls by av_dlog(). NO tests: Remove disabled code. NO Replace some commented-out debug printf() / av_log() messages with av_dlog(). vorbisdec: Replace some sizeof(type) by sizeof(*variable). NO vf_fieldorder: Replace FFmpeg by Libav in license boilerplate. Conflicts: libavcodec/h264.c libavcodec/vorbisdec.c libavutil/log.c Merged-by: Michael Niedermayer commit 7089265756a84bf884a7c2290c6cda38d4dfd60f Author: Michael Niedermayer Date: Thu Apr 28 21:10:04 2011 +0200 AMV: disable DR1 and don't override EMU_EDGE This works around a possibly exploitable crash. Appearently, vlc can be exploited with a malicous file. This should get reverted as soon as a proper fix is found. Reported-at: Thu, 21 Apr 2011 14:38:25 +0000 Reported-by: Dominic Chell Signed-off-by: Michael Niedermayer (cherry picked from commit 89f903b3d5ec38c9c5d90fba7e626fa0eda61a32) (cherry picked from commit 9b919571e506fbb72b81a35ca1e7c1bd6efc4209) commit 7c152a458d3fb0a2fb1aef1f05bfee90fe70697e Author: Anssi Hannula Date: Thu Apr 28 20:47:40 2011 +0200 lavf: inspect more frames for fps when container time base is coarse As per issue2629, most 23.976fps matroska H.264 files are incorrectly detected as 24fps, as the matroska timestamps usually have only millisecond precision. Fix that by doubling the amount of timestamps inspected for frame rate for streams that have coarse time base. This also fixes 29.970 detection in matroska. Signed-off-by: Michael Niedermayer (cherry picked from commit 78431098f9e306ebe27e7698d0ae539e3df2afe9) Tested with mplayer based on this report http://thread.gmane.org/gmane.comp.video.mplayer.user/66043/focus=66063 Signed-off-by: Reinhard Tartler commit 0247bdee2581a6857a24c5ff297f01d3a3112b11 Author: Reinhard Tartler Date: Wed Apr 27 21:21:54 2011 +0200 Fix races in default av_log handler Prevent competing threads from overwriting (shared) buffers. Original patch by: Michael Niedermayer commit 500bf397153a7597ebd7bf2b410d71c6e8706198 Author: Michael Niedermayer Date: Fri Apr 29 21:53:25 2011 +0200 flashsv2enc: regression test. Signed-off-by: Michael Niedermayer commit cf3ac54339c42530342ec053b981d7b717404889 Author: Diego Biurrun Date: Fri Apr 29 20:12:48 2011 +0200 vorbis: Replace sized int_fast integer types with plain int/unsigned. int/unsigned is the natural memory access type for CPUs, using sized types for temporary variables, counters and similar just increases code size and can possibly cause a slowdown. commit a734fa575f94c7c28103420f756b5f64dd0c806b Author: Diego Biurrun Date: Fri Apr 29 19:46:10 2011 +0200 Remove disabled non-optimized code variants. commit e610098e7b3e4851e18c4f472adec4980f901ad2 Author: Diego Biurrun Date: Fri Apr 29 19:36:48 2011 +0200 bswap.h: Remove disabled code. commit 2e15305b7088c9dfe1c8d29c248a9b49bcf0b0a3 Author: Diego Biurrun Date: Fri Apr 29 19:05:40 2011 +0200 Remove some disabled printf debug cruft. commit 09cbf60f8eec65cc53c5931234476a9956cc27fd Author: Diego Biurrun Date: Fri Apr 29 19:18:46 2011 +0200 Replace more disabled printf() calls by av_dlog(). commit 4517ba092e0606e9473c8e148c9895b01f975e18 Author: Michael Niedermayer Date: Fri Apr 29 18:31:17 2011 +0200 flashsv2enc:fix segfault Signed-off-by: Michael Niedermayer commit 03acaa4a43432d76d048986076f3aa725b64ab3d Author: Diego Biurrun Date: Tue Apr 26 14:26:23 2011 +0200 tests: Remove disabled code. commit 35ceaa737643008e89a9ba54aaa9ebc0b57683b4 Author: Anton Khirnov Date: Fri Apr 29 17:33:38 2011 +0200 Move ff_dynarray_add to lavu and make it public. commit 045dd4b9287551443e655b313417fd776f52aab0 Author: Diego Biurrun Date: Fri Apr 29 17:27:01 2011 +0200 Replace some commented-out debug printf() / av_log() messages with av_dlog(). commit d1be646e906487b395190af1d6dd8d33c22bf25f Author: Diego Biurrun Date: Thu Apr 28 11:09:35 2011 +0200 vorbisdec: Replace some sizeof(type) by sizeof(*variable). commit a3b7dabb5bd3d7d9469f04e3fba7a49489a75372 Author: Diego Biurrun Date: Thu Apr 28 18:59:14 2011 +0200 vf_fieldorder: Replace FFmpeg by Libav in license boilerplate. commit 9ac1bf88c00dbe7eb2191e2d5325fb104b9d8341 Author: Anton Khirnov Date: Fri Apr 29 11:42:05 2011 +0200 lavf: remove duplicate assignment in avformat_alloc_context. AVClass is already initialized in avformat_get_context_defaults. commit 4a7a1b7def03051e16a3ffbbe51d41f227aea0fd Author: Anton Khirnov Date: Fri Apr 29 11:30:02 2011 +0200 lavf: use designated initializers for AVClasses. commit d804784db5a2bd47e614770a7bd86403bf84bdf6 Author: Carl Eugen Hoyos Date: Fri Apr 29 10:46:45 2011 +0200 Set channel layout for True Audio files. This is not documented (and possibly not originally intended), but it's what the current reference decoder does. commit d2ee3c913d6fec3cb8c0c1b67347007c7cd604e1 Author: Carl Eugen Hoyos Date: Fri Apr 29 10:42:43 2011 +0200 Fix channel layout for some stereo flac files. commit 5a43bd5e2609705ee8b834c789fe93399588ca85 Author: Anton Khirnov Date: Thu Apr 14 09:10:54 2011 +0200 options: simplify av_find_opt by using av_next_option. commit 749d16ced4596d6b83c3a2b2cf3a44c714516379 Author: Michael Niedermayer Date: Fri Apr 29 05:00:45 2011 +0200 Checksum update due to (should make fate green again) ffmpeg | branch: master | Anton Khirnov | Tue Apr 26 09:59:07 2011 +0000| [f8fec0505294a4c05e5cfd9323e04258db465314] | committer: Anton Khirnov mpegtsenc: make PMT PID really start on pmt_start_pid Signed-off-by: Michael Niedermayer commit a3ffe0eb761d7a98b8c1e0e4b962da4012a46729 Author: Michael Niedermayer Date: Fri Apr 29 04:31:28 2011 +0200 Revert "Fix url_fopen() flag values." No longer needed after martins change to the values. Though this would have been nicer ABI wise but iam too lazy to maintain this difference This reverts commit 183401b92419febf2c6aeaa2dfecdd16ad99bff8. commit 455ce979d0793096662d139e996107a527617832 Merge: f0f3425 5b81e29 Author: Michael Niedermayer Date: Fri Apr 29 04:29:21 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: LOTS of duplicates ... avio: Fix the deprecated fallback URL-prefixed open flags avoid duplicate -lm in .pc files mpeg12: terminate mpeg2_video_profiles arrays network: Check POLLERR and POLLHUP in ff_network_wait_fd mpegtsenc: make PMT PID really start on pmt_start_pid nut format: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE rawvideo codec: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE hflip: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats crop: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation Conflicts: configure libswscale/swscale.h tests/ref/lavf/ts Merged-by: Michael Niedermayer commit f0f3425311ea88cf4ff24fffea0b679f54508c1c Author: Michael Niedermayer Date: Fri Apr 29 03:06:06 2011 +0200 flashsv2enc: mark encoder experimental Signed-off-by: Michael Niedermayer commit c83a528193da3bd863d0b62eaf18510f873200ca Author: Michael Niedermayer Date: Fri Apr 29 02:43:12 2011 +0200 flashsv2enc: remove useless casts Signed-off-by: Michael Niedermayer commit ba9c4db59a82e7aa70a61782c3e3e85eaae7dd72 Author: Michael Niedermayer Date: Fri Apr 29 02:41:13 2011 +0200 flashsv2enc: use av_freep() Signed-off-by: Michael Niedermayer commit f6a5edb64c004b45ae063e85652e3213731b42b6 Author: Michael Niedermayer Date: Fri Apr 29 02:40:22 2011 +0200 flashsv2enc: remove useless if() Signed-off-by: Michael Niedermayer commit 3f6dc4a13098f0776e9adcbf32029f9e9c4a4d4e Author: Joshua Warner Date: Fri Apr 29 02:25:56 2011 +0200 encoder for adobe's flash ScreenVideo2 codec commit 85ff33948963257d418abe7d8975b4c9c4641223 Author: Michael Niedermayer Date: Fri Apr 29 02:14:43 2011 +0200 Revert "avparser: don't av_malloc(0)." This hack is no longer needed. This reverts commit 191e08d113ef1d089c45c5fb6c95491e16dde86e. commit 5a36783bc4a1887a67dbfe5ec7198903f35a46b1 Author: Michael Niedermayer Date: Fri Apr 29 02:13:59 2011 +0200 Fix all malloc(0) issues Signed-off-by: Michael Niedermayer commit 0fea3b7b807b58b72522044770b9307ba141f172 Author: ami_stuff Date: Fri Apr 29 00:58:57 2011 +0200 Remove lowres support from cdgraphics decoder The lowres support doesn't work correctly (crops the video), so let's remove it. Signed-off-by: Michael Niedermayer commit f27c72b3682da19d7507561a1cad90f2068e354a Author: ami_stuff Date: Fri Apr 29 00:47:36 2011 +0200 Reduce max lowres from 5 to 3 in sp5x decoder lowres higher than 3 crashes ffmpeg/ffplay here Signed-off-by: Michael Niedermayer commit e4f42f1f89a1a4abb9132fcb1524ffd852101c07 Author: ami_stuff Date: Fri Apr 29 00:41:28 2011 +0200 Remove lowres support from pnm decoder The lowres support doesn't work correctly (crops the video), so let's remove it. Signed-off-by: Michael Niedermayer commit 658296e3447264138e7b67664ada4b3de37d4843 Author: ami_stuff Date: Thu Apr 28 23:45:24 2011 +0200 Remove lowres support from png decoder The lowres support doesn't work correctly (crops the video), so let's remove it. Signed-off-by: Michael Niedermayer commit 5b81e295931bad4dac0af29333b4e2a203b3f4d4 Author: Martin Storsjö Date: Thu Apr 28 10:36:44 2011 +0300 avio: Fix the deprecated fallback URL-prefixed open flags While deprecated, they're totally useless as long as their values are different from the AVIO_FLAG values that are used internally. Currently, this leads to old libav applications still compiling correctly (since we haven't removed the fallback wrappers), but failing since the functions internally compare to the new AVIO_FLAG values. These should be removed at some point, but they aren't removed yet. The intent is to be able to recompile an old application against the new ABI without modifying the code, and this doesn't work currently. Signed-off-by: Martin Storsjö commit 94da542546ca42b5b0de5d56e563ae145aa77eaf Author: Michael Niedermayer Date: Thu Apr 28 22:25:39 2011 +0200 Try to fix big endian fate Signed-off-by: Michael Niedermayer commit f3ce748d3453a490f32a5518f9cf6bef6892a30c Author: Niobos Date: Thu Apr 28 20:23:19 2011 +0200 MJPEG encoder to write aspect ratio information commit a0db7424e48bf33ef3194e0faf3b9805b658b020 Author: Michael Niedermayer Date: Thu Apr 28 14:06:36 2011 +0200 Fix buffering in qpeg in a way that allows direct rendering. Signed-off-by: Michael Niedermayer commit 183401b92419febf2c6aeaa2dfecdd16ad99bff8 Author: Michael Niedermayer Date: Thu Apr 28 13:11:37 2011 +0200 Fix url_fopen() flag values. Reported by: Luca Abeni Signed-off-by: Michael Niedermayer commit 90bcbc791f431dc7545e837e1a9aeca0a3e760a6 Author: Michael Niedermayer Date: Thu Apr 28 04:31:02 2011 +0200 Revert "qpeg: use reget_buffer() in decode_frame()" This reverts commit f4e043ff63935a71b98a36bc98b501c36ceadb92. commit b35a846923e554e49c593e26f746016558107a59 Author: Carl Eugen Hoyos Date: Thu Apr 28 11:20:08 2011 +0200 Change silly variable name "class" to "partition_class". commit 05a18adfb1e7e94d546112ff8e6f0828c89382a4 Author: Reinhard Tartler Date: Tue Apr 26 18:34:31 2011 +0200 avoid duplicate -lm in .pc files commit 62d33dbc170f41189c1ec775bc24e561b2e0aff5 Author: Stefano Sabatini Date: Thu Apr 28 01:42:56 2011 +0200 mpeg12: terminate mpeg2_video_profiles arrays Make av_get_profile_name() return NULL if no profile is detected. Fix trac issue #130, fix crash reading file tek3.m2v. (cherry picked from commit e5d80c7b2d893422e2e60a97e08bfc48ca1684e6) Signed-off-by: Ronald S. Bultje commit 2d8d6882a7316a49818778a953648b3770e8f604 Author: Carl Eugen Hoyos Date: Thu Apr 28 10:47:40 2011 +0200 Read channel layout atom in mov files. commit dcf008af34bba5152aa0f0e515a558f9da76484b Author: Carl Eugen Hoyos Date: Thu Apr 28 10:47:00 2011 +0200 Clarify warning messages. commit 91b782720fd0df5571775b6591bc41797d6ecf78 Author: Carl Eugen Hoyos Date: Thu Apr 28 10:45:32 2011 +0200 Move channel chunk reading function to isom.c. Move ff_read_chan_chunk() to isom.c and rename it as ff_mov_read_chan(). commit f2c85458c411447f006f9c928cb198ec0260255a Author: Gil Pedersen Date: Thu Apr 28 10:27:40 2011 +0300 network: Check POLLERR and POLLHUP in ff_network_wait_fd Previously, the function would lead to an infinite wait (by returning AVERROR(EAGAIN)) on sockets indicating an error via either of these poll flags. Signed-off-by: Martin Storsjö commit f8fec0505294a4c05e5cfd9323e04258db465314 Author: Anton Khirnov Date: Tue Apr 26 09:59:07 2011 +0000 mpegtsenc: make PMT PID really start on pmt_start_pid commit f9fb574deee2db5db89e7ca7f8f12680fb2e6d7f Author: Peter Ross Date: Sun Mar 20 00:25:18 2011 +1100 nut format: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE Signed-off-by: Anton Khirnov commit 87e45ae13d1762d4ac0ff535894cec785caf99a2 Author: Peter Ross Date: Sun Mar 20 00:24:24 2011 +1100 rawvideo codec: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE Signed-off-by: Anton Khirnov commit c90626b2ea5434b6e6e77b654512f0e59e0ff29d Author: Peter Ross Date: Sat Mar 19 22:11:03 2011 +1100 hflip: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats Signed-off-by: Anton Khirnov commit a1f4d07563c0489ee489343a4b6bfb0a7ef24300 Author: Peter Ross Date: Sat Mar 19 22:05:53 2011 +1100 crop: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats Signed-off-by: Anton Khirnov commit 1afbae100becbfff0dcad43610326a1dadcc315d Author: Peter Ross Date: Thu Mar 17 21:07:18 2011 +1100 libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation Signed-off-by: Anton Khirnov commit 0665199e438fcdd2000717352fc665a8cf017f7c Merge: e5d80c7 b239526 Author: Michael Niedermayer Date: Thu Apr 28 04:23:36 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: vorbisdec: Rename silly "class_" variable to plain "class". simple_idct_alpha: Drop some useless casts. Simplify av_log_missing_feature(). ac3enc: remove check for mismatching channels and channel_layout If AVCodecContext.channels is 0 and AVCodecContext.channel_layout is non-zero, set channels based on channel_layout. If AVCodecContext.channel_layout and AVCodecContext.channels are both non-zero, check to make sure they do not contradict eachother. cosmetics: indentation Check AVCodec.supported_samplerates and AVCodec.channel_layouts in avcodec_open(). aacdec: remove sf_scale and sf_offset. aacdec: use a scale of 2 in the LTP MDCT rather than doubling the coefficient table values from the spec. Define POW_SF2_ZERO in aac.h and use for ff_aac_pow2sf_tabp[] offsets instead of hardcoding 200 everywhere. Large intensity stereo and PNS indices are legal. Clip them instead of erroring out. A magnitude of 100 corresponds to 2^25 so the will most likely result in clipped output anyway. qpeg: use reget_buffer() in decode_frame() ultimotion: use reget_buffer() in ulti_decode_frame() smacker: remove unnecessary call to avctx->release_buffer in decode_frame() avparser: don't av_malloc(0). Merged-by: Michael Niedermayer commit e5d80c7b2d893422e2e60a97e08bfc48ca1684e6 Author: Stefano Sabatini Date: Thu Apr 28 01:42:56 2011 +0200 mpeg12: terminate mpeg2_video_profiles arrays Make av_get_profile_name() return NULL if no profile is detected. Fix trac issue #130, fix crash reading file tek3.m2v. commit 058aabd4757ff800422412c908a408da4b4cf514 Author: Carl Eugen Hoyos Date: Thu Apr 28 00:10:55 2011 +0200 Fix caf channel layouts ITU_2_2 and DVD_6. commit 5a810f4e27ea770a0d3a079b5871b668d3a56902 Author: Carl Eugen Hoyos Date: Thu Apr 28 00:09:46 2011 +0200 Return if memory allocation fails. commit 045cc36fe788752bca340efb736e7d76aa7f54e9 Author: Baptiste Coudurier Date: Wed Apr 27 14:24:19 2011 -0700 100l, change #ifdef to #if commit 46394d39e3551443f560f4050c74e380edcf20f9 Author: Baptiste Coudurier Date: Wed Apr 27 13:57:39 2011 -0700 In png decoder, only call png_init_mmx if HAVE_MMX is defined. commit 624a7e005cc65b1e86531aa1ecfa7bea14e8bc7d Author: Baptiste Coudurier Date: Wed Apr 27 21:52:09 2011 +0200 Correctly support pal8 with alpha in libswscale, fix png pal8 with alpha. Signed-off-by: Michael Niedermayer commit dbfdb288c1921eeb9fef5bca20eee33da7fcdd71 Author: Baptiste Coudurier Date: Wed Apr 27 21:49:45 2011 +0200 Set alpha of palettes to 0xff. Signed-off-by: Michael Niedermayer commit e91946ed23dfbb9a6341266020ed8475ec15697d Author: Baptiste Coudurier Date: Wed Apr 27 21:36:30 2011 +0200 Rename y400a to gray8a. Signed-off-by: Michael Niedermayer commit 52a81cd0e413eb54f8d96a79d84f588fe01cc0cc Author: Michael Niedermayer Date: Wed Apr 27 19:54:32 2011 +0200 Fix add_paeth_prediction_mmx for rgb48 Signed-off-by: Michael Niedermayer commit afd2371d5c53e197128719196e7586d653ce931b Author: Michael Niedermayer Date: Wed Apr 27 19:01:33 2011 +0200 merge read and and in add_paeth_prediction Signed-off-by: Michael Niedermayer commit 6d4c49a2afdb823418297bb9157890b80d45c0fe Author: Baptiste Coudurier Date: Wed Apr 27 18:34:10 2011 +0200 Move png mmx functions into x86/png_mmx.c, remove them from DSPContext. Signed-off-by: Michael Niedermayer commit b239526873dc81f9b66796ad4d9fe1cb93ec34d3 Author: Diego Biurrun Date: Wed Apr 27 16:38:35 2011 +0200 vorbisdec: Rename silly "class_" variable to plain "class". commit 81afa5a2740b94ed1db8ad980e37deecb5f8e573 Author: Diego Biurrun Date: Wed Apr 27 15:36:21 2011 +0200 simple_idct_alpha: Drop some useless casts. commit 3fd3632ffeb18aeca6c0ab3fbe1034c3da75d983 Author: Diego Biurrun Date: Wed Apr 27 15:11:41 2011 +0200 Simplify av_log_missing_feature(). Do not print the results of the conditional call to av_log_ask_for_sample() into the same line as the main output, separate the already long text. commit d6f910ea47255b519e0b71c33d74c409a29ab3db Author: Alexandre Colucci Date: Wed Apr 27 18:39:57 2011 +0200 Fix decoding of DXSA subtitles. These have a DXSA tag and contain alpha in addition to color values for palette. commit 8745e9c45865a4409272d78db1e1af86a8b955e9 Author: Justin Ruggles Date: Tue Apr 19 19:06:52 2011 -0400 ac3enc: remove check for mismatching channels and channel_layout commit 688b09fa597804ab4708271ce467a6ae025f0c17 Author: Justin Ruggles Date: Tue Apr 19 19:03:47 2011 -0400 If AVCodecContext.channels is 0 and AVCodecContext.channel_layout is non-zero, set channels based on channel_layout. This allows the user to set only channel_layout and not channels. commit 168f9e8c40cf383802c8c8059f283a6ea789ec1e Author: Justin Ruggles Date: Tue Apr 19 19:02:32 2011 -0400 If AVCodecContext.channel_layout and AVCodecContext.channels are both non-zero, check to make sure they do not contradict eachother. commit 3dfc3e70c0852c62a45923b8abb57137e4bf6240 Author: Justin Ruggles Date: Wed Apr 20 16:59:39 2011 -0400 cosmetics: indentation commit 8b00ab0113a8ca40429e0a06331be83996963a9e Author: Justin Ruggles Date: Tue Apr 19 18:50:20 2011 -0400 Check AVCodec.supported_samplerates and AVCodec.channel_layouts in avcodec_open(). If the encoder has a channel_layouts list and AVCodecContext.channel_layout is 0, then only print a warning and let the encoder decide how to handle it. commit 767848d7619ce43e00d1a13607a5cf2aa61d2d6e Author: Alex Converse Date: Tue Apr 26 17:05:07 2011 -0400 aacdec: remove sf_scale and sf_offset. Instead, scalefactors are adjusted by the offset amount, removing the need for sf_scale, and the MDCT scales are adjusted to compensate for the higher scalefactors. Floating-point output will be handled by modifying the MDCT scales. commit 6271794041abbf79098b6c01b27f1539b3a4af5e Author: Justin Ruggles Date: Tue Apr 26 15:30:19 2011 -0400 aacdec: use a scale of 2 in the LTP MDCT rather than doubling the coefficient table values from the spec. commit d70fa4c4238ffa69592fffa7c817532534f303c4 Author: Alex Converse Date: Tue Apr 26 14:45:48 2011 -0400 Define POW_SF2_ZERO in aac.h and use for ff_aac_pow2sf_tabp[] offsets instead of hardcoding 200 everywhere. commit e4744b59aadd6e7064491c0228d6248289a6a85a Author: Alex Converse Date: Tue Apr 26 14:29:03 2011 -0400 Large intensity stereo and PNS indices are legal. Clip them instead of erroring out. A magnitude of 100 corresponds to 2^25 so the will most likely result in clipped output anyway. None of the conformance streams fall in the range that need to be clipped. commit f08d171caa6a8eab00c1b0ac87bb3a79d98727e5 Author: Michael Niedermayer Date: Wed Apr 27 17:12:14 2011 +0200 WMADEC: fix ticket125 Signed-off-by: Michael Niedermayer commit f4e043ff63935a71b98a36bc98b501c36ceadb92 Author: Stefano Sabatini Date: Tue Apr 26 11:51:50 2011 +0200 qpeg: use reget_buffer() in decode_frame() Decoder relies on previous frame data, so use reget_buffer(). This also set frame->reference to 3, as the frame will be requested unmodified later so it shouldn't be modified by the application. Fix playback of file Clock.avi. Signed-off-by: Ronald S. Bultje commit 4f0b80599a534dcca57be3184b89b98f82bf2a2c Author: Stefano Sabatini Date: Tue Apr 26 11:45:40 2011 +0200 ultimotion: use reget_buffer() in ulti_decode_frame() Decoder relies on previous frame data, so use reget_buffer(). Signed-off-by: Ronald S. Bultje commit 4f2954e2327c211f3fbe20b84f4881e1f8df1528 Author: Stefano Sabatini Date: Tue Apr 26 11:37:36 2011 +0200 smacker: remove unnecessary call to avctx->release_buffer in decode_frame() The release_buffer was cleaning the provided frame, thus causing the successive call to avctx->reget_buffer() to allocate a new frame. In case the returned frame was not the same one previously returned but a new one with different data, it resulted in artifacts. Signed-off-by: Ronald S. Bultje commit 0886267e3cc4ce12bcd48b712d8affa8c953bc38 Author: Michael Niedermayer Date: Wed Apr 27 14:03:37 2011 +0200 Revert buggy hunk that leaked in from a libav merge. This unbreaks compilation with --disable-avfilter. Signed-off-by: Michael Niedermayer commit fd37eac4958a2544599d1b0fce1b153ebd7cd7da Author: Stefano Sabatini Date: Tue Apr 26 13:50:08 2011 +0200 indeo2: remove unnecessary release_buffer() call This was preventing reget_buffer() to return a buffer with the same data, which was resulting in playback artifacts. Fix trac issue #116. commit 10aa5a6c429827b8f2cd5a04680a8d24d5ad8b53 Author: Stefano Sabatini Date: Tue Apr 26 11:59:22 2011 +0200 4xm: use reget_buffer() in decode_frame() Also remove unnecessary call to avctx->release_buffer(). reget_buffer is required since apparently the codec needs to be feeded with the previous frame data. Releasing the frame and using get_buffer was working only in the case get_buffer() was returning the old frame data, and resulting in playback artifacts otherwise. Fix trac issue #85. commit c2606259de70e1c762c1f82dcda4b3f2ddf2dd96 Author: Stefano Sabatini Date: Fri Apr 22 11:54:31 2011 +0200 ffplay: move output_picture() code to queue_picture() Move output_picture() code to queue_picture(), and remove it. Simplify code path. commit 4a22ea4da1a81c2b4bc289fb8580ec763f85c62b Author: Stefano Sabatini Date: Fri Apr 22 11:25:54 2011 +0200 ffplay: rename video_refresh_timer() to video_refresh() The new name is shorter and less confusing. commit 8adf9bb2cb5fb9179cac5c33fd2adf847a8b4c71 Author: Stefano Sabatini Date: Fri Apr 22 02:12:53 2011 +0200 ffplay: rename decode_thread to read_thread, parse_tid to read_tid The new names are less misleading and more reciprocally consistent. commit 31d8467d82d41d9a6720d4b4bd7bf60eab547d5e Author: Stefano Sabatini Date: Sat Apr 23 20:55:34 2011 +0200 lavfi: add showinfo filter commit f7bdffb09da597c5d6afff5359523370470ad072 Author: Stefano Sabatini Date: Sat Apr 23 19:55:59 2011 +0200 lavfi: print key-frame and picture type information in ff_dlog_ref() Signed-off-by: Stefano Sabatini commit 5eef4afb9a5c637229469036285fa9a334f6f7d4 Author: Ronald S. Bultje Date: Tue Apr 26 18:46:08 2011 -0700 avparser: don't av_malloc(0). Signed-off-by: Ronald S. Bultje commit 191e08d113ef1d089c45c5fb6c95491e16dde86e Author: Ronald S. Bultje Date: Tue Apr 26 18:46:08 2011 -0700 avparser: don't av_malloc(0). Signed-off-by: Michael Niedermayer commit 7b9e98173ca7afea8dd76191f63ab6995ba01777 Author: Michael Niedermayer Date: Wed Apr 27 04:09:35 2011 +0200 Revert "Eliminate pointless '#if 1' statements without matching '#else'." no comment This reverts commit e6ff064845d02c43526c8a56dab121c219f16659. Conflicts: libavcodec/dsputil.c Signed-off-by: Michael Niedermayer commit d7e5aebae7652ac766034f1d90e5a4f62677fb3c Merge: 93c28a5 79ee897 Author: Michael Niedermayer Date: Wed Apr 27 03:51:04 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: (23 commits) ac3enc: correct the flipped sign in the ac3_fixed encoder Eliminate pointless '#if 1' statements without matching '#else'. Add AVX FFT implementation. Increase alignment of av_malloc() as needed by AVX ASM. Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX. mjpeg: Detect overreads in mjpeg_decode_scan() and error out. documentation: extend documentation for ffmpeg -aspect option APIChanges: update commit hashes for recent additions. lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums aac: add headers needed for log2f() lavc: remove FF_API_MB_Q cruft lavc: remove FF_API_RATE_EMU cruft lavc: remove FF_API_HURRY_UP cruft pad: make the filter parametric vsrc_movie: add key_frame and pict_type. vsrc_movie: fix leak in request_frame() lavfi: add key_frame and pict_type to AVFilterBufferRefVideo. vsrc_buffer: add sample_aspect_ratio fields to arguments. lavfi: add fieldorder filter scale: make the filter parametric ... Conflicts: Changelog doc/filters.texi ffmpeg.c libavcodec/ac3dec.h libavcodec/dsputil.c libavfilter/avfilter.h libavfilter/vf_scale.c libavfilter/vf_yadif.c libavfilter/vsrc_buffer.c Merged-by: Michael Niedermayer commit 93c28a55fd84280d97c3c0dd7b0d546043242c34 Author: tateu Date: Wed Apr 27 01:50:50 2011 +0200 Fix runtime CPU detection in libswscale. commit 73a502dd436425875fae1305d47cf0c1fbf24d68 Merge: ea189b7 075933a Author: Michael Niedermayer Date: Wed Apr 27 00:11:58 2011 +0200 Merge branch 'master' into oldabi * master: (37 commits) vsrc_buffer: 10l mixed up input & output sizes. (funnily this worked 99% of the time) Signed-off-by: Michael Niedermayer Add MxPEG decoder Add support for picture_ptr field in MJpegDecodeContext Move MJPEG's input buffer preprocessing in separate public function Support reference picture defined by bitmask in MJPEG's SOS decoder DCA/DTA encoder vsrc_buffer: Reinit scale filter when an existing filter is used. Signed-off-by: Michael Niedermayer vsrc_buffer: set output timebase when output equalization is done Signed-off-by: Michael Niedermayer vsrc_buffer: Set output size Signed-off-by: Michael Niedermayer vsrc_buffer: fix NULL dereference Signed-off-by: Michael Niedermayer bfi: store palette data in the context Fix issue1503, this fix may be incomplete we need more samples to know for sure. Signed-off-by: Michael Niedermayer wmadec: prevent null pointer call. Signed-off-by: Michael Niedermayer fraps: do not set avctx->pix_fmt to none in decode_init() graphparser: add a NULL check on the argument passed to strstr setdar: prefer "sar" over "par" in log info message fade: fix draw_slice() check on fade->factor value fade: make draw_slice() chroma check against planes 1 and 2 lsws: prevent overflow in sws_init_context() ffplay: fix logic for selecting the show mode in case of missing video ... Conflicts: libavformat/avidec.c Merged-by: Michael Niedermayer commit ea189b77eb89134a9d3928631c579ca0a28e1a3a Author: multiple authors Date: Wed Apr 27 00:00:50 2011 +0200 Revert removial of 3 files, this sliped through the last merge into oldabi because the files where locally available during testing just not in git. Signed-off-by: Michael Niedermayer commit 075933a0687974fca74d6d4ac388d24766d8dc78 Author: Michael Niedermayer Date: Tue Apr 26 23:52:22 2011 +0200 vsrc_buffer: 10l mixed up input & output sizes. (funnily this worked 99% of the time) Signed-off-by: Michael Niedermayer commit 79ee8977c25eee2408ef7b2822f377a983e4d65b Author: Justin Ruggles Date: Tue Apr 5 12:55:42 2011 -0400 ac3enc: correct the flipped sign in the ac3_fixed encoder commit 75cf2602c74c3e9794620048ad841a5b18219db5 Author: anatoly Date: Mon Mar 28 20:02:19 2011 +0400 Add MxPEG decoder Signed-off-by: Anton Khirnov Signed-off-by: Michael Niedermayer commit dd1e5bfd5e402d3c455c3a349d6554bf07c88f92 Author: anatoly Date: Sun Mar 27 22:16:25 2011 +0200 Add support for picture_ptr field in MJpegDecodeContext Signed-off-by: Anton Khirnov Signed-off-by: Michael Niedermayer commit 7e6a9e64447a300cdd067c5e1bd7e72806530134 Author: anatoly Date: Sun Mar 27 22:16:24 2011 +0200 Move MJPEG's input buffer preprocessing in separate public function Signed-off-by: Anton Khirnov Signed-off-by: Michael Niedermayer commit 34686566f34441f8718bf0dab38de7c959cdca1d Author: anatoly Date: Sun Mar 27 22:16:23 2011 +0200 Support reference picture defined by bitmask in MJPEG's SOS decoder With cleanup & simplification by me Signed-off-by: Anton Khirnov Signed-off-by: Michael Niedermayer commit d439ba15fd400201834bfdd84becbff239242622 Author: Alexander E. Patrakov Date: Tue Apr 26 21:07:55 2011 +0200 DCA/DTA encoder commit e6ff064845d02c43526c8a56dab121c219f16659 Author: Diego Biurrun Date: Tue Apr 26 13:52:12 2011 +0200 Eliminate pointless '#if 1' statements without matching '#else'. commit 9d35fa520e3b27f7dd9fe12c433eb596f1271515 Author: Vitor Sessak Date: Mon Apr 25 11:39:01 2011 +0200 Add AVX FFT implementation. Signed-off-by: Reinhard Tartler commit 13dfce3d44f99a2d7df71aba8ae003d58db726f7 Author: Vitor Sessak Date: Sat Apr 23 19:24:31 2011 +0200 Increase alignment of av_malloc() as needed by AVX ASM. Signed-off-by: Reinhard Tartler commit 33cbfa6fa37d9aea235ce7d3c389d8eec279205f Author: Vitor Sessak Date: Sat Apr 23 19:24:06 2011 +0200 Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX. Signed-off-by: Reinhard Tartler commit d84f191d37b8123203dff250531a4b4c0d5f587a Author: Michael Niedermayer Date: Tue Apr 26 18:18:02 2011 +0200 vsrc_buffer: Reinit scale filter when an existing filter is used. Signed-off-by: Michael Niedermayer commit dc1de56948960bea12a8b6c1aa77398308bec358 Author: Michael Niedermayer Date: Tue Apr 26 18:17:20 2011 +0200 vsrc_buffer: set output timebase when output equalization is done Signed-off-by: Michael Niedermayer commit a38cdfde5285700fc8a4db3592f9cca287079265 Author: Michael Niedermayer Date: Tue Apr 26 18:16:48 2011 +0200 vsrc_buffer: Set output size Signed-off-by: Michael Niedermayer commit ad0193bf9cb258695a7f929954edd6e2e51de4d9 Author: Michael Niedermayer Date: Tue Apr 26 18:15:52 2011 +0200 vsrc_buffer: fix NULL dereference Signed-off-by: Michael Niedermayer commit ff558d7b0166dab5a84dc1c565c2beafa8590c86 Author: Stefano Sabatini Date: Mon Apr 25 20:26:15 2011 +0200 bfi: store palette data in the context Store palette data in the codec context, do not assume that the frame allocated the first time by avctx->get_buffer will be returned again. This requires to store the palette which comes with the first frame in the context, and copy it to the following frames. Fix trac issue #84. Signed-off-by: Stefano Sabatini commit 76cd98b445c5a1608e9a5974bef0b0be6b35f1ce Author: Michael Niedermayer Date: Thu Apr 21 22:03:24 2011 +0200 mjpeg: Detect overreads in mjpeg_decode_scan() and error out. Signed-off-by: Michael Niedermayer Signed-off-by: Ronald S. Bultje commit 4bc282322ba1c03ed98737740f6b5e17b604ffa1 Author: Stefano Sabatini Date: Sat Apr 9 13:49:49 2011 +0200 documentation: extend documentation for ffmpeg -aspect option Signed-off-by: Anton Khirnov commit 893722ceeb709fcb301a87f07b952d30633bcb06 Author: Anton Khirnov Date: Tue Apr 26 08:51:54 2011 +0200 APIChanges: update commit hashes for recent additions. commit bebe72f4a05d338e04ae9ca1e9c6b72749b488aa Author: Stefano Sabatini Date: Sat Apr 23 13:38:50 2011 +0200 lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums Also deprecate av_get_pict_type_char() in favor of av_get_picture_type_char(). The new enum and av_get_picture_type_char() are defined in libavutil. This allows the use in libavfilter without the need to link against libavcodec. Signed-off-by: Stefano Sabatini Signed-off-by: Anton Khirnov commit 30fe9719344f01a147628e07a8e79a9ccc7e0835 Author: Michael Niedermayer Date: Sat Apr 23 10:44:21 2011 +0200 aac: add headers needed for log2f() Signed-off-by: Anton Khirnov commit 6deae83e555982d86ef8cc68b804495092216fc4 Author: Anton Khirnov Date: Tue Apr 12 20:54:16 2011 +0200 lavc: remove FF_API_MB_Q cruft commit 694c142434f1b775c93cb2586eebf7ddd5ef6aa8 Author: Anton Khirnov Date: Tue Apr 12 20:53:21 2011 +0200 lavc: remove FF_API_RATE_EMU cruft commit e7021c0ed5d1265d5b4f0f01a01f840196a70415 Author: Anton Khirnov Date: Tue Apr 12 20:51:40 2011 +0200 lavc: remove FF_API_HURRY_UP cruft commit 73a4f7c21bbb179f7542d8a5fedf55fd894fa9da Author: Stefano Sabatini Date: Sun Apr 17 17:19:05 2011 +0200 pad: make the filter parametric Signed-off-by: Stefano Sabatini Signed-off-by: Anton Khirnov commit 0bbb28c75bcce950221aa4d9c30b972aab9201f3 Author: royger Date: Mon Apr 18 17:50:16 2011 +0200 vsrc_movie: add key_frame and pict_type. Signed-off-by: Roger Pau Monné Signed-off-by: Michael Niedermayer Signed-off-by: Anton Khirnov commit 5eb901cfec4a1bca4d961c6eb6889a91a87031ca Author: Stefano Sabatini Date: Mon Apr 18 19:21:25 2011 +0200 vsrc_movie: fix leak in request_frame() Also set movie->picref to NULL, in order to avoid a crash in uninit() when movie->picref is unreffed again and it was already freed. Signed-off-by: Stefano Sabatini Signed-off-by: Anton Khirnov commit 10d39405fa82473367e1ba1ed3c4ecbeca2a7986 Author: Roger Pau Monné Date: Sat Apr 16 10:09:15 2011 +0200 lavfi: add key_frame and pict_type to AVFilterBufferRefVideo. Signed-off-by: Anton Khirnov commit 7a11c82fb760619d0e17ca234381b50d6c675cc0 Author: Michael Niedermayer Date: Mon Jan 31 20:48:35 2011 +0100 vsrc_buffer: add sample_aspect_ratio fields to arguments. This fixes aspect handling in ffmpeg. This is based on a patch by Baptiste. Signed-off-by: Anton Khirnov commit 2f84bb4236accadffdfad30a5ec0d80e72449f15 Author: Mark Himsley Date: Sun Apr 10 19:18:03 2011 +0200 lavfi: add fieldorder filter Signed-off-by: Stefano Sabatini Signed-off-by: Anton Khirnov commit 68e23c083a5d907748481e962ee38abbcb167174 Author: Stefano Sabatini Date: Sun Mar 27 22:58:08 2011 +0200 scale: make the filter parametric Make the filter accept parametric expressions for the output video size. Signed-off-by: Stefano Sabatini Signed-off-by: Anton Khirnov commit b137bf7df35b3cc792d8cd645a47c4f1d8f1d58f Author: James Darnley Date: Wed Nov 24 21:25:09 2010 +0100 yadif: support 16-bit Fixes by Michael Niedermayer Signed-off-by: Anton Khirnov commit 88312a4de3708cdd8f0ca4121546ec882777b7fa Author: James Darnley Date: Tue Apr 5 02:45:10 2011 +0200 yadif: support more than yuv420p. and correctly support grey8 Signed-off-by: Anton Khirnov commit d85e18e6e342bf58f8e13a95f601082e5d70803a Author: Michael Niedermayer Date: Sat Apr 2 20:26:39 2011 +0200 yadif: Fix assert() failure Signed-off-by: Anton Khirnov commit 3788a3c0c03585b0f8180a16d2a15b8e0e033313 Merge: 05815b3 f80b381 Author: Michael Niedermayer Date: Tue Apr 26 04:12:43 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: graphparser: add a NULL check on the argument passed to strstr setdar: prefer "sar" over "par" in log info message fade: fix draw_slice() check on fade->factor value fade: make draw_slice() chroma check against planes 1 and 2 win32: include the correct header in cmdutils.c ac3: fix memleak in fixed-point encoder flashsv: Return more meaningful error values. flashsv: Employ explicit AVCodec struct initializers. read AVI palette from the end of extradata cosmetics: K&R coding style and more whitespace for Flash Screen Video Merged-by: Michael Niedermayer commit 05815b3545c2f8718ab25f455d51ea88be43e9c5 Author: Michael Niedermayer Date: Tue Apr 26 01:45:17 2011 +0200 Fix issue1503, this fix may be incomplete we need more samples to know for sure. Signed-off-by: Michael Niedermayer commit 7157334c375b7623dd52314d45cef3700896d0fe Author: Michael Niedermayer Date: Mon Apr 25 16:16:44 2011 +0200 wmadec: prevent null pointer call. Signed-off-by: Michael Niedermayer commit 1da254b849d9bc8cc100afde86b225d467857a11 Author: Stefano Sabatini Date: Mon Apr 25 22:08:15 2011 +0200 fraps: do not set avctx->pix_fmt to none in decode_init() This is required for setting up the filterchain, as it requires the pixel format to be set, which is usually done when probing the file with av_find_stream_info(). Fix trac issue #83. Signed-off-by: Stefano Sabatini commit f80b381bfd956e4470bdbc1854f88cf3ea0764a9 Author: Stefano Sabatini Date: Wed Mar 30 21:30:31 2011 +0200 graphparser: add a NULL check on the argument passed to strstr Fix crash in create_filter() which occurrs if a scale filter with no args is provided. Signed-off-by: Anton Khirnov commit c61bfc113ae8c562e33734acc58299e4b01fe649 Author: Stefano Sabatini Date: Sat Mar 26 15:49:07 2011 +0100 setdar: prefer "sar" over "par" in log info message This is more consistent with the terminology adopted by the aspect filter names. Signed-off-by: Anton Khirnov commit b04d1abb40d32d8d08df39733e1b04a8a2f814ab Author: Mark Himsley Date: Fri Mar 18 15:25:26 2011 +0000 fade: fix draw_slice() check on fade->factor value draw_slice() checks that the fade factor is < 65536 and only calculates the fade if so. But the fade factor is clipped in end_frame() by av_clip_uint16() to 65535, so the fade is calculated for every frame. This patch alters the check so that it compares with < 65535 (UINT16_MAX). Signed-off-by: Anton Khirnov commit 9026b27e84f6cf6b0133d7aab5b874500bcc5313 Author: Mark Himsley Date: Fri Mar 18 14:42:29 2011 +0000 fade: make draw_slice() chroma check against planes 1 and 2 draw_slice() checks that planes 0 and 1 of AVFilterBufferRef's data are not NULL before manipulating planes 1 and 2. This patch makes the check against planes 1 and 2. More senseful and possibly more robust. Signed-off-by: Anton Khirnov commit bd2a3700c045201b043a0e812d932e9d4fc37e82 Author: Stefano Sabatini Date: Mon Apr 25 01:17:08 2011 +0200 lsws: prevent overflow in sws_init_context() In the loop: for (i=0; ichrDstH / dstH; when i*c->chrDstH > INT_MAX this leads to an integer overflow, which results in a negative value for chrI and in out-of-buffer reads. The overflow is avoided by forcing int64_t arithmetic by casting i to int64_t. Fix crash, and trac issue #72. Signed-off-by: Stefano Sabatini commit 1d6c82d40541936fe67061a8374b5bae8fbc4cbb Author: Stefano Sabatini Date: Mon Apr 25 00:49:18 2011 +0200 ffplay: fix logic for selecting the show mode in case of missing video Also automatically select the show mode only if not specified by the user. Fix trac issue #109. Signed-off-by: Stefano Sabatini commit 54ad8e06f48392332a3fedc468eba38d823c60ea Author: Stefano Sabatini Date: Mon Apr 25 00:31:59 2011 +0200 ffplay: name ShowMode enum Help debugging with GDB, maybe cleaner/safer. Signed-off-by: Stefano Sabatini commit ba9327ea65310d9e15acb5791980a7d766c9f986 Author: Luca Barbato Date: Mon Apr 25 15:30:42 2011 +0200 win32: include the correct header in cmdutils.c CommandLineToArgvW requires windows.h, include it directly commit 6ad2bafcfd4c90cc0e3923f90699aa77d3cf7803 Author: Janne Grunau Date: Mon Apr 25 18:56:40 2011 +0200 ac3: fix memleak in fixed-point encoder caused by typo in mdct_end commit 03a91c74539ec8eff4a84241a06e59e03cccc35d Author: Manfred Tremmel Date: Mon Apr 25 19:53:47 2011 +0200 Patch from Packman (OpenSuse - packages) to silence rpmlint. Signed-off-by: Michael Niedermayer commit 7f725f234e65cf55146b3ed8d1466c35937d4f9d Author: Reimar Döffinger Date: Mon Apr 25 00:47:40 2011 +0200 Set start_time to 0 for raw audio files. None of the raw audio files have timestamps, thus setting start_time to 0 should be reasonable. commit 663d002410f7f4036b6ced77f3cf20d45bd98abb Author: Reimar Döffinger Date: Mon Apr 25 12:29:04 2011 +0200 Remove now unused audio_float configure option. commit bde96717957f1cac953806f1717b935f9c191c87 Author: Reimar Döffinger Date: Mon Apr 25 12:27:12 2011 +0200 dca: allow selecting float output at runtime. commit 5aff31b136af6496d2f7c5e52eb37f577b54832b Author: Reimar Döffinger Date: Mon Apr 25 12:22:26 2011 +0200 vorbisdec: allow selecting float output at runtime. commit 26d5a4b6b496dce0573bd0f5e4af5150899eb3ec Author: Reimar Döffinger Date: Mon Apr 25 12:16:40 2011 +0200 aacdec: Allow selecting float output at runtime. commit 4c7ad768e1356edd7addc6af2c3f0d3ca90ac408 Author: Reimar Döffinger Date: Mon Apr 25 11:59:28 2011 +0200 ac3dec: allow selecting float output at runtime. commit a14c08247d2e207b344e335e1cea774c99419fed Author: Diego Biurrun Date: Mon Apr 25 16:01:58 2011 +0200 flashsv: Return more meaningful error values. commit 46cb2da1f0acb23d4c54aefafc7d062c2f85c249 Author: Diego Biurrun Date: Mon Apr 25 02:22:46 2011 +0200 flashsv: Employ explicit AVCodec struct initializers. commit 5e9de76f54e54d1c4e1f060f4e93e73cd7706828 Author: Reimar Döffinger Date: Mon Apr 25 13:54:26 2011 +0200 Do not set non_interleaved for DV-in-AVI. It does not make sense (DV is interleaved by design) and it avoids a crash when the non-interleaved code tries to use the priv_data of streams created by the DV demuxer. The crash could be avoided differently, but then that stream would still lack an index and would not play correctly in non-interleaved mode. Fixes e.g. samples/ffmpeg-bugs/roundup/issue1514/Dennis0002_video1.avi commit 6c9364168310ddb27059d07fdc04da84778d5f0b Author: Carl Eugen Hoyos Date: Mon Apr 25 11:23:06 2011 +0200 Warn if the source has unsupported (or no) channel layout. commit 23f40a07888018ff8a5ae8e74e15b6bae57bcae0 Author: Kostya Shishkov Date: Sat Apr 23 09:42:19 2011 +0200 read AVI palette from the end of extradata Official AVI specification says that stream header in case of video contains BITMAPINFO, which is equal to BITMAPINFOHEADER and optional palette. Currently lavf AVI demuxer thinks otherwise which produces garbage on codecs that have both palette and extradata (luckily, there are not so many such codecs). An example of such file is: http://samples.multimedia.cx/V-codecs/KMVC/baseball1.avi (IIRC, MSS1 or MSS2 also had such situation but they are still not supported by lavc). As a side note, passing palette in extradata as it's been done previously is not quite correct since proper _extra_ data is surplus bytes in BITMAPINFOHEADER, not including palette. Signed-off-by: Ronald S. Bultje commit f27ac6d83c3d90cac49230480a8569a1651763bd Author: Peter Ross Date: Mon Apr 25 11:52:15 2011 +1000 Set channel layout for 4 and 5.1 channel cdata audio files Patch from Carl Eugen Hoyos (cehoyos at ag dot or dot at) Signed-off-by: Peter Ross commit 2ebd47841f16d1d521d7dd9b5ae0b8015443b690 Merge: 9d7244c 989fb05 Author: Michael Niedermayer Date: Mon Apr 25 02:47:47 2011 +0200 Merge branch 'master' into oldabi * master: (172 commits) Check mmap() return against correct value Signed-off-by: Michael Niedermayer vorbisdec: Employ proper printf format specifiers for uint_fast32_t. Support fourcc MMJP. Support fourcc XVIX. Support fourcc M263. Support fourcc auv2. Fix indentation. Support PARSER_FLAG_COMPLETE_FRAMES for h261 and h263 parsers. ffplay: avoid SIGFPE exception in SDL_DisplayYUVOverlay avi: try to synchronize the points in time of the starts of streams after seeking. Signed-off-by: Michael Niedermayer Add flag to force demuxers to sort more strictly by dts. This enables non interleaved AVI mode for example. Players that are picky on strict interleaving can set this. Patches to only switch to non intereaved AVI mode when the index is not strictly correctly interleaved are welcome. Signed-off-by: Michael Niedermayer applehttp: Don't export variant_bitrate if it isn't known crypto: Use av_freep instead of av_free CrystalHD: Add AVOption to configure hardware downscaling. Check for malloc failures in fraps decoder. Use av_fast_malloc instead of av_realloc in fraps decoder. general.texi: document libcelt decoder. Fix some passing argument from incompatible pointer type warnings. Signed-off-by: Michael Niedermayer configure: Add missing libm library dependencies to .pc files. oggdec: reindent after 8f3eebd6 ... Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer commit 989fb05fe344d9666db858e0577c44969625184e Merge: 2671ab3 2441003 Author: Michael Niedermayer Date: Mon Apr 25 02:29:09 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: vorbisdec: Employ proper printf format specifiers for uint_fast32_t. applehttp: Don't export variant_bitrate if it isn't known crypto: Use av_freep instead of av_free configure: Add missing libm library dependencies to .pc files. oggdec: reindent after 8f3eebd6 configure: Add missing libavutil inter-library dependencies to .pc files. Conflicts: configure Merged-by: Michael Niedermayer commit 2671ab3996672c43b02076daca5bf00c5a6f1c68 Author: unknown author Date: Mon Apr 25 01:48:46 2011 +0200 Check mmap() return against correct value Signed-off-by: Michael Niedermayer commit 293fe6da01b6cb2f85c6551553ed765a7408ca23 Author: Diego Biurrun Date: Sun Apr 24 14:47:54 2011 +0200 cosmetics: K&R coding style and more whitespace for Flash Screen Video commit 2441003d3fdc01545690c2f397efd7acfd876d6c Author: Diego Biurrun Date: Sun Apr 24 19:49:39 2011 +0200 vorbisdec: Employ proper printf format specifiers for uint_fast32_t. libavcodec/vorbisdec.c:543: warning: format ‘%d’ expects type ‘int’, but argument 4 has type ‘uint_fast32_t’ libavcodec/vorbisdec.c:543: warning: format ‘%d’ expects type ‘int’, but argument 5 has type ‘uint_fast32_t’ commit 03546a9ac8753b3f083ae3d2a6397c8c0011923b Author: Carl Eugen Hoyos Date: Mon Apr 25 00:43:13 2011 +0200 Support fourcc MMJP. Fixes ticket #107. commit 69cf1824c6001ccc37d9ece5308c9a8f8d1dec26 Author: Carl Eugen Hoyos Date: Mon Apr 25 00:35:59 2011 +0200 Support fourcc XVIX. Fixes ticket #106. commit a8117a62f41c53eafde94bd84415a3f552824dcd Author: Carl Eugen Hoyos Date: Mon Apr 25 00:27:03 2011 +0200 Support fourcc M263. Fixes ticket #103. commit 3e1c59ebc642831395bb5bcdc763520722679a6c Author: ami_stuff Date: Mon Apr 25 00:20:27 2011 +0200 Support fourcc auv2. Fixes ticket #101. commit 9a962f30556f8890a09cd668a9fe806ebac54206 Author: Reimar Döffinger Date: Mon Apr 25 00:02:36 2011 +0200 Fix indentation. commit 02e3f7d042aabd98d4114f7f84b4b480a93daaa1 Author: Reimar Döffinger Date: Sun Apr 24 19:17:17 2011 +0200 Support PARSER_FLAG_COMPLETE_FRAMES for h261 and h263 parsers. commit 69f58958ce8f81b153b14c60959ba37d6bf0b8cf Author: Stefano Sabatini Date: Fri Apr 22 17:11:23 2011 +0200 ffplay: avoid SIGFPE exception in SDL_DisplayYUVOverlay In video_image_display(), fix exception occurring when the size of the rectangle passed to SDL_DisplayYUVOverlay() is 0x0, which happens when interactively resizing the SDL window. This is done by forcing the minimum size to 1x1. Signed-off-by: Stefano Sabatini commit fbfcc8f1b71b51ff87f09e269d22328be5594f40 Author: Michael Niedermayer Date: Sun Apr 24 22:38:05 2011 +0200 avi: try to synchronize the points in time of the starts of streams after seeking. Signed-off-by: Michael Niedermayer commit 8a68697dc66234d0a5fc50b4d67a94921c9893d1 Author: Michael Niedermayer Date: Sun Apr 24 21:29:35 2011 +0200 Add flag to force demuxers to sort more strictly by dts. This enables non interleaved AVI mode for example. Players that are picky on strict interleaving can set this. Patches to only switch to non intereaved AVI mode when the index is not strictly correctly interleaved are welcome. Signed-off-by: Michael Niedermayer commit 5f85d49b6889b9a2ecd18695fe52c5c9b698a0e1 Author: Martin Storsjö Date: Sun Apr 24 20:19:49 2011 +0300 applehttp: Don't export variant_bitrate if it isn't known If there are no variants, the total bitrate of the single stream isn't known, and exporting variant_bitrate = 0 does look weird, since there really aren't any variants. Signed-off-by: Martin Storsjö commit ac9cf2e5c48aa1edb2c7ba8e7edfa55c9fde609b Author: Martin Storsjö Date: Sun Apr 24 20:10:37 2011 +0300 crypto: Use av_freep instead of av_free Using av_freep is generally good practice. Signed-off-by: Martin Storsjö commit e4253b1a4f5e296dfb41620c02e08650609e6819 Author: Philip Langdale Date: Wed Apr 20 21:41:43 2011 -0700 CrystalHD: Add AVOption to configure hardware downscaling. The CrystalHD hardware can do scaling, which is particularly desirable when dealing with some high resolution clips that take so long to decode and copy out that they end up playing back slower than realtime. By using scaling, we can make the output frames smaller and reduce the copy out time. This option takes the desired horizontal width in pixels, and the hardware will do an aspect-scale. Upscaling is not supported and the hardware will simply ignore any request to do so. Signed-off-by: Philip Langdale commit 67c1a59ad7f9057f86d1605df3c28db0edb99bef Author: Reimar Döffinger Date: Sun Apr 24 14:49:29 2011 +0200 Check for malloc failures in fraps decoder. commit 80da2dcf05efdaa5e8f82b635da245054256a35f Author: Reimar Döffinger Date: Sun Apr 24 14:39:07 2011 +0200 Use av_fast_malloc instead of av_realloc in fraps decoder. commit 88dbbe97d598390d96eeb3118437a225296a18ae Author: Nicolas George Date: Sat Apr 23 11:42:26 2011 +0200 general.texi: document libcelt decoder. commit e3323a1cbdadef21a6cbc98bc6c3e24457b45eab Author: Michael Niedermayer Date: Sun Apr 24 17:46:50 2011 +0200 Fix some passing argument from incompatible pointer type warnings. Signed-off-by: Michael Niedermayer commit 50f7c296469e9675e07fd1afa37b5e430b876f1c Author: Reinhard Tartler Date: Sun Apr 24 17:24:24 2011 +0200 configure: Add missing libm library dependencies to .pc files. This unbreaks static compilation using pkg-config on systems in need of -lm. Based on an mplayer2 patch by Uoti Urpala Signed-off-by: Diego Biurrun commit dc713546d4ffcd2fbc8e0ecd28fbcf6cd252061a Author: Clément BÅ“sch Date: Sun Apr 24 15:40:57 2011 +0200 oggdec: reindent after 8f3eebd6 Signed-off-by: Diego Biurrun commit e9251bb5555f6daa6be10437f97579d85d6fdc89 Author: Reinhard Tartler Date: Sun Apr 24 11:39:15 2011 +0200 configure: Add missing libavutil inter-library dependencies to .pc files. This unbreaks static compilation when using pkg-config. Based on an mplayer2 patch by Uoti Urpala Signed-off-by: Diego Biurrun commit 47ec6546d240e3d9a8f76f25e127dcb4a3a9f7b9 Author: Michael Niedermayer Date: Sun Apr 24 13:27:07 2011 +0200 Drop section describung now unneeded workarounds for BSD Signed-off-by: Michael Niedermayer commit 13e69cc5fa60a7e2bccedc4f59a16c1abcec6b8b Author: Michael Niedermayer Date: Sun Apr 24 13:23:51 2011 +0200 Fix building on FreeBSD8.2 Signed-off-by: Michael Niedermayer commit 183132872a1d8bc8a32e7fd8f994fa2f1b2d6bfc Author: Sebastian Vater Date: Wed Apr 20 13:56:56 2011 +0200 HAM6/HAM8 support for IFF demuxer/decoder Signed-off-by: Michael Niedermayer commit c2a8f125855aef72efcde8a06dd73a5fbe5dcf25 Author: Peter Ross Date: Sat Apr 23 22:09:19 2011 +1000 EA cdata demuxer: support files with 20 byte header Signed-off-by: Michael Niedermayer commit db62d898330664a9b69ba5a1feee18338bb00852 Author: Peter Ross Date: Sat Apr 23 22:09:10 2011 +1000 EA cdata demuxer: support 6 channel files Signed-off-by: Michael Niedermayer commit c8a5e8a8948bcd7c0d01d3f64d58c1dc7e29d4e2 Author: Peter Ross Date: Sun Apr 24 09:41:51 2011 +1000 EA cdata demuxer: set codec->sample_fmt This is required by has_codec_parameters in libavformat/utils.c Signed-off-by: Michael Niedermayer commit b678d6db95b3f7304db6e01f26807fb23e2e7d0e Author: Peter Ross Date: Sat Apr 23 22:08:48 2011 +1000 permit decoding of multichannel ADPCM_EA_XAS Signed-off-by: Michael Niedermayer commit 7b376b398a464a5825ede8b10d5f605c526c7399 Merge: c225615 b1ac139 Author: Michael Niedermayer Date: Sun Apr 24 03:38:03 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: Handle unicode file names on windows rtp: Rename the open/close functions to alloc/free Lowercase all ff* program names. Refer to ff* tools by their lowercase names. NOT Pulled Replace more FFmpeg instances by Libav or ffmpeg. Replace `` by $() syntax in shell scripts. patcheck: Allow overiding grep program(s) through environment variables. NOT Pulled Remove stray libavcore and _g binary references. vorbis: Rename decoder/encoder files to follow general file naming scheme. aacenc: Fix whitespace after last commit. cook: Fix small typo in av_log_ask_for_sample message. aacenc: Finish 3GPP psymodel analysis for non mid/side cases. Remove RDFT dependency from AAC decoder. Add some debug log messages to AAC extradata Fix mov debug (u)int64_t format strings. bswap: use native types for av_bwap16(). doc: FLV muxing is supported. applehttp: Handle AES-128 encrypted streams Add a protocol handler for AES CBC decryption with PKCS7 padding doc: Mention that DragonFly BSD requires __BSD_VISIBLE set Conflicts: ffplay.c ffprobe.c Merged-by: Michael Niedermayer commit b1ac139d89b9fc55b70ad3411af2f75fe8b17805 Author: Kirill Gavrilov Date: Wed Apr 20 14:36:44 2011 +0300 Handle unicode file names on windows All file names should be in UTF-8 within libavformat. This is handled by mapping the open() function to an internal one in os_support.h for windows. fopen() could be overridden in the same way, but if that would be used from ffmpeg.c, it would add a dependency on an ff prefixed internal lavf function. Signed-off-by: Martin Storsjö commit 9261e6cf3fe579fa02a96761c8e81a77bb3d8b2e Author: Martin Storsjö Date: Wed Apr 20 15:36:37 2011 +0300 rtp: Rename the open/close functions to alloc/free This avoids clashes if we internally want to override the global open function. Signed-off-by: Martin Storsjö commit c225615bf2da206775c5ff2b56d648cf50d38756 Author: Baptiste Coudurier Date: Sat Apr 23 12:41:11 2011 -0700 In libx264 wrapper, fix side effect with has_b_frames, bframe_pyramid can be set when bframe is not. commit 89b503b55f2b2713f1c3cc8981102c1a7b663281 Author: Diego Biurrun Date: Sat Apr 23 15:19:17 2011 +0200 Lowercase all ff* program names. commit 3a50894eaaad3d5a7ec9bad99c08ecb8305c51c1 Author: Diego Biurrun Date: Sat Apr 23 16:40:01 2011 +0200 Refer to ff* tools by their lowercase names. commit 43fb279f5643225799841f512d2dad4690186165 Author: Diego Biurrun Date: Sat Apr 23 16:39:03 2011 +0200 Replace more FFmpeg instances by Libav or ffmpeg. commit 6252040e773c30efa21c743124d5e813320a0ec2 Author: Diego Biurrun Date: Tue Apr 19 00:16:24 2011 +0200 Replace `` by $() syntax in shell scripts. $() is easier to nest and POSIX, which we require in other places. commit ff3be572efde575c2b5ee621a84920ac9a5b9b8f Author: Brad Date: Sun Mar 27 21:05:22 2011 -0400 patcheck: Allow overiding grep program(s) through environment variables. patcheck hardcodes the binary names for grep/egrep. This makes overriding the binary names a pain, e.g. when calling a GNU version of grep on BSD systems. Signed-off-by: Diego Biurrun commit 75e8fba8232108c075a8b24bd7f17b7c5869c7bc Author: Diego Biurrun Date: Sat Apr 23 14:14:22 2011 +0200 Remove stray libavcore and _g binary references. commit 046f3cb78903cd04846c49345b473244f095f1a5 Author: Diego Biurrun Date: Sun Apr 17 19:44:33 2011 +0200 vorbis: Rename decoder/encoder files to follow general file naming scheme. commit f50d9377252431114e89514cf528825936efcbd9 Author: Nathan Caldwell Date: Tue Apr 5 01:05:24 2011 -0600 aacenc: Fix whitespace after last commit. Signed-off-by: Martin Storsjö commit 2ef2496cd19eb833f4ad22a5051c11be80d09598 Author: Carl Eugen Hoyos Date: Sat Apr 23 13:37:28 2011 +0200 Set channel layout in flac decoder. commit 539647c6ffa9c39f60cee41e1eb79e491bc4f4c5 Author: Stefano Sabatini Date: Fri Apr 22 11:09:48 2011 +0200 ffplay: factorize code calling output_packet() in video_thread() Slightly simplify. Signed-off-by: Stefano Sabatini commit c632a1c205c59a7d716cae2d540c7b693e9a827e Author: Stefano Sabatini Date: Fri Apr 22 11:26:44 2011 +0200 ffplay: remove reference to unused QETimer symbol Signed-off-by: Stefano Sabatini commit ab7fdbab00872f6435cd1b6b5f1304e2d03d86eb Author: Stefano Sabatini Date: Fri Apr 22 02:19:48 2011 +0200 ffplay: rename stream_pause() to stream_toggle_pause() The new name is less misleading, since the function will resume the stream if it is currently paused. Signed-off-by: Stefano Sabatini commit efd6cbc5ddac2d4df7008733bfef1d6d6809cc3c Author: Stefano Sabatini Date: Sat Apr 23 00:08:28 2011 +0200 flicvideo: fix crash on flic files with invalid frame size Add a check in flic_decode_frame_8BPP(), in case chunk_size is > frame_size issue a warning and resize chunk_size to frame_size, in order to avoid out-of-buffer reads. Fix roundup issue #2520, trac issue #69. Signed-off-by: Stefano Sabatini commit cd1872799d89a87b1d06132118836c82cda2a44f Author: Stefano Sabatini Date: Sat Apr 23 00:07:15 2011 +0200 flicvideo: increase error level and fix error message in CHECK_PIXEL_PTR() Also return AVERROR_INVALIDDATA rather than -1. Signed-off-by: Stefano Sabatini commit 62582a696b4dbe3d644ea19aa6739bbe592482da Author: Diego Biurrun Date: Sat Apr 23 02:02:42 2011 +0200 cook: Fix small typo in av_log_ask_for_sample message. commit 230c1a90754860719b017a9ea4627dc81f67ff6e Author: Nathan Caldwell Date: Wed Jan 5 01:32:16 2011 -0700 aacenc: Finish 3GPP psymodel analysis for non mid/side cases. There is still are still a few sections missing relating to TNS (not present) and mid/side (contains other bugs). Overall this improves quality, and vastly improves rate-control. Signed-off-by: Martin Storsjö commit 3d462373f8e8fa58b697a9b2d93a5edf70841937 Author: Michael Niedermayer Date: Sat Apr 23 10:44:21 2011 +0200 aac: add math.h needed for log2f() Signed-off-by: Michael Niedermayer commit ab1572609f58b718d77df0bd769ec2315ea6d09e Author: Carl Eugen Hoyos Date: Sat Apr 23 10:41:44 2011 +0200 10l: Add misssing CR/LF. commit 8f2e438e52d4a6cd138968df18cd9e54d7f6394f Author: Carl Eugen Hoyos Date: Sat Apr 23 10:31:03 2011 +0200 Support channel layout when demuxing aif files. commit 8bb5d1c39c9646022720ec93ef8a1b49bf558790 Author: Carl Eugen Hoyos Date: Sat Apr 23 10:30:18 2011 +0200 Support channel layout when demuxing caf files. commit 2a2146aac0e1c7649d674905b6a6645b722aef2e Author: Carl Eugen Hoyos Date: Sat Apr 23 10:19:21 2011 +0200 Extend unknown CAF chunk warning message: Print size. commit e499187f2eed5a1e488b0da589dbe89f1c5dc480 Author: Carl Eugen Hoyos Date: Sat Apr 23 10:09:11 2011 +0200 Fix compilation with libcelt on Apple OS X. Fixes ticket #97. commit 4b5c21757bf614b09c94cb5aef5f89ba885b0bd9 Author: Carl Eugen Hoyos Date: Sat Apr 23 10:06:39 2011 +0200 Fix compilation after version bump. commit cfc2a0cf848e71fcec0861a73b26c2c96a201357 Author: Alex Converse Date: Thu Apr 21 18:39:04 2011 +0000 Remove RDFT dependency from AAC decoder. $subj >From 557176d961c70604c2a96d81aff4bd6faa670d8a Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Thu, 21 Apr 2011 12:11:42 -0700 Subject: [PATCH] Remove RDFT dependency from AAC decoder. MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------1" This is a multi-part message in MIME format. --------------1 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: 8bit It was used for an old implementation of the SBR filterbank. ./configure --disable-everything --disable-ffplay --enable-decoder=aac works. commit 785c4418289e5aace9823823a8d19974e40d4b64 Author: Alex Converse Date: Wed Apr 20 17:47:28 2011 +0000 Add some debug log messages to AAC extradata On Wed, Apr 20, 2011 at 11:39 AM, Justin Ruggles wrote: > On 04/20/2011 02:26 PM, Alex Converse wrote: > >> --- >>  libavcodec/aacdec.c |   10 +++++++++- >>  1 files changed, 9 insertions(+), 1 deletions(-) >> >> >> >> 0002-Add-some-Debug-log-messages-to-AAC-extradata.patch >> >> >> diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c >> index c9761a1..3ec274f 100644 >> --- a/libavcodec/aacdec.c >> +++ b/libavcodec/aacdec.c >> @@ -79,7 +79,6 @@ >>             Parametric Stereo. >>   */ >> >> - >>  #include "avcodec.h" >>  #include "internal.h" >>  #include "get_bits.h" > > > stray whitespace change > oops, fixed >From 94e8d0eea77480630f84368c97646cabc0f50628 Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Wed, 20 Apr 2011 11:23:34 -0700 Subject: [PATCH] Add some debug log messages to AAC extradata MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------1" This is a multi-part message in MIME format. --------------1 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: 8bit commit 3583d7cffe5173cc02c5476451800efdc767ce15 Author: Alex Converse Date: Wed Apr 20 17:25:47 2011 +0000 Fix mov debug (u)int64_t format strings. commit 15919ee48f507a4ca17147e7247f5cb68f752c2c Author: Jason Garrett-Glaser Date: Fri Apr 22 17:59:55 2011 -0400 bswap: use native types for av_bwap16(). This prevents a call to bytestream_get_be16() using a movzwl both before and after the ror instruction, which is obviously inefficient. Arm uses the same trick also. Sintel decoding goes from (avg+SD) 9.856 +/- 0.003 to 9.797 +/- 0.003 sec. Signed-off-by: Ronald S. Bultje commit e16665bf72d226b2c87c76a677414b8ef7720d7e Merge: 03ac799 d9dee72 Author: Michael Niedermayer Date: Sat Apr 23 01:09:43 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: Use av_log_ask_for_sample() to request samples from users. Make av_log_ask_for_sample() accept a variable number of arguments. vqavideo: We no longer need to ask for version 1 samples. aacdec: indentation cosmetics Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer commit 6ffd7eddb832a21f51661038620ef655640ee83f Author: Carl Eugen Hoyos Date: Fri Apr 22 19:24:17 2011 +0200 doc: FLV muxing is supported. Signed-off-by: Martin Storsjö commit 84465f2180308a3e998089517e76586563fd6162 Author: Martin Storsjö Date: Sun Jan 23 23:42:18 2011 +0200 applehttp: Handle AES-128 encrypted streams This should hopefully fix roundup issue 2586. This commit only implements it in the demuxer, not in the protocol handler. If desired, some of the code could be refactored to be shared by both implementations. Signed-off-by: Martin Storsjö commit 6e4f70a8de69884ce0caa8735d7a88915b4391d4 Author: Martin Storsjö Date: Sun Jan 23 01:31:41 2011 +0200 Add a protocol handler for AES CBC decryption with PKCS7 padding This can later be extended to support other AES bit sizes, encryption, other crypto algorithms, reading the key from a URL, etc. In order to use it, the key and initialization vector has to be passed via AVOptions. Since such options can't be passed to protocols from the command line, the protocol is currently only for libavformat internal use. Signed-off-by: Martin Storsjö commit d5c5a1c7e2959a5174522b5ac1d73d5095b8c5a3 Author: Martin Storsjö Date: Fri Apr 22 00:45:06 2011 +0300 doc: Mention that DragonFly BSD requires __BSD_VISIBLE set Setting this should fix the FATE build failure on DragonFly BSD, since inet_aton only is visible if __BSD_VISIBLE is set. Alternatively, a line defining __BSD_VISIBLE=1 could be added at the top of os_support.c. For FreeBSD, similar lines are required in libavdevice/bktr.c and libavdevice/oss_audio.c, too. Signed-off-by: Martin Storsjö commit d9dee728b8c50fb6dbff3701e1abcb2eac5895b3 Author: Diego Biurrun Date: Fri Apr 22 19:41:59 2011 +0200 Use av_log_ask_for_sample() to request samples from users. commit 44f566b79afcbbb152ec21db667ea3d2f42e8f8d Author: Diego Biurrun Date: Fri Apr 22 19:30:25 2011 +0200 Make av_log_ask_for_sample() accept a variable number of arguments. commit 03ac7991286c583c73c8c44c71aeba1265c61cba Author: Robert Leatherwood Date: Fri Apr 22 20:10:26 2011 +0200 Rm duplicated define for OPT_STR. commit b2832c3904211f2e95f49059d15b94dfab55964a Author: Diego Biurrun Date: Fri Apr 22 19:46:54 2011 +0200 vqavideo: We no longer need to ask for version 1 samples. commit a08a59b736621062a1a7bd931fc1c71904caee34 Author: Carl Eugen Hoyos Date: Fri Apr 22 19:24:17 2011 +0200 FLV muxing is supported. commit 3c483620c9a92c040b3f747e11b048e145653ce5 Author: Carl Eugen Hoyos Date: Fri Apr 22 18:49:44 2011 +0200 Cosmetics: Rename variable daemon as run_as_daemon. daemon() is defined in unistd.h for BSD and Cygwin. commit 07f45bc9887daa0cf760de46f8ee098ca2563725 Author: Carl Eugen Hoyos Date: Fri Apr 22 18:45:47 2011 +0200 Support Canopus SD50 with fourcc "CDV5". Fixes ticket #93. commit cc0ac0d2cb957c21e1bbfb90e07cedbcab1ee960 Author: Michael Niedermayer Date: Fri Apr 22 16:00:00 2011 +0200 rv10: set flags, Fixes Ticket90 Signed-off-by: Michael Niedermayer commit 9978ed7d6c07ef12220b57b5f9f8e48ab363141e Author: Young Han Lee Date: Fri Apr 22 21:39:56 2011 +0900 aacdec: indentation cosmetics Signed-off-by: Diego Biurrun commit 22180e7a5a39f8a77498fcbce54368ecc408df8f Author: Stefano Sabatini Date: Thu Apr 21 11:48:44 2011 +0200 error: remove symbols which were deprecated before the big bump The removal was not applied when merging the Libav patches, because there was still code referencing the symbols. Signed-off-by: Stefano Sabatini commit 50f43fb0e26df6f090e88f4e09257ef5e10be0fb Author: Stefano Sabatini Date: Thu Apr 21 11:24:34 2011 +0200 matroskaenc: replace AVERROR_NOTSUPP with AVERROR(EINVAL) AVERROR_NOTSUPP has been dropped with the major bump. Since the signalled error denotes a configuration problem, AVERROR(EINVAL) looks an adequate replacement. Signed-off-by: Stefano Sabatini commit 8772156be0725fd20d948a855616fe155fafdc09 Merge: 89f903b b4a5331 Author: Michael Niedermayer Date: Fri Apr 22 03:50:23 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: APIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition. Introduce slice threads flag. FATE: allow forcing thread-type when doing threaded fate runs. Use av_log_ask_for_sample() where appropriate. error: sort, pack, and align error code and string definitions The stabilization period after version bumps should be one month, not one week. applehttp: Expose the stream bitrate via metadata doc: Add some initial docs on the applehttp demuxer Provide a fallback version of the libm function trunc libavdevice: Define _XOPEN_SOURCE for usleep lavc: provide deprecated avcodec_thread_init until next major version lavc: provide the opt.h header until the next bump error: change AVERROR_EOF value error: remove AVERROR_NUMEXPECTED error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c Conflicts: libavcodec/h264.c libavutil/error.c libavutil/error.h Merged-by: Michael Niedermayer commit b4a53314f115a47567b77004e02dd317e0e29ad9 Author: Ronald S. Bultje Date: Thu Apr 21 19:50:19 2011 -0400 APIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition. commit 94f7451a3a5ad61cd49da0aa9f08cefe75482007 Author: Ronald S. Bultje Date: Wed Apr 20 14:14:42 2011 -0400 Introduce slice threads flag. Signed-off-by: Ronald S. Bultje commit 3283f274fdbef16d13df06661cec601e1bc01aab Author: Ronald S. Bultje Date: Wed Apr 20 13:12:38 2011 -0400 FATE: allow forcing thread-type when doing threaded fate runs. Signed-off-by: Ronald S. Bultje commit 89f903b3d5ec38c9c5d90fba7e626fa0eda61a32 Author: Michael Niedermayer Date: Thu Apr 21 22:04:21 2011 +0200 AMV: Fix possibly exploitable crash. Reported-at: Thu, 21 Apr 2011 14:38:25 +0000 Reported-by: Dominic Chell Signed-off-by: Michael Niedermayer commit 73a51e00a74df079507d6355a4e353494ddb0385 Author: Michael Niedermayer Date: Thu Apr 21 22:03:24 2011 +0200 mjpeg: Detect overreads in mjpeg_decode_scan() and error out. Signed-off-by: Michael Niedermayer commit 70fb031ce27ce200026de2ea77ec038e2c2e141f Author: Diego Biurrun Date: Thu Apr 21 19:38:49 2011 +0200 Use av_log_ask_for_sample() where appropriate. commit 3eb15d98122e71faf98f22bc4acc7ab56f2f4858 Author: Stefano Sabatini Date: Thu Apr 21 18:44:47 2011 +0200 mp: remove unused variable outlink in end_frame Fix warning: vf_mp.c: In function ‘end_frame’: vf_mp.c:870: warning: unused variable ‘outlink’ Signed-off-by: Stefano Sabatini commit e40cfb1463fbc3470a2c10670fd2bba8e9304ff4 Author: Stefano Sabatini Date: Thu Apr 21 14:25:25 2011 +0200 mp: remove use of deprecated old eval API The old API was deprecated and will be possibly removed, fix warnings in libavfilter/libmpcodecs/vf_geq.c and libavfilter/libmpcodecs/vf_qp.c. Signed-off-by: Stefano Sabatini commit 20a160484f33e0d6b40ce905a89c5c6e8282704b Author: Baptiste Coudurier Date: Thu Apr 21 09:01:31 2011 -0700 In libx264 wrapper, detect default settings and use medium profile to avoid failure. commit 8d67218bd73744c367450d8b8ecc5a6e6c42bd11 Author: Stefano Sabatini Date: Thu Apr 21 13:36:12 2011 +0200 error: sort, pack, and align error code and string definitions Signed-off-by: Diego Biurrun commit ab1adff73f4852d99f9c65ef5a5ceca3e2accbe8 Author: Diego Biurrun Date: Thu Apr 21 15:56:55 2011 +0200 The stabilization period after version bumps should be one month, not one week. commit fe8e039460064ad765c37736dadd123478c5ff1f Author: Martin Storsjö Date: Wed Apr 20 10:10:10 2011 +0300 applehttp: Expose the stream bitrate via metadata This helps callers to intelligently switch between bitrate variants. Signed-off-by: Martin Storsjö commit cac275791994be44b7a6d11a3878646e78ab5653 Author: Martin Storsjö Date: Wed Apr 20 23:04:31 2011 +0300 doc: Add some initial docs on the applehttp demuxer Signed-off-by: Martin Storsjö commit 23d3931a6a8a37bb7e86bd6cb4709eb46031bfe1 Author: Martin Storsjö Date: Thu Apr 21 13:02:38 2011 +0200 Provide a fallback version of the libm function trunc This fixes compilation on DOS. Signed-off-by: Martin Storsjö commit 32a128522ad392d2bca67165fda1d2fe30262189 Author: Martin Storsjö Date: Thu Apr 21 13:49:21 2011 +0300 libavdevice: Define _XOPEN_SOURCE for usleep This hopefully fixes build failures on Dragonfly BSD. Signed-off-by: Martin Storsjö commit 9bf81b49cff3945a76ac776f086a1d1adc120e6d Author: Stefano Sabatini Date: Mon Apr 11 00:39:59 2011 +0200 img2: return AVERROR(EINVAL) in case of invalid filename pattern In write_packet(), return AVERROR(EINVAL) rather than AVERROR(EIO) if the provided output filename pattern is not valid. Indeed this has to be considered a configuration error rather than an I/O error. Allow a less confusing error report. Signed-off-by: Stefano Sabatini commit 7046b63e69a5a49a8f575d89d8f0fc6680975382 Author: Stefano Sabatini Date: Wed Apr 20 13:13:09 2011 +0200 ffmpeg: call pre_process_video_frame() only if decoding is needed In output_packet(), move the pre_process_video_frame() call inside the if (ist->decoding_needed) { } block. This way pre_process_video_frame() is not called when stream-copy has been selected. Also simplify. Signed-off-by: Stefano Sabatini commit 6d6351483fe94b7ae4938717b477014f42500145 Author: Stefano Sabatini Date: Thu Apr 21 10:31:48 2011 +0200 ocv: replace FF_INTERNAL_MEM_TYPE_MAX_VALUE with SIZE_MAX Fix compilatin after removal of FF_INTERNAL_MEM_TYPE_MAX_VALUE. Signed-off-by: Stefano Sabatini commit 65af48b55930abe5ac9130be3ff4d9c287a7f010 Author: Anton Khirnov Date: Wed Apr 20 17:21:39 2011 +0200 lavc: provide deprecated avcodec_thread_init until next major version It was deprecated only recently. commit 095290f9a4230698f64c56b5ee9d89c046f6dd5b Author: Anton Khirnov Date: Wed Apr 20 17:09:45 2011 +0200 lavc: provide the opt.h header until the next bump AVOptions were moved to libavutil only recently. commit a975dbc86b97a421e51ac7075b8df869915745a2 Author: Anton Khirnov Date: Wed Apr 20 07:14:50 2011 +0200 error: change AVERROR_EOF value The current value is masking the POSIX error code EPIPE, which has a different semantics. This breaks API. Signed-off-by: Stefano Sabatini Signed-off-by: Anton Khirnov commit 79157f400bec7fdb6385befa63fdafc727378143 Author: Stefano Sabatini Date: Mon Apr 11 00:29:30 2011 +0200 error: remove AVERROR_NUMEXPECTED AVERROR_NUMEXPECTED is used only in the image muxer and demuxer, and has a too much specific meaning, which is better explained through a log message. Thus it can be replaced by AVERROR(EINVAL). This breaks API. Signed-off-by: Stefano Sabatini Signed-off-by: Anton Khirnov commit 58f8463947e56dc448baeeabd7875ea90bdb4a98 Author: Stefano Sabatini Date: Mon Apr 11 00:52:04 2011 +0200 error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c The new error code is better than AVERROR(ENOENT), which has a completely different semantics ("No such file or directory"). Signed-off-by: Stefano Sabatini Signed-off-by: Anton Khirnov commit 10d2ae8cf78ed7e23c6342200fa4d8a5355e87f2 Merge: 2c18893 f83acb0 Author: Michael Niedermayer Date: Thu Apr 21 03:23:46 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: Makefile: Include dependencies for test tools, too Remove a version check in av_log made unnecessary by the big bump. update last major version increase dates in APIchanges Reduce picture size for yadif. oggdec: use av_freep() instead of av_free() avio: Fix sanity checks in ffurl_read* libavformat: Free AVFormatContext->streams libavformat: Make protocols pass URLContext as log context where available asf: remove commented out code in asf_read_seek not pulled: libpostproc: Remove crufty code disabled by the big bump. Reflect 0.7_beta1 release in the Changelog not pulled: sws: remove disabled cruft. lavu: remove disabled ff_random_get_seed cruft. lavu: remove disabled sha1 cruft. Conflicts: Changelog libavutil/sha1.h Merged-by: Michael Niedermayer commit 2c18893a911657205bd45ff8a666882610e57700 Author: Baptiste Coudurier Date: Wed Apr 20 15:46:20 2011 -0700 In libx264 wrapper, correctly support 2pass log filename option. commit f83acb096c0ea1ec181941c141d1ab6fb24820eb Author: Martin Storsjö Date: Wed Apr 20 21:22:08 2011 +0300 Makefile: Include dependencies for test tools, too This makes seek_test to be rebuilt when its dependencies has changed. The changes to the dependencies didn't usually matter in practice, but the introduction of side data in AVPacket required a recompilation. Signed-off-by: Martin Storsjö commit 63de9e7d80ac3609fe378c5cadd5e899185846a7 Author: Diego Biurrun Date: Wed Apr 20 17:18:27 2011 +0200 Remove a version check in av_log made unnecessary by the big bump. commit b9553cf4b80d79c280ae7c989593ce1daac4cafa Author: Nicolas George Date: Wed Apr 20 18:13:54 2011 +0200 avio: fix AVIO_FLAG_READ/WRITE test in ffurl_*. Signed-off-by: Nicolas George commit 53f7628d38b8884016042f0d9527c71611d9182e Author: Justin Ruggles Date: Tue Apr 19 19:37:29 2011 -0400 update last major version increase dates in APIchanges commit 14e3b120adb6e3c0337ffce2f595f85f2a1f33a2 Author: Michael Niedermayer Date: Wed Mar 23 04:31:01 2011 +0000 Reduce picture size for yadif. Signed-off-by: Anton Khirnov commit 52512d0a4340895ba8bd9d2af48f256b969559d2 Author: Michael Niedermayer Date: Tue Apr 12 04:22:31 2011 +0000 oggdec: use av_freep() instead of av_free() Signed-off-by: Anton Khirnov commit 26f6b8c571bcff7b325c7d6cc226c625dd465f8e Author: Martin Storsjö Date: Wed Apr 20 17:09:46 2011 +0300 avio: Fix sanity checks in ffurl_read* This fixes e.g. reading data over HTTP, where the underlying socket is set to read/write. Signed-off-by: Anton Khirnov commit 7bbb67d58005f3c0384f657570fabcdc0bc8cc21 Author: Martin Storsjö Date: Wed Apr 20 12:03:55 2011 +0300 libavformat: Free AVFormatContext->streams After switching this from a statically allocated array to a dynamically allocated one in the major bump, this needs explicit freeing. Signed-off-by: Martin Storsjö commit c60112f26873afafb55d24cc50a0e93ad9411373 Author: Martin Storsjö Date: Wed Apr 20 11:40:29 2011 +0200 libavformat: Make protocols pass URLContext as log context where available Since the libavformat major bump, URLContext contains an AVClass, making it a usable log context. Signed-off-by: Martin Storsjö commit 8408e1d7d69aad57e633c27a6bcd522a15fa3702 Author: Vladimir Pantelic Date: Wed Apr 20 12:31:10 2011 +0200 asf: remove commented out code in asf_read_seek Signed-off-by: Mans Rullgard commit a81ff195c15ccfa34f25b7b753c2e5438fe8939e Author: Diego Biurrun Date: Tue Apr 19 21:53:48 2011 +0200 libpostproc: Remove crufty code disabled by the big bump. commit 89451dd6e4da40ed73b8bbee2d48d8d8be1d5b0c Author: Nicolas George Date: Sat Apr 16 17:45:30 2011 +0200 Xiph CELT/Opus decoder using libcelt. Signed-off-by: Nicolas George commit ddb00ad1d8aba9cdd9ae4b3156512c3f22e2c5a3 Author: Carl Eugen Hoyos Date: Wed Apr 20 09:44:08 2011 +0200 Move the info union to the end of the vdpau_render_state struct. commit 5efef54e70191ab20bcf89239255f1774bf2357c Author: Reinhard Tartler Date: Tue Apr 19 19:48:44 2011 +0200 Reflect 0.7_beta1 release in the Changelog commit efb5fa79f5ca34140db357a00c999286097ab53e Merge: f92b008 31d76ec Author: Michael Niedermayer Date: Wed Apr 20 04:48:23 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: (37 commits) In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function. lavc: remove reference to opt.h from Makefile. prefer avio_check() over url_exist() avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols lavu: remove misc disabled cruft lavu: remove FF_API_OLD_IMAGE_NAMES cruft NOT PULLED lavu: remove FF_API_OLD_EVAL_NAMES cruft lavc: remove misc disabled cruft. lavc: remove the FF_API_INOFFICIAL cruft. lavc: remove the FF_API_SET_STRING_OLD cruft. lavc: remove the FF_API_USE_LPC cruft. lavc: remove the FF_API_SUBTITLE_OLD cruft. lavc: remove the FF_API_VIDEO_OLD cruft. lavc: remove the FF_API_AUDIO_OLD cruft. lavc: remove the FF_API_OPT_SHOW cruft. lavc: remove the FF_API_MM_FLAGS cruft. lavf: remove misc disabled cruft. lavf: remove FF_API_INDEX_BUILT cruft lavf: remove FF_API_URL_CLASS cruft. lavf: remove FF_API_SYMVER cruft ... Merged-by: Michael Niedermayer commit f92b0084c0e02b3c816a9eb234c548487acadae8 Author: Baptiste Coudurier Date: Tue Apr 19 16:12:13 2011 -0700 In libx264 wrapper, add -level specific option. commit 37c0a443f9aa01fcf33215b3cde06961f1e9df5c Author: Baptiste Coudurier Date: Tue Apr 19 15:23:36 2011 -0700 Fix libx264 fastfirstpass, move apply_fastfirstpass after user customized options. commit 90a29294169d8bc57dec2e0b600fe50c101ed625 Author: Nicolas George Date: Tue Apr 19 23:36:29 2011 +0200 oggparsecelt: cosmetic: order lines more logically. Signed-off-by: Nicolas George commit 51c1e255e53bc51b4b3bf071bdaf3e92c4814acc Author: Nicolas George Date: Tue Apr 19 23:03:51 2011 +0200 oggparsecelt: call av_set_pts_info unconditionally. Signed-off-by: Nicolas George commit 46f83e5b3c17a46fa9c86421e7b511cd00cb5d60 Author: Baptiste Coudurier Date: Sat Jan 29 17:05:42 2011 -0800 In libx264 wrapper, do not set pic quality if no frame is output, avoids uninitialized reads. commit d319064465e148b8adb53d1ea5d38c09f987056e Author: Baptiste Coudurier Date: Tue Apr 19 12:57:46 2011 -0700 Prefer codec specific options over global ones, allowing codec to override global options. commit 7dfe244fbd9a3c0a24cac441a4ec777da8f3a666 Author: Anton Khirnov Date: Tue Apr 19 21:25:10 2011 +0200 sws: remove disabled cruft. commit 975c27340528b9e053a7ae9b63b764984e91941c Author: Anton Khirnov Date: Tue Apr 19 21:21:44 2011 +0200 lavu: remove disabled ff_random_get_seed cruft. commit 488d2b6349e3c07fec73c28a165f8d292b413362 Author: Anton Khirnov Date: Tue Apr 19 21:16:35 2011 +0200 lavu: remove disabled sha1 cruft. commit 31d76ec2883c04d29d1f173ea99e605a6936613a Author: Justin Ruggles Date: Sun Apr 17 16:57:55 2011 -0400 In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function. This fixes a bug where a successful call to ff_thread_init() masks errors that occur after that point in the function. It also makes future bugs like this less likely since the error code is now set near to the point in the code where the error is found. commit cda7aa9eba79e113c8e46455b81e3f5a047a8d98 Author: Anton Khirnov Date: Tue Apr 19 19:50:23 2011 +0200 lavc: remove reference to opt.h from Makefile. Fixes make install after 3453a231a6cebe5989c213be0f9fd6c71ec5ea23. commit 55815edca038997ec283569a192a3eca7f2143bc Author: Stefano Sabatini Date: Sat Apr 9 01:32:37 2011 +0200 prefer avio_check() over url_exist() The problem with url_exist() is that it tries to open a resource in RDONLY mode. If the file is a FIFO and there is already a reading client, the open() call will hang. By using avio_check() with access mode of 0, the second reading process will check if the file exists without attempting to open it, thus avoiding the lock. Fix issue #1663. Signed-off-by: Anton Khirnov commit 59d96941f0285a501989d5f2c9b69be0a1393ed5 Author: Stefano Sabatini Date: Fri Apr 15 16:42:09 2011 +0200 avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols Make AVIO_FLAG_ access constants work as flags, and in particular fix the behavior of functions (such as avio_check()) which expect them to be flags rather than modes. This breaks API. commit 490a022d86ef1c506a79744c5a95368af356fc69 Author: Anton Khirnov Date: Tue Apr 12 21:17:26 2011 +0200 lavu: remove misc disabled cruft commit 9e5c62c97fc0a6ee5764ec69cc6c237b5f70026b Author: Anton Khirnov Date: Tue Apr 12 21:11:15 2011 +0200 lavu: remove FF_API_OLD_IMAGE_NAMES cruft commit 516fb5e40cf9d591914096be26ba56fc59294669 Author: Anton Khirnov Date: Tue Apr 12 20:57:07 2011 +0200 lavu: remove FF_API_OLD_EVAL_NAMES cruft commit 3453a231a6cebe5989c213be0f9fd6c71ec5ea23 Author: Anton Khirnov Date: Tue Apr 12 20:46:49 2011 +0200 lavc: remove misc disabled cruft. commit 251cf997cff7f3869bca043d20ba771e0588cae3 Author: Anton Khirnov Date: Thu Feb 3 15:00:50 2011 +0100 lavc: remove the FF_API_INOFFICIAL cruft. commit 41d0eb1c81c0d266824dfdbd040a54a6afeec81a Author: Anton Khirnov Date: Thu Feb 3 14:58:59 2011 +0100 lavc: remove the FF_API_SET_STRING_OLD cruft. commit 01a4259b8db344586b371528973439109f3e2ace Author: Anton Khirnov Date: Thu Feb 3 14:51:50 2011 +0100 lavc: remove the FF_API_USE_LPC cruft. commit db4d3a7421ec70de0d5ccd8a9f99b46b5c780d23 Author: Anton Khirnov Date: Thu Feb 3 14:50:06 2011 +0100 lavc: remove the FF_API_SUBTITLE_OLD cruft. commit e89e5afdd04a0f081ecc38b528c1147f204027d7 Author: Anton Khirnov Date: Thu Feb 3 14:48:39 2011 +0100 lavc: remove the FF_API_VIDEO_OLD cruft. commit 9b4f1cdb6a7e838c0261109e8a6262e78657ee7b Author: Anton Khirnov Date: Thu Feb 3 14:48:00 2011 +0100 lavc: remove the FF_API_AUDIO_OLD cruft. commit 20d33ee8b1d2cf5ba4b4d4a81db0ff7b4a125dd3 Author: Anton Khirnov Date: Thu Feb 3 14:45:22 2011 +0100 lavc: remove the FF_API_OPT_SHOW cruft. commit 42420e7b946272bc1e4b2aa2a95512c86db02831 Author: Anton Khirnov Date: Thu Feb 3 14:43:53 2011 +0100 lavc: remove the FF_API_MM_FLAGS cruft. commit 32b80696e0637ca7254c35e6195bdc9ebb2352e0 Author: Anton Khirnov Date: Wed Apr 13 08:01:49 2011 +0200 lavf: remove misc disabled cruft. commit df56d5833959cde9ce60ab43e2923eaaea3287b3 Author: Anton Khirnov Date: Tue Apr 12 20:10:10 2011 +0200 lavf: remove FF_API_INDEX_BUILT cruft commit 7f804085f1be53fac1a28a962c1e34873981b131 Author: Anton Khirnov Date: Thu Feb 3 12:53:28 2011 +0100 lavf: remove FF_API_URL_CLASS cruft. commit 5763e63913940f8d2d2eb8750931e5f12dd2a481 Author: Anton Khirnov Date: Thu Feb 3 12:49:12 2011 +0100 lavf: remove FF_API_SYMVER cruft commit b4c5acabb90cf8e69db2d9f3210d9fa8a7d55ec6 Author: Anton Khirnov Date: Thu Feb 3 12:47:18 2011 +0100 lavf: remove FF_API_FIRST_FORMAT cruft commit 583f6c67b6edfb6a6202944b8ba98b483826a1ec Author: Anton Khirnov Date: Thu Feb 3 12:46:12 2011 +0100 lavf: remove FF_API_PARAMETERS_CODEC_ID cruft commit fc2d3a19c54ad6b272eb7d5142148a01568a9b77 Author: Anton Khirnov Date: Thu Feb 3 12:45:30 2011 +0100 lavf: remove FF_API_LAVF_UNUSED cruft commit 58d5ff0abf657fe0ec3564433ebbde9fc8f71ffd Author: Anton Khirnov Date: Thu Feb 3 12:44:04 2011 +0100 lavf: remove FF_API_PARSE_FRAME_PARAM cruft commit 4df001d77f8f39d2914b21f14ca2236b0ffd6a48 Author: Anton Khirnov Date: Thu Feb 3 12:42:38 2011 +0100 lavf: remove FF_API_ALLOC_FORMAT_CONTEXT cruft commit 5048e36c994663f7f4977efc48c3eec601654e5a Author: Anton Khirnov Date: Thu Feb 3 12:40:25 2011 +0100 lavf: remove FF_API_URL_SPLIT cruft commit c4efa7c22960588ff5163a1cfe026b48b8f6ec41 Author: Anton Khirnov Date: Thu Feb 3 12:39:11 2011 +0100 lavf: remove FF_API_UDP_GET_FILE cruft commit 61573bf1ba50dc8828d0e87d913389fbcff48509 Author: Anton Khirnov Date: Thu Feb 3 12:38:05 2011 +0100 lavf: remove FF_API_GUESS_FORMAT cruft commit dcd4a7b62f16793c33fa459889e581286d6ccdd6 Author: Anton Khirnov Date: Thu Feb 3 12:36:18 2011 +0100 lavf: remove FF_API_REGISTER_PROTOCOL cruft commit 468644f6c185c23affcb36939192b03cd166797f Author: Anton Khirnov Date: Thu Feb 3 12:32:59 2011 +0100 lavf: remove FF_API_URL_RESETBUF cruft commit 575c18da1b5053e244ccbfbcced176b5a63dbb25 Author: Anton Khirnov Date: Thu Feb 3 12:30:16 2011 +0100 lavf: remove FF_API_OLD_METADATA cruft commit 761ad429680637411882552921a9d5acb6aff59e Author: Anton Khirnov Date: Thu Feb 3 12:25:54 2011 +0100 lavf: remove FF_API_MAX_STREAMS cruft commit aad2f2f477d6804f5f79ccce55b3d7f54b00f715 Author: Kostya Date: Mon Apr 18 05:32:14 2011 +0000 document introduction of side data in APIchanges this should've been written earlier, sorry Signed-off-by: Anton Khirnov commit 151cd4f98225c0c5cab8fb29e1dbc0719f7f67e3 Author: Diego Biurrun Date: Tue Apr 19 08:47:59 2011 +0200 pcm: Add const to cast in ENCODE macro. This fixes a lot of warnings of the sort: libavcodec/pcm.c:105: warning: cast discards qualifiers from pointer target type commit e61b83d29e1b273a7d4d1d982aac68cf26a0a3ee Author: Nicolas George Date: Fri Apr 15 19:18:04 2011 +0200 Ogg: add support for Xiph's CELT (Opus) codec. This patch also introduces CODEC_ID_CELT. Signed-off-by: Nicolas George commit 484a3308903d3e9a01cbc0ba2504ef3f5850c076 Author: Stefano Sabatini Date: Sun Apr 17 17:19:05 2011 +0200 pad: make the filter parametric Address trac issue #61. Signed-off-by: Stefano Sabatini commit 39e69d0b88bf521097feeaa2ec5f390dd1e27723 Author: Peter Belkner Date: Tue Apr 19 12:00:01 2011 +0200 32bit libmp3lame support. commit 22fa406f384eb9d825b1d691332e1f928750d55b Author: Peter Belkner Date: Tue Apr 19 11:58:53 2011 +0200 Check avcodec_alloc_frame() failure. Signed-off-by: Michael Niedermayer commit c438c9075655951a8de2c41af1f76574cf22ab85 Author: Stefano Sabatini Date: Sat Apr 16 23:18:22 2011 +0200 ffmpeg: reformat resample condition code in transcode() Signed-off-by: Stefano Sabatini commit 0f230c53df9001023b0c9e35b467096336beed85 Author: Stefano Sabatini Date: Sat Apr 16 23:11:01 2011 +0200 ffmpeg: factorize resampling condition check in do_video_out() Simplify and improve readability. Signed-off-by: Stefano Sabatini commit 6a46aab49b68a79973dfa86f0966c081fc807961 Author: Stefano Sabatini Date: Sun Apr 17 01:38:09 2011 +0200 ffmpeg: prefer "dec" over "ist->st->codec" in do_video_out() snippet Simplify, ease readability. Signed-off-by: Stefano Sabatini commit dfc6f5ae9038a73f6cedc125b01c95124cb0f102 Author: Stefano Sabatini Date: Sat Apr 16 22:58:13 2011 +0200 ffmpeg: improve reporting if size/pixel format changes Use av_log() rather than fprintf(stderr, ...), and show information related to the previous size/pixel format configuration. Consistent with the corresponding message issued in case of audio configuration change. Signed-off-by: Stefano Sabatini commit 58bc9ac5cbdfac49ba81add3414a9a62e05c11d2 Author: Stefano Sabatini Date: Sat Apr 16 23:14:44 2011 +0200 ffmpeg: remove unused fields AVOutputStream.original_width/height Signed-off-by: Stefano Sabatini commit b0b83973d11a93de142994d3230e7b2b8b42ddb5 Author: Stefano Sabatini Date: Sat Apr 16 22:51:04 2011 +0200 ffmpeg: remove unused variable padding_src in do_video_out() Signed-off-by: Stefano Sabatini commit 9d7244c4c60d9f85f58b3770065a394c71fdce3f Author: Michael Niedermayer Date: Tue Apr 19 11:50:32 2011 +0200 Typo Signed-off-by: Michael Niedermayer commit 133208ffb31daeb5eb1d3ef827c2a2d9da78bdad Author: Carl Eugen Hoyos Date: Tue Apr 19 11:50:27 2011 +0200 Be more verbose when printing the probe result. commit 25347c880f44dbe4bb0f23d6a087c22f4a218c10 Author: Gavin Kinsey Date: Tue Apr 19 10:16:07 2011 +0200 Fix compilation.for iOS ARMv7. commit 9b53bb8b3bb89ec1a0f67c34d7c5e6cdcb558b48 Author: Carl Eugen Hoyos Date: Tue Apr 19 03:23:46 2011 +0200 Only ask once in the code for a TrueHD sample with strange channel layout. commit d3f126df4bf97d464ca34b7071283f692af9f541 Author: Carl Eugen Hoyos Date: Tue Apr 19 03:18:08 2011 +0200 Also set the MLP/TrueHD channel layout in the decoder. Applications might not use the parser, commit 280a789fe218351a1f137366a1eabde87313049a Author: Carl Eugen Hoyos Date: Tue Apr 19 03:09:11 2011 +0200 Make MLP/TrueHD channel layout functions visible to the decoder. commit 7aee08997813a0e9a366b0e68fc10180339315a4 Merge: c967860 a304071 Author: Michael Niedermayer Date: Tue Apr 19 02:24:03 2011 +0200 Merge branch 'master' into oldabi * master: (22 commits) ffmpeg:Daemon mode, add -d as first option to try it. Signed-off-by: Michael Niedermayer ffmpeg:Fix negative verbositiy Signed-off-by: Michael Niedermayer Include authorship information from ffmpeg-mt at Ronald S. Bultjes request. In mov and flv muxer, check aac bitstream validity. Added key_frame and pict_type to vsrc_movie Allow h264pred_init_arm.c to compile. anm decoder: move buffer allocation from decode_init() to decode_frame() vsrc_movie: fix leak in request_frame() Replace mplayerhq.hu URLs by libav.org. asfdec: Remove dead code from asf_read_close(). ptx: Use av_log_ask_for_sample() where appropriate. Merge remote-tracking branch 'ffmpeg-mt/master' 10l, commit that should have been stashed into the merge. Signed-off-by: Michael Niedermayer Update regtest checksums after revision 6001dad. Replace more FFmpeg references by Libav. ac3dec: fix processing of delta bit allocation information. vc1: fix fate-vc1 after previous commit. wmv3dec: fix playback of complex WMV3 files using simple_idct. Replace references to ffmpeg-devel with libav-devel; fix roundup URL. make av_dup_packet() more cautious on allocation failures ... Merged-by: Michael Niedermayer commit a3040715e1f0db1af0c27566a306c4a27ad07dcd Merge: 39aafa5 f0a41af Author: Michael Niedermayer Date: Tue Apr 19 02:06:57 2011 +0200 Merge commit 'f0a41afd8a37ebe972436fabfa3d289178bbd83b' * commit 'f0a41afd8a37ebe972436fabfa3d289178bbd83b': Not pulled: Replace mplayerhq.hu URLs by libav.org. asfdec: Remove dead code from asf_read_close(). ptx: Use av_log_ask_for_sample() where appropriate. Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer commit 39aafa5ee90e10382e2f991e4d79d7852231df68 Author: Michael Niedermayer Date: Mon Apr 18 13:10:52 2011 +0200 ffmpeg:Daemon mode, add -d as first option to try it. Signed-off-by: Michael Niedermayer commit 17ee7b5515cd1006a1f7ba4a9cced14f6526c1b0 Author: Michael Niedermayer Date: Mon Apr 18 13:04:33 2011 +0200 ffmpeg:Fix negative verbositiy Signed-off-by: Michael Niedermayer commit 9c3ad1afc861bcf2ce113c22f1d92679168244ed Author: Michael Niedermayer Date: Tue Apr 19 01:07:55 2011 +0200 Include authorship information from ffmpeg-mt at Ronald S. Bultjes request. commit d11818eff42681eec9b8106e317a95766506821a Author: Diego Biurrun Date: Mon Apr 18 23:12:40 2011 +0200 Remove now obsolete references to _g-suffixed binaries. Automatic stripping of binaries was removed in commit e0be794 and the _g binaries disappeared along with it. commit c22f2527ed33c429022dee6ee9e70c349145343e Author: Baptiste Coudurier Date: Fri Jan 28 21:32:09 2011 -0800 In mov and flv muxer, check aac bitstream validity. commit facc48f157a282e9d99a9bf65f5985bace4606b9 Author: Luca Barbato Date: Mon Apr 18 22:12:50 2011 +0200 libvo-aacenc,libvo-amrwbenc}: fix api usage Use the correct error codes and format identifier. commit 77f6b4d58eb76f4dbf208a8bfbd3dbf6e06da8f4 Author: royger Date: Mon Apr 18 17:50:16 2011 +0200 Added key_frame and pict_type to vsrc_movie Signed-off-by: Roger Pau Monné Signed-off-by: Michael Niedermayer commit fccff6e83ae343870f2aa9f5e29ff955bacac8d1 Author: Bill Pringlemeir Date: Fri Apr 15 13:15:23 2011 -0400 Allow h264pred_init_arm.c to compile. SOB: Bill Pringlemeir Signed-off-by: Michael Niedermayer commit 62931e11d6b74386eeb377d1f677f55aca13ab3e Author: Peter Ross Date: Sat Apr 16 00:59:19 2011 +1000 anm decoder: move buffer allocation from decode_init() to decode_frame() This permits playback in ffplay when libavfilter is enabled. Resolves ticket #60 Signed-off-by: Michael Niedermayer commit 139f3ac42dcf24eb8c59af4aaab4e9afdccbc996 Author: Anton Khirnov Date: Thu Feb 3 12:18:16 2011 +0100 Bump major versions of all libraries. They've accumulated enough new APIs and corresponding deprecated cruft. This breaks API and ABI. commit dc8e1b75e721ee10a8ba34311ee622e7a6aa74c6 Author: Stefano Sabatini Date: Mon Apr 18 19:21:25 2011 +0200 vsrc_movie: fix leak in request_frame() Also set movie->picref to NULL, in order to avoid a crash in uninit() when movie->picref is unreffed again and it was already freed. Fix trac issue #66. Signed-off-by: Stefano Sabatini commit f0a41afd8a37ebe972436fabfa3d289178bbd83b Author: Diego Biurrun Date: Sun Apr 17 20:13:59 2011 +0200 Replace mplayerhq.hu URLs by libav.org. commit 0b5ae1fdd31ace06b507350128c6d15384e8f3df Author: Diego Biurrun Date: Sun Apr 17 19:48:27 2011 +0200 asfdec: Remove dead code from asf_read_close(). commit 259a3e70ed828d85f0e588f90e73350a923c9cbc Author: Diego Biurrun Date: Sun Apr 17 23:42:10 2011 +0200 ptx: Use av_log_ask_for_sample() where appropriate. commit 7e2eb4bacd70541702bd086ab2a39cb7653d314e Author: Alexander Strange Date: Mon Apr 18 00:47:35 2011 +0200 Merge remote-tracking branch 'ffmpeg-mt/master' * ffmpeg-mt/master: Release unused pictures even when not calling ff_h264_frame_start() h264: Fix decoding race condition with PAFF h264: cosmetic whitespace change Duplicate Fix REBASE_PICTURE with h.264 Not pulled Update test scripts to use ffmpeg instead of ffmpeg_g Duplicate Fix ffmpeg-mt fixme in h264 Signed-off-by: Michael Niedermayer commit 2d2b5a1421ee652f76a756024d0210f0b6455fda Author: Michael Niedermayer Date: Sun Apr 17 23:57:50 2011 +0200 10l, commit that should have been stashed into the merge. Signed-off-by: Michael Niedermayer commit c40798441f47341c310b38e8f329cfb943924faf Merge: c967860 fd0c340 Author: Michael Niedermayer Date: Sun Apr 17 23:36:57 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: ac3dec: fix processing of delta bit allocation information. vc1: fix fate-vc1 after previous commit. wmv3dec: fix playback of complex WMV3 files using simple_idct. make av_dup_packet() more cautious on allocation failures make containers pass palette change in AVPacket introduce side information for AVPacket Politic commits that have not been pulled: Update regtest checksums after revision 6001dad. Replace more FFmpeg references by Libav. Replace references to ffmpeg-devel with libav-devel; fix roundup URL. Merged-by: Michael Niedermayer commit fd0c3403f611d31b944216cfa1585a2d28f7f0da Author: Diego Biurrun Date: Sun Apr 17 22:18:00 2011 +0200 Update regtest checksums after revision 6001dad. The string "FFmpeg" was replaced by "Libav" in metadata that got encoded in file headers. commit 6001dad6e2eb654fba9bf3d6bda6a3734253cbc6 Author: Diego Biurrun Date: Fri Apr 15 22:30:26 2011 +0200 Replace more FFmpeg references by Libav. commit 4c64c8e95a02b1d69aabb400fa73cba7ef8f41f7 Author: Justin Ruggles Date: Sun Apr 17 12:26:47 2011 -0400 ac3dec: fix processing of delta bit allocation information. The number of dba segments is the coded value + 1. The coupling dba offset starts at the first coupling band, not at zero. commit c96786008172f669e546ca987e7aaa3c3469be71 Author: Stefano Sabatini Date: Sun Apr 17 17:23:48 2011 +0200 scale: set evaluated value for the "out_w" and "out_h" constants The constant values were never set, thus the evaluation of expressions referencing those constants were resulting in an error. Signed-off-by: Stefano Sabatini commit e93d3334a94ed6d23380bd421c9bfe8984785c07 Author: Stefano Sabatini Date: Sun Apr 17 16:26:53 2011 +0200 scale: fix computation for the "hsub" and "vsub" constants Signed-off-by: Stefano Sabatini commit 0b05864eef3d5323ee02515e3b62693230f7e4fb Author: Ronald S. Bultje Date: Sat Apr 16 19:29:05 2011 +0000 vc1: fix fate-vc1 after previous commit. PROFILE_ADVANCED doesn't set res_fasttx, so make that a special case in the condition that decides which IDCT to use (and whether to read coefficients transposed or not). Signed-off-by: Kostya Shishkov commit 14360e078326f482d5ae39fe4d2e6038118c95ed Author: Baptiste Coudurier Date: Sat Apr 16 16:59:39 2011 -0700 Remove now useless ffpresets for x264, use -preset commit 0140d3f0921e5cbb6ea8706acb0307f7ff57a133 Author: Baptiste Coudurier Date: Sat Apr 16 16:50:50 2011 -0700 In libx264 wrapper, add -preset and -tune options commit abf8342aa94bdf06bb324f6723a6743dd628d5c6 Author: Baptiste Coudurier Date: Sat Apr 16 16:47:24 2011 -0700 ffmpeg: fix -aspect cli option Redesign the way -aspect option is handled. This is done by making ffmpeg read the sample aspect ratio set in the corresponding input stream by default, and overriding it using the value specified by -aspect. If the output display aspect ratio is specified with -aspect, it is set at the end of the filterchain, thus overriding the value set by filters in the filterchain. This implementation is more robust, since does not modify the filterchain description (which was creating potential syntax errors). commit 0ba8485666f532f2dbab716f74e1be1189102c89 Author: Baptiste Coudurier Date: Sat Apr 16 16:19:10 2011 -0700 In mov muxer, compute avg bitrate in esds commit 1aeb88b77ddbd3802127a61bf8610e55b6c49a6f Author: Michael Niedermayer Date: Sat Apr 16 23:20:48 2011 +0200 Correctly implement ac3 float/fixed encoder. There is no need to have 2 encoders, the input sample format can,does and should choose which is used Signed-off-by: Michael Niedermayer commit bdf3d3bf9dce398acce608de77da205e08bdace3 Author: Stefano Sabatini Date: Mon Apr 11 13:16:07 2011 +0200 ffmpeg: use parse_number_and_die() when it makes sense Prefer parse_number_or_die() over atoi()/atol() parsing for the options: -pass, -top, -vc, and -qscale. Improve input validation. Signed-off-by: Stefano Sabatini commit 584c2f1db82fbb8024ba2b6b4c48397efedcc125 Author: Stefano Sabatini Date: Sat Apr 16 13:41:53 2011 +0200 cmdutils: add OPT_INT check in parse_number_or_die() Check that the value passed for an OPT_INT option is an int, fail otherwise. commit 58bb6b7d9327eeed4d450e23c1316c439b6204a9 Author: Ronald S. Bultje Date: Sat Apr 16 15:07:14 2011 -0400 wmv3dec: fix playback of complex WMV3 files using simple_idct. IDCT coefficients are read transposed, but simple_idct does not expect this. Therefore, only do tranposed coefficient reading if we're not using simple_idct. Fixes http://forum.videolan.org/viewtopic.php?f=14&t=89651 commit 3c10843f15badfb300b32e77cb476a851641a0be Author: Reimar Döffinger Date: Thu Apr 7 22:41:47 2011 +0200 Use av_set_pts_info to set time_base. Also remove useless assignments of 0, the priv context is initialized to 0. commit f0a68a20a7761447c685a6c0c930a5ffdae11797 Author: Reimar Döffinger Date: Thu Apr 7 22:35:43 2011 +0200 Enable header parsing for MPEG2VIDEO to get time-stamps. FFmpeg can generate pts and dts on its own, but only if we enable parsing, so do that. This fixes ticket #46. commit bd9430db691d519cf0ed3922007faa7c68a7c223 Author: Philip Langdale Date: Wed Apr 13 22:00:18 2011 -0700 CrystalHD: Fix usage of h264 parser. I was using the wrong value to track the position of the parser in the stream. For an error-free stream, the size of the frame and number of bytes consumed will be the same, but in an error situation they can diverge. Signed-off-by: Philip Langdale commit 09a1416db78f49fb3a39cdf5a4bd0f5c5f849ce0 Author: Roger Pau Monné Date: Sat Apr 16 10:09:15 2011 +0200 Add key_frame and pict_type to AVFilterBufferRefVideo. commit d3b379b95b0da8e4d612a9a1987ba6fd8f2bd8bf Merge: f6302ad 4d012eb Author: Michael Niedermayer Date: Sat Apr 16 03:55:42 2011 +0200 Merge commit '4d012eb541ed7f35e00c87035a470d9f0a24a6e8' * commit '4d012eb541ed7f35e00c87035a470d9f0a24a6e8': xwma: Fix wrong printf format expression. xwma demuxer: typos oggdec: simplify audio chained ogg streams support Merged-by: Michael Niedermayer commit f6302ad6ee12bd1eeee9fb2d5642290c0ec5bb1b Merge: f4bc923 f668afd Author: Michael Niedermayer Date: Sat Apr 16 03:46:27 2011 +0200 Merge commit 'f668afd4896ee65683619b6f165dda4cdd46766f' * commit 'f668afd4896ee65683619b6f165dda4cdd46766f': swscale: fix "ISO C90 forbids mixed declarations and code" warning swscale: fix compilation with --enable-runtime-cpudetect swscale: correct include path to fix ppc altivec build swscale: simplify rgb2rgb templating swscale: simplify initialization code swscale: further cleanup swscale.c swscale: partially move the arch specific code left swscale: move away x86 specific code from rgb2rgb None of above is merged, the changes are not yet ready they add over 2000 lines of duplicated code and a few bugs Merged-by: Michael Niedermayer commit 14622ef05d36693aad4a92bb6313bb9d2a03c8dc Author: Diego Biurrun Date: Fri Apr 15 17:49:36 2011 +0200 Replace references to ffmpeg-devel with libav-devel; fix roundup URL. commit c0eee89337be5f5728e7da84aa15c658e07506ca Author: Kostya Shishkov Date: Wed Apr 13 17:36:02 2011 +0200 make av_dup_packet() more cautious on allocation failures Signed-off-by: Luca Barbato commit 2d8591c27e2dc582a7020e2580e16278dbfbddff Author: Kostya Shishkov Date: Sat Apr 9 15:49:51 2011 +0200 make containers pass palette change in AVPacket Signed-off-by: Luca Barbato commit 4de339e219908ff44cbb1d823edeeead3b8facda Author: Kostya Shishkov Date: Sat Apr 9 15:31:39 2011 +0200 introduce side information for AVPacket Signed-off-by: Luca Barbato commit 4d012eb541ed7f35e00c87035a470d9f0a24a6e8 Author: Diego Biurrun Date: Fri Apr 15 13:28:04 2011 +0200 xwma: Fix wrong printf format expression. Also add inttypes.h #include for PRId64 macros. This fixes the following warnings: libavformat/xwma.c:147: warning: too many arguments for format libavformat/xwma.c:151: warning: too many arguments for format commit ef8b54fc883e2a91cbca37b50904e1a0659bb121 Author: Max Horn Date: Fri Apr 15 09:43:15 2011 +0200 xwma demuxer: typos Signed-off-by: Diego Biurrun commit f4bc923ec1b367ebdbc626da3bc0fa5a57e60910 Author: Carl Eugen Hoyos Date: Fri Apr 15 11:50:28 2011 +0200 Allow to print wider unsupported channel layouts. commit 7c8c55ff03539f7eb5d8ad602da2655d61aa3cae Author: Carl Eugen Hoyos Date: Fri Apr 15 11:48:03 2011 +0200 Warn if Vorbis does not support the provided channel layout. The warning is printed with loglevel error because the output stream is known to be broken. Also warn if no channel layout was provided for multichannel input. commit 8f3eebd663b4d775b001a6924eec3efdc473821d Author: Clément BÅ“sch Date: Sun Apr 10 09:26:43 2011 +0200 oggdec: simplify audio chained ogg streams support Signed-off-by: Luca Barbato commit f668afd4896ee65683619b6f165dda4cdd46766f Author: Janne Grunau Date: Fri Apr 15 09:12:34 2011 +0200 swscale: fix "ISO C90 forbids mixed declarations and code" warning only hit with --enable-runtime-cpudetect commit 7f2ae5c7af374dfe254195a9375974a2ff9395a7 Author: Janne Grunau Date: Fri Apr 15 02:09:44 2011 +0200 swscale: fix compilation with --enable-runtime-cpudetect commit 85b21147594101ba2d8e7ea2cfa504c0d1baee5a Merge: 256c5b0 a3a0af4 Author: Michael Niedermayer Date: Fri Apr 15 04:37:17 2011 +0200 Merge commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864' * commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864': avutil: make aes and sha api public handle malloc failures in ff_get_wav_header add xWMA demuxer mpegts: force the default timebase libavcodec: Bump micro after adding the dtx AVOptions Merged-by: Michael Niedermayer commit b6cad3df822969b31bb93eaf677e52a72416bc97 Author: Janne Grunau Date: Fri Apr 15 00:31:04 2011 +0200 swscale: correct include path to fix ppc altivec build commit 256c5b08bf09cb6403790d731cc1c771d8fb0e94 Author: Michael Niedermayer Date: Thu Apr 14 22:35:23 2011 +0200 Fix BE/LE order of pix formats Signed-off-by: Michael Niedermayer commit 6216fc70b74e01a5272085329aa92f5ac797f9cf Author: Luca Barbato Date: Thu Apr 14 22:03:45 2011 +0200 swscale: simplify rgb2rgb templating MMX is always built. Drop the ifdefs commit 33a0421bbaa64f4e9c3d852b7f225ede8dad1388 Author: Josh Allmann Date: Wed Apr 13 20:57:32 2011 +0200 swscale: simplify initialization code Simplify the fallthrough case when no accelerated functions can be initialized. commit 735bf1951171a1e0ee4292e84a1b1beac45dd0ab Author: Josh Allmann Date: Wed Apr 13 20:57:31 2011 +0200 swscale: further cleanup swscale.c Move x86-specific constants out of swscale.c commit 86330b4c9258d5e583c0db033d1e68f46443307c Author: Luca Barbato Date: Wed Apr 13 20:57:30 2011 +0200 swscale: partially move the arch specific code left PPC and x86 code is split off from swscale_template.c. Lots of code is still duplicated and should be removed later. Again uniformize the init system to be more similar to the dsputil one. Unset h*scale_fast in the x86 init in order to make the output consistent with the previous status. Thanks to Josh for spotting it. commit c0038328830d7b341c28d7c99b0236a33617fd21 Author: Luca Barbato Date: Wed Apr 13 20:57:29 2011 +0200 swscale: move away x86 specific code from rgb2rgb Keep only the plain C code in the main rgb2rgb.c and move the x86 specific optimizations to x86/rgb2rgb.c Change the initialization pattern a little so some of it can be factorized to behave more like dsputils. commit a3a0af4fb1237bed0af75868073f9a63db8b1864 Author: Alexis Ballier Date: Thu Apr 7 10:19:23 2011 -0300 avutil: make aes and sha api public The functions are already av_ prefixed and sha1 header is already provided. Install libavutil/{aes,sha}.h Signed-off-by: Michael Niedermayer Signed-off-by: Luca Barbato commit ca402f32e392590a81a1381dab41c4f9c2c2f98a Author: Max Horn Date: Tue Apr 12 17:44:20 2011 +0200 handle malloc failures in ff_get_wav_header ff_get_wav_header is reading data from a WAVE file and then uses it (without validation) to malloc a buffer. It then proceeded to read data into the buffer, without verifying that the allocation succeeded. To address this, change ff_get_wav_header to return an error if allocation failed, and adapted all calling code to handle that error. Signed-off-by: Luca Barbato commit ad4c50347a46a67807925245e730f738cb4d6562 Author: Max Horn Date: Tue Apr 12 13:59:39 2011 +0200 add xWMA demuxer Signed-off-by: Luca Barbato commit 0a962e61e956addb7cdc829e41b82fd76bea55db Author: Rudolf Polzer Date: Thu Apr 14 11:12:57 2011 +0200 mpegts: force the default timebase The mpegts muxer does not set the stream time base using av_set_pts_info, but expects it to have the default value of 1/90000. If the calling code changes stream pts before writing the header, other muxers override the time base at that point (like mpegenc.c). commit 302152d40b6858edca89ad1b5f86a029c323f8c3 Author: Martin Storsjö Date: Thu Apr 14 01:04:53 2011 +0300 libavcodec: Bump micro after adding the dtx AVOptions Signed-off-by: Martin Storsjö commit b8a44442660cb55012951151b2a462923bdcea22 Author: Carl Eugen Hoyos Date: Thu Apr 14 04:16:53 2011 +0200 AV_CH_LAYOUT_2_2 does not need channel reordering for alsa output. commit 6daf513cf24a99ddddb7e748fc150f37bcd323f3 Author: Carl Eugen Hoyos Date: Thu Apr 14 03:43:58 2011 +0200 Fix channel order for 7.1 TrueHD samples. commit 939a12e25d956850613f9c6c416e12de305f444b Author: Carl Eugen Hoyos Date: Thu Apr 14 03:14:05 2011 +0200 Fix channel order for some MLP samples. commit 19de9d5646ad9f1a5f5951d0c15353014808aea4 Author: Carl Eugen Hoyos Date: Thu Apr 14 01:28:14 2011 +0200 Cosmetics: Fix indentation and move one line. commit 460acdf059906da5d378a3414bb9053b401e484d Author: Carl Eugen Hoyos Date: Thu Apr 14 01:20:11 2011 +0200 Support alsa channel reordering for float. commit e2049edb4e6663c658d888ae0cf3632607333e12 Author: Carl Eugen Hoyos Date: Thu Apr 14 01:14:19 2011 +0200 Add forgotten line to silence a warning for int32. AV_CH_LAYOUT_QUAD is the only (multi-) channel layout that has the same channel ordering for FFmpeg and alsa. commit 47c0c8ca9dba13618edce9da347f563ec1d9d811 Author: Carl Eugen Hoyos Date: Thu Apr 14 01:10:18 2011 +0200 Also support alsa channel reordering for u16 and u32 formats. commit 1171d45f6cd3e6194bb3f3351b9945455da69538 Author: Carl Eugen Hoyos Date: Thu Apr 14 01:07:01 2011 +0200 Rename the s16 and s32 alsa reorder functions as int16 and int32. The functions will also be used for unsigned formats. commit 0ae2a0366f31f82cc5f8db7cc4d52e34b68a7f8a Author: Carl Eugen Hoyos Date: Thu Apr 14 01:04:18 2011 +0200 Support unsigned variants of already supported signed formats in alsa. commit 075a55603fe8cfefad86be65048368e411bf5a33 Author: Carl Eugen Hoyos Date: Thu Apr 14 01:00:26 2011 +0200 Support a-law and mu-law output in alsa. commit c55780dcef1ba87564d8003cded7d045dce9ba34 Merge: ff5278d 651b276 Author: Michael Niedermayer Date: Thu Apr 14 03:21:38 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: (32 commits) libopencore-amr, libvo-amrwbenc: Allow enabling DTX via private AVOptions libopencore-amr, libvo-amrwbenc: Only check the bitrate when changed libopencore-amr, libvo-amrwbenc: Find the closest matching bitrate libvo-*: Fix up the long codec names libavcodec: Mark AVCodec->priv_class const swscale: Factorize FAST_BGR2YV12 definition. libvo-aacenc: Only produce extradata if the global header flag is set lavf: postpone removal of public metadata conversion API lavc: postpone removal of request_channels lavc: postpone removal of audioconvert and sample_fmt wrappers lavf: postpone removal of deprecated avio functions libopencore-amr: Cosmetics: Rewrap and align libopencore-amr, libvo-amrbwenc: Rename variables and functions libopencore-amr: Convert commented out debug logging into av_dlog libopencore-amr: Remove an unused state variable libvo-amrwbenc: Don't explicitly store bitrate modes in the bitrate table libopencore-amr: Remove a useless local variable libopencore-amr, libvo-amrwbenc: Make the bitrate/mode mapping array static const libopencore-amr, libvo-amrwbenc: Return proper error codes in most places libopencore-amr: Don't print carriage returns in log messages ... Conflicts: doc/developer.texi libavcodec/avcodec.h libavcodec/libvo-aacenc.c libavcodec/libvo-amrwbenc.c Merged-by: Michael Niedermayer commit 651b276ef7ad8d89e89bfc94a4232ab6c36f3a8a Author: Martin Storsjö Date: Wed Apr 13 21:47:12 2011 +0300 libopencore-amr, libvo-amrwbenc: Allow enabling DTX via private AVOptions DTX, discontinuous transmission, allows emitting frames with comfort noise when no voice is detected in the input audio. Signed-off-by: Martin Storsjö commit 3dd82afc748df0f1c49b76e1cd4ea6e35b1001a5 Author: Martin Storsjö Date: Wed Apr 13 11:03:19 2011 +0300 libopencore-amr, libvo-amrwbenc: Only check the bitrate when changed Also rename the incorrectly named enc_bitrate to enc_mode, use the enc_bitrate variable for storing the last chosen bitrate. This avoids continuous warning log messages if not using an exactly matching bitrate, while still allowing changing bitrate at any point. Signed-off-by: Martin Storsjö commit 70739381213b087cca9570b66561dc57652b6fb9 Author: Martin Storsjö Date: Wed Apr 13 10:59:08 2011 +0300 libopencore-amr, libvo-amrwbenc: Find the closest matching bitrate Dynamically print the supported bitrates from the local table, instead of using a hardcoded log message. Signed-off-by: Martin Storsjö commit 957635ba1435d95209ee43c7e9fa0195dcf60152 Author: Martin Storsjö Date: Wed Apr 13 22:31:20 2011 +0300 libvo-*: Fix up the long codec names Include VisualOn to clarify the codec name, but remove the actual library name from the user-friendly description. Also mention Android, to clarify which VisualOn implementation this refers to, since they do sell other variants of the same code, too. Signed-off-by: Martin Storsjö commit 567ad0e31d94512410fd02ead1a1d6f72d369456 Author: Martin Storsjö Date: Wed Apr 13 21:48:00 2011 +0300 libavcodec: Mark AVCodec->priv_class const This avoids warnings of this kind, everywhere priv_class is initialized: warning: initialization discards qualifiers from pointer target type Signed-off-by: Martin Storsjö commit 0e1a5434e2d30d0f57770110c1e358c8eccf9f82 Author: Luca Barbato Date: Mon Apr 11 19:48:13 2011 +0200 swscale: Factorize FAST_BGR2YV12 definition. It is used only for x86 so it will eventually be moved with that code into the x86 arch subdirectory. commit ff5278d8f6203a9486c0cd63a3aecef4bc2e4f6f Author: Carl Eugen Hoyos Date: Tue Apr 12 08:51:58 2011 +0200 Mention VisualOn in the new codecs' long names to explain "libvo". commit 2d3267936a40c0a8db6ab76aeb0017e1959ae2fa Author: Martin Storsjö Date: Tue Apr 12 10:35:23 2011 +0300 libvo-aacenc: Only produce extradata if the global header flag is set Signed-off-by: Martin Storsjö commit 451d566f4b51bd4d371d7125fe458bcac3869a77 Author: Anton Khirnov Date: Wed Feb 23 07:38:52 2011 +0100 lavf: postpone removal of public metadata conversion API It's been deprecated only a few months ago, long after 0.6. commit c77673271280267cc6fb77acdfb189c578df058e Author: Anton Khirnov Date: Wed Apr 6 07:47:26 2011 +0200 lavc: postpone removal of request_channels No decoder uses the supposed replacement, request_channel_layout, yet. commit d6ead39ee7c6b21a7e5f44defed7339673b026b6 Author: Anton Khirnov Date: Wed Apr 6 07:31:32 2011 +0200 lavc: postpone removal of audioconvert and sample_fmt wrappers Those were moved to libavutil only recently. commit 548e62c5aedcf86a08c3c423b9367e94727ad86b Author: Anton Khirnov Date: Wed Feb 23 07:39:59 2011 +0100 lavf: postpone removal of deprecated avio functions They've been deprecated very recently. commit 882221afdee6e5f19d576927898cbcaed7237d80 Author: Martin Storsjö Date: Wed Apr 13 00:25:43 2011 +0300 libopencore-amr: Cosmetics: Rewrap and align Signed-off-by: Martin Storsjö commit 02c63a109f33be807d59cd0659752099b62567e9 Author: Martin Storsjö Date: Wed Apr 13 00:20:26 2011 +0300 libopencore-amr, libvo-amrbwenc: Rename variables and functions Avoid camelCase names for functions and variables. Signed-off-by: Martin Storsjö commit 9b9c6405fd293bb7820256f474406bdb771647a7 Author: Martin Storsjö Date: Wed Apr 13 10:12:56 2011 +0300 libopencore-amr: Convert commented out debug logging into av_dlog Also add the avctx as logging context. Signed-off-by: Martin Storsjö commit 89e7e640f7a29d67b850f170f9cfc9d250a3c1b0 Author: Martin Storsjö Date: Tue Apr 12 23:58:45 2011 +0300 libopencore-amr: Remove an unused state variable Signed-off-by: Martin Storsjö commit 5d211e034eebbbbb006d236d810ebf0516484b51 Author: Martin Storsjö Date: Wed Apr 13 00:42:24 2011 +0300 libvo-amrwbenc: Don't explicitly store bitrate modes in the bitrate table The bitrate modes are equal to the array indices. Signed-off-by: Martin Storsjö commit 0e03f94d61dbfc8b4a33eef1f0227ec791abb5fe Author: Martin Storsjö Date: Wed Apr 13 00:17:48 2011 +0300 libopencore-amr: Remove a useless local variable Signed-off-by: Martin Storsjö commit c48ce4eb50ff299db8f9d0289442ec655a1fb053 Author: Martin Storsjö Date: Wed Apr 13 00:15:01 2011 +0300 libopencore-amr, libvo-amrwbenc: Make the bitrate/mode mapping array static const Signed-off-by: Martin Storsjö commit 900a129f4f16d4bd19a7707b51eb711382a6e42d Author: Martin Storsjö Date: Wed Apr 13 00:10:56 2011 +0300 libopencore-amr, libvo-amrwbenc: Return proper error codes in most places Signed-off-by: Martin Storsjö commit a8ec07c933450eea929f632ee867383ebd55532a Author: Martin Storsjö Date: Wed Apr 13 00:08:14 2011 +0300 libopencore-amr: Don't print carriage returns in log messages Signed-off-by: Martin Storsjö commit 587331414bfee1fc73eb9bcd1e8aaae3a56ec5ee Author: Martin Storsjö Date: Wed Apr 13 00:06:29 2011 +0300 libopencore-amr: Remove an old workaround for libamr header weirdness Signed-off-by: Martin Storsjö commit 57ddffe843b17b741859f9e669433d086dcec09c Author: Martin Storsjö Date: Tue Apr 12 23:56:41 2011 +0300 libopencore-amr: Make the opaque encoder pointer a void* Signed-off-by: Martin Storsjö commit dbff4da91468a5079d017b99f961cb8bfc4e019c Author: Martin Storsjö Date: Tue Apr 12 23:50:51 2011 +0300 libopencore-amr: Remove unused code fragments This parts are heritage from the encoder part from the old libamr code removed in SVN rev 19365. Signed-off-by: Martin Storsjö commit a92a7ddc253a640aba974d859eab20d74cebb3e0 Author: Martin Storsjö Date: Tue Apr 12 00:19:56 2011 +0300 applehttp: Only check the discard flags if v->ctx actually is initialized This code could be executed if the demuxer reads more than one segment before returning from av_open_input_stream. Signed-off-by: Martin Storsjö commit f521746b8362889f29faf2555a3fd645e24adb23 Author: Stefano Sabatini Date: Tue Apr 12 13:10:33 2011 +0200 ffplay: implement -showmode option The new option allows to select the starting show mode. commit f8b8c694e9be3a72a43c8f17d4763c3f4fb74c8b Author: Stefano Sabatini Date: Tue Apr 12 12:33:29 2011 +0200 ffplay: use symbolic constant values for show_audio Also rename VideoState->show_audio to show_mode. Improve readability. commit 8776f3d22e401e30d17856e341f6cabbbefa92f7 Author: Stefano Sabatini Date: Tue Apr 12 12:06:49 2011 +0200 ffplay: remove audio_write_get_buf_size() forward declaration Move up the definition of audio_write_get_buf_size(), so that it is defined before it is used. Simplify. commit a6f395d6c5dc2c3503444c7119bbff628c7b6887 Author: Stefano Sabatini Date: Sun May 2 23:36:45 2010 +0200 ffplay: avoid unnecessary intermediary struct in queue_picture() When CONFIG_AVFILTER, use a AVFrame -> AVPicture cast rather than explicitely copy the image information from AVFrame to a new AVPicture. Signed-off-by: Stefano Sabatini commit c1d4bb5731189cb7851b2be1281359d976873eec Author: Stefano Sabatini Date: Tue Apr 12 17:07:53 2011 +0200 ffplay: remove unused field VideoState.dtg_active_format Signed-off-by: Stefano Sabatini commit 4c362a5212cf16e888e0ef51c3d6b9866152ef5f Author: Luca Barbato Date: Sat Apr 9 23:54:31 2011 +0200 doc: update developer guide Refer to the current submission policy and refer to FATE in the Regression Test section. commit 05d33d8655d4fb11cd47444583ef130048bddd5e Author: Carl Eugen Hoyos Date: Wed Apr 13 09:55:47 2011 +0200 Fix compilation with --disable-avfilter. commit 86a89ae3f2de76f09cd41942eaabde37c13342c3 Author: Anton Khirnov Date: Tue Apr 12 10:01:30 2011 +0200 lavf: bump minor and add an APIChanges entry for the last avio changes commit 4bde56d1afdeb5d8c998bb9f994b0ea829ccf753 Author: Anton Khirnov Date: Tue Apr 12 09:46:45 2011 +0200 avio: deprecate url_exist in favor of avio_check. commit 313176565cf813a1a9cd5b8bc3f59c0b9696390e Author: Stefano Sabatini Date: Thu Sep 30 13:21:42 2010 +0200 file: implement url_check() callback in the file and pipe protocols Signed-off-by: Anton Khirnov commit 175389c85487822f1ee180ee01cc770df896557f Author: Stefano Sabatini Date: Fri Apr 8 18:32:25 2011 +0200 avio: add avio_check() The new function is more flexible than url_exist(), as it allows to specify which access flags to check, and does not require an explicit open of the checked resource. Signed-off-by: Anton Khirnov commit cbea3ac8203690dec29c473399a50f8f6bb76c47 Author: Anton Khirnov Date: Wed Apr 13 07:35:35 2011 +0200 avio: left-shift AVIO_ flags on next bump Now AVIO_RDONLY is defined as 0, so it's not usable as a flag. commit d6f79edb6e5a5477ab4ea36d93aace5b508e6fd3 Author: Michael Niedermayer Date: Wed Apr 13 02:52:16 2011 +0200 flv demuxer: dont error out due to index problems, but inform the user about it. Signed-off-by: Michael Niedermayer commit 9891004ba91a126f56cd02c6f7a7b0c368a158b9 Merge: a0f1747 578d686 Author: Michael Niedermayer Date: Wed Apr 13 02:49:22 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: Partially merged:flvdec: Allow parsing keyframes metadata without seeking in most cases Error out if vaapi is not found avio: undeprecate av_url_read_fseek/fpause under nicer names libvo-*: Don't use deprecated sample format names and enum names DUPLICATE flvdec: Fix support for flvtool2 "keyframes based" generated index DUPLICATE libavcodec: Use "const enum AVSampleFormat[]" in AVCodec initialization Fix the conversion of AV_SAMPLE_FMT_FLT and _DBL to AV_SAMPLE_FMT_S32. Convert some undefined 1<<31 shifts into 1U<<31. Conflicts: configure libavcodec/libvo-aacenc.c libavcodec/libvo-amrwbenc.c libavformat/flvdec.c Marged-by: Michael Niedermayer commit d2940155106c21f04d5a609db7cf655fe1d8d8b1 Author: Alberto Delmas Date: Mon Apr 12 23:16:12 2010 +0200 Check for successful h263 init in msmpeg4 init Signed-off-by: Ronald S. Bultje commit 96573c0d7605672d69b42ae1dcf18764ce47c71a Author: Vitor Sessak Date: Mon Apr 11 16:20:36 2011 -0400 lavf/utils.c: Order packets with identical PTS by stream index. This allows for more reproducible results when using multi-threading. Signed-off-by: Ronald S. Bultje commit a0f17473b37589d8e05f42fefa5a266a2b33831c Author: Reimar Döffinger Date: Wed Apr 13 00:56:18 2011 +0200 ASS decoder also requires ass_split.o to be compiled. commit 578d6861a753eb0b9d277f7ec17d1502eb2bb35a Author: Martin Storsjö Date: Tue Apr 12 16:37:54 2011 +0300 flvdec: Allow parsing keyframes metadata without seeking in most cases Stop the avio input at a point where amf_parse_object can continue parsing the end of the object seamlessly, when all data is available. If unsupported data is encountered within the keyframes object, try seeking to the start of the keyframes object - if the seek back was successful, the caller can continue parsing the rest of the AMF data. Signed-off-by: Martin Storsjö commit f3e3f28e802a108120a1244744ddc1689d26be7a Author: Luca Barbato Date: Mon Apr 4 15:24:19 2011 +0200 Error out if vaapi is not found Make the behaviour consistent with the other external deps. Signed-off-by: Anton Khirnov commit ff1ec0c3f8fce10e92010f82f7e859e08f9c742a Author: Anton Khirnov Date: Tue Apr 12 09:37:10 2011 +0200 avio: undeprecate av_url_read_fseek/fpause under nicer names It seems their replacements won't be ready anytime soon. commit 5c0068758fb8b282398e1d5ec601270b717764b5 Author: Carl Eugen Hoyos Date: Tue Apr 12 17:40:18 2011 +0200 Fix compilation with --disable-yasm. commit 8b7dc087e4c46cd20702882aa50a930e97eeccad Author: Michael Niedermayer Date: Tue Apr 12 14:25:37 2011 +0200 Add forgotten const to enum AVSampleFormat Signed-off-by: Michael Niedermayer commit c5e03cebd31e5bd2b6851d09a60280403a57faf0 Author: Martin Storsjö Date: Tue Apr 12 10:33:35 2011 +0300 libvo-*: Don't use deprecated sample format names and enum names Signed-off-by: Martin Storsjö commit b5304f7b2ec56b872e9a007d7f040930ebe55095 Author: Kharkov Alexander Date: Fri Apr 8 16:20:45 2011 +0700 flvdec: Fix support for flvtool2 "keyframes based" generated index Current keyframes data parser unconditionally rewind metadata to the end at the end of function. As result ALL metadata located after keyframes index not parsed, and as metadata object can have ANY placement inside metadata it can lead to unpredictable result (bitrate can not be found, etc.). As result FLV movie will not play at all in such situation. Signed-off-by: Martin Storsjö commit c41eb2ade4f862dc5f5e7c09c717d4f7f911a15e Author: Martin Storsjö Date: Tue Apr 12 10:32:43 2011 +0300 libavcodec: Use "const enum AVSampleFormat[]" in AVCodec initialization Signed-off-by: Martin Storsjö commit 44a8b0ddd98cc5ef9eeaae73f380c4048a77ffe2 Author: Sven C. Dack Date: Tue Apr 12 09:33:19 2011 +0200 Cosmetics: Rename variable param as the more appropriate dpyname. commit 9af209712099699d717596f55b08b3bac8b6b563 Author: Sven C. Dack Date: Tue Apr 12 09:27:23 2011 +0200 Cosmetics: Fix white-space in av_log() message. commit ff2614ee4ce2c433c841d938ce57654585341c26 Author: Carl Eugen Hoyos Date: Tue Apr 12 09:17:26 2011 +0200 Fix output of AV_CH_LAYOUT_5POINT0 via alsa by reordering channels. commit 71306c5d21d103eed361c880ce3ab26f1e53b8d8 Author: Carl Eugen Hoyos Date: Tue Apr 12 09:11:56 2011 +0200 Support CODEC_ID_PCM_F64* output via alsa (stereo only). commit 5778466e926e402bfd923b4f226413a921aa3c96 Author: Carl Eugen Hoyos Date: Tue Apr 12 08:56:29 2011 +0200 Support CODEC_ID_PCM_S24* output via alsa (stereo only). commit 4e54848bd17d1956e514b0be7a3e672d8a7f7b54 Author: Carl Eugen Hoyos Date: Tue Apr 12 08:55:20 2011 +0200 Use const where appropriate. Spotted by Reimar. commit 72eb6dfe4990238e99c1843ff07e199c44914fa4 Author: Carl Eugen Hoyos Date: Tue Apr 12 08:51:58 2011 +0200 Mention VisualOn in the new codecs' long names to explain "libvo". commit 2f072b55a49eb56b1bcffdda344f21d09981430b Author: Alex Converse Date: Sun Apr 10 23:42:29 2011 -0700 Fix the conversion of AV_SAMPLE_FMT_FLT and _DBL to AV_SAMPLE_FMT_S32. (1<<31) is undefined and seems to be evaluated by gcc to -2^31 when these formulae require 2^31. These conversions still need fate tests. commit 187a537904ef2193a4b5e0312349f95223ff8610 Author: Alex Converse Date: Sat Apr 9 17:22:04 2011 -0700 Convert some undefined 1<<31 shifts into 1U<<31. According to ISO 9899:1999 S 6.5.7/4: The result of E1 << E2 is E1 left-shifted E2 bit positions; vacated bits are filled with zeros. If E1 has an unsigned type, the value of the result is E1× 2^E2, reduced modulo one more than the maximum value representable in the result type. If E1 has a signed type and nonnegative value, and E1× 2^E2 is representable in the result type, then that is the resulting value; otherwise, the behavior is undefined. commit 8eeed0db05966e94bfff53b2010b8c7d4e52e3f9 Author: James Zern Date: Mon Apr 11 17:00:35 2011 -0700 vpxenc: add CQ_LEVEL mapping via the equivalent AVCodecContext::crf modifying the range allowed by options.c (0-51 -> 0-63) update configure check to require libvpx 0.9.6 (Bali) Signed-off-by: Michael Niedermayer commit a299a261de798ddc694111e539c32f0413a02bd8 Author: James Zern Date: Mon Apr 11 17:00:29 2011 -0700 vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping via the equivalent AVCodecContext::mb_threshold Signed-off-by: Michael Niedermayer commit 4727ec3c0e64b9144006abf82e080fb734ad4b0a Merge: 13d4ec8 db46be0 Author: Michael Niedermayer Date: Tue Apr 12 03:43:43 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: Not pulled due to wrong author, according to carl: Add unconditional return statement to yuva420_rgb32_MMX() / yuva420_bgr32_MMX(). Fix compilation of timefilter test program. Add support for AMR-WB encoding via libvo-amrwbenc Add an AAC encoder by using the libvo-aacenc library g722: Return 8 bits per sample for g722 in av_get_bits_per_sample Conflicts: Changelog Merged-by: Michael Niedermayer commit 13d4ec844a7e0e46da42c3ab152e5c3efe0897e3 Author: Aurelien Jacobs Date: Tue Apr 12 02:02:35 2011 +0200 cosmetics: alignment commit df149f6ce89cfe88b135b835b3b7df57f15f0da9 Author: Stefano Sabatini Date: Mon Apr 11 11:12:35 2011 +0200 ffplay: fix weird brace placement in video_image_display() Signed-off-by: Stefano Sabatini commit 3338be24e83c49196cc13ff4d49c402bc27ace90 Author: Stefano Sabatini Date: Mon May 3 00:03:49 2010 +0200 ffplay: rename output_picture2() to output_picture() The "2" suffix is confusing. Signed-off-by: Stefano Sabatini commit 1979d3b8a5821a48c30c0dec3ac9aa183d52c577 Author: Stefano Sabatini Date: Tue Apr 12 01:32:38 2011 +0200 ffplay: remove useless intermediary variable dst_pix_fmt in queue_picture() Simplify. Signed-off-by: Stefano Sabatini commit eef169662891c633819f2017c096b6fdfb6c2517 Author: Stefano Sabatini Date: Tue Apr 12 01:31:42 2011 +0200 ffplay: avoid forward declaration for packet_queue_put() Define the function before it is used. Simplify. Signed-off-by: Stefano Sabatini commit 91b27e49d66b98d894506e653cbd5272fd776108 Author: Stefano Sabatini Date: Sun May 2 22:23:48 2010 +0200 ffplay: compact expression in compute_mod() Prefer "return X ? Y : Z" over "if (x) return Y; else return Z", reduce line count. Signed-off-by: Stefano Sabatini commit 6873cf9bc8f3cb4959df51bdf79f079cee9a7006 Author: Aurelien Jacobs Date: Thu Dec 16 09:16:33 2010 +0100 compute rects duration in ASS decoder Signed-off-by: Aurelien Jacobs commit 3ee8ca9b0894df3aaf5086c643283cb58ef9763d Author: Aurelien Jacobs Date: Tue Apr 5 09:04:48 2011 +0200 add avcodec_get_subtitle_defaults() to initialize AVSubtitle struct Call this new function before decode() to replace the custom and inconsistant initialization in various decoders. This function is equivalent to avcodec_get_frame_defaults() for AVFrame. Signed-off-by: Aurelien Jacobs commit db46be01ecf44608932cfa33e8914a4c38b93431 Author: Diego Biurrun Date: Sun Apr 10 21:12:08 2011 +0200 Add unconditional return statement to yuva420_rgb32_MMX() / yuva420_bgr32_MMX(). When HAVE_7REGS was not defined these functions had an empty body causing the following warnings during compilation. In file included from libswscale/x86/yuv2rgb_mmx.c:58: libswscale/x86/yuv2rgb_template.c: In function ‘yuva420_rgb32_MMX’: libswscale/x86/yuv2rgb_template.c:412: warning: no return statement in function returning non-void libswscale/x86/yuv2rgb_template.c: In function ‘yuva420_bgr32_MMX’: libswscale/x86/yuv2rgb_template.c:457: warning: no return statement in function returning non-void Signed-off-by: Diego Biurrun commit 70ad9842a5d0d685080d4e61243554dfad6dc00e Author: Diego Biurrun Date: Sun Apr 10 21:22:45 2011 +0200 Fix compilation of timefilter test program. The printf function is forbidden in library code, but not in test programs, so #undefine the printf macro that disables the system printf function. Signed-off-by: Diego Biurrun commit f502ff3f61dfdc7c4180b6a24cec6237c38bc148 Author: Martin Storsjö Date: Tue Dec 29 16:48:09 2009 +0200 Add support for AMR-WB encoding via libvo-amrwbenc The wrapper code is based on the libamr wrapper removed in SVN rev 19365. Signed-off-by: Martin Storsjö commit d89e738a0c63b30a60ca1688158d54b204824161 Author: Martin Storsjö Date: Sun Dec 19 21:40:23 2010 +0200 Add an AAC encoder by using the libvo-aacenc library Signed-off-by: Martin Storsjö commit c104a6e90226eaa253aeba471c8859e0da922da7 Author: Michael Niedermayer Date: Mon Apr 11 11:49:07 2011 +0200 oggdec: use av_freep() instead of av_free() Signed-off-by: Michael Niedermayer commit b52a65ccc8ab20512387b31b53788ed5945d2c87 Author: Stefano Sabatini Date: Mon Apr 11 11:29:35 2011 +0200 vsrc_buffer.h: add file doxy Signed-off-by: Stefano Sabatini commit e601ff19b465a0ef75515ecb6366e2c925a791de Author: Stefano Sabatini Date: Sun Apr 3 17:46:43 2011 +0200 vsrc_buffer.h: add multiple inclusion guards Signed-off-by: Stefano Sabatini commit f763a7c6697bcb08321f762e7cf4cc8431678bbf Author: Stefano Sabatini Date: Sun Apr 3 16:48:33 2011 +0200 vsrc_buffer: tweak error message in init() Change: Expected 7 arguments, but only %d found in '%s'\n to: Expected 7 arguments, but %d found in '%s'\n as the user may provide more than 7 arguments, in that case the error is not misleading. commit 029f966c3aa73531a90cb14ca95057f2fb3f0a26 Author: Martin Storsjö Date: Sun Apr 10 20:06:50 2011 +0300 g722: Return 8 bits per sample for g722 in av_get_bits_per_sample This fixes a failing assert in ff_raw_read_header (in fate-g722dec-1), where bits_per_coded_sample is set using this function and is required to have a positive value. Signed-off-by: Martin Storsjö commit ab8cfd45f8dcff5a9d60271b30dc4437756d5985 Merge: 2e92a34 d1c5fdf Author: Michael Niedermayer Date: Mon Apr 11 04:02:45 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: avio: add more documentation for AVIOContext. Parse sprite data for WMVP and WVP2, and decode sprites for the latter Replace outdated info on the FAQ Redefine sameq pad: fix example explanation gradfun: add notice from the MPlayer manual eval: add support for trunc, ceil, and floor functions documentation: add setdar and setsar description to filters.texi avio: document some members of AVIOContext. avio: document avio_close(). avio: cosmetics, vertically align comments. avio: cosmetics, group the reading functions. avio: cosmetics, merge all the FF_API_OLD_AVIO blocks. avio: cosmetics, move AVIOContext to start of the file. avio: update file header. os: fix OpenBSD/PowerPC compilation pixfmt: add PIX_FMT_BGR48LE and PIX_FMT_BGR48BE oggdec: fix demuxing chained audio streams fix typo Conflicts: doc/filters.texi libavformat/avio.h libavutil/pixfmt.h Merged-by: Michael Niedermayer commit 2e92a34cde07ea145e4b8380259881988cf7edd3 Author: Michael Niedermayer Date: Mon Apr 11 00:37:00 2011 +0200 Revert "fbdev: simplify logic in fbdev_read_packet()" This change is buggy. This reverts commit d46c9f83cf495c901e6128ce1042190f620b89c4. commit 5381823eb6687400e793189a769be473586b51ce Author: Stefano Sabatini Date: Sun Apr 3 21:54:57 2011 +0200 ffmpeg: rename configure_filters() to configure_video_filters() Mostly useful for the audio-filters branch, to make more apparent the distinction between configure_audio_filters() and configure_video_filters(). Signed-off-by: Stefano Sabatini commit aa0c515a3cfaa4718a7ac7f2b3ea386daf05c019 Author: Mark Himsley Date: Sun Apr 10 19:18:03 2011 +0200 lavfi: add fieldorder filter Signed-off-by: Stefano Sabatini commit d46c9f83cf495c901e6128ce1042190f620b89c4 Author: Stefano Sabatini Date: Sat Mar 12 15:24:54 2011 +0100 fbdev: simplify logic in fbdev_read_packet() Signed-off-by: Stefano Sabatini commit df2d5b16ef79f3b55c5d46eded79f791f2f529e0 Author: Michael Niedermayer Date: Sun Apr 10 20:44:14 2011 +0200 H264: Allow templating hl_decode_mb based on pixel_size. Signed-off-by: Michael Niedermayer commit 179106ed7890600956f95b42279c4c45cda27f7e Author: Michael Niedermayer Date: Sun Apr 10 19:53:43 2011 +0200 H264: factor if() out of coef decoding loop of decode_cabac_residual_internal() Signed-off-by: Michael Niedermayer commit a50f0bea25a3da605cd547fe3bdfd36c8764b847 Author: Michael Niedermayer Date: Sun Apr 10 17:04:13 2011 +0200 H264: Split out hl_motion and template it, this seems a bit faster Signed-off-by: Michael Niedermayer commit e7077f5e7b509c4fec62620d136a80b676428bb1 Author: Michael Niedermayer Date: Sun Apr 10 16:12:56 2011 +0200 H264: replace pixel_size by pixel_shift Signed-off-by: Michael Niedermayer commit 9b271ce6566585be04120ab1c317343dc9259590 Author: Michael Niedermayer Date: Sun Apr 10 00:28:57 2011 +0200 h264: Print bpp Signed-off-by: Michael Niedermayer commit 5e85298cb50e6fcfbfc6715cbc200ec79334d5c3 Author: Oskar Arvidsson Date: Tue Mar 29 17:49:00 2011 +0200 Enable decoding of high bit depth h264. This patch completes the high bit depth h264 decoding support. Signed-off-by: Michael Niedermayer commit 8dbe5856410ee10ac4a9368105149efdacfac994 Author: Oskar Arvidsson Date: Tue Mar 29 17:48:59 2011 +0200 Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder. This patch lets e.g. dsputil_init chose dsp functions with respect to the bit depth to decode. The naming scheme of bit depth dependent functions is _[_] (i.e. the old clear_blocks_c is now named clear_blocks_8_c). Note: Some of the functions for high bit depth is not dependent on the bit depth, but only on the pixel size. This leaves some room for optimizing binary size. Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Michael Niedermayer commit d268bed209828923b891aeab7979d7ef14a730b2 Author: Oskar Arvidsson Date: Tue Mar 29 17:48:58 2011 +0200 Add support for higher QP values in h264. In high bit depth, the QP values may now be up to (51 + 6*(bit_depth-8)). Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Michael Niedermayer commit 436c4523ed447b88759900b3e6647c5b9d03a63b Author: Michael Niedermayer Date: Sun Apr 10 16:12:18 2011 +0200 H264: fix prefetch Signed-off-by: Michael Niedermayer commit dc172ecc6e59fb3e53af2991e00e0e81fe3c8884 Author: Oskar Arvidsson Date: Tue Mar 29 17:48:57 2011 +0200 Add the notion of pixel size in h264 related functions. In high bit depth the pixels will not be stored in uint8_t like in the normal case, but in uint16_t. The pixel size is thus 1 in normal bit depth and 2 in high bit depth. Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Michael Niedermayer commit 86b0d9cd58137fc499f263267c3219ac6186b98e Author: Oskar Arvidsson Date: Tue Mar 29 17:48:56 2011 +0200 Make the h264 loop filter bit depth aware. Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Michael Niedermayer commit 63cc0e776e16cd59c1793c12307faa2f4833c6bf Author: Oskar Arvidsson Date: Tue Mar 29 17:48:55 2011 +0200 Template dsputil_internal.h with respect to pixel size, etc. Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Michael Niedermayer commit 9abd87bbc69956b3808f0f059f5121785ec234cf Author: Oskar Arvidsson Date: Tue Mar 29 17:48:54 2011 +0200 Template h264idct_internal.h with respect to pixel size, etc. Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Michael Niedermayer commit 2b092f7a1416840d96c16b3c7d64add45e3b8964 Author: Oskar Arvidsson Date: Tue Mar 29 17:48:53 2011 +0200 Template h264pred_internal.h with respect to bit depth, etc. Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Michael Niedermayer commit 21a7c9366fcedfacfa5ab2fa9f5b34dc3d316751 Author: Oskar Arvidsson Date: Tue Mar 29 17:48:52 2011 +0200 Template h264dsp_internal.h with respect to pixel size, etc. Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Michael Niedermayer commit 8dffcca579dcf179ea9f17026980198618276f70 Author: Oskar Arvidsson Date: Tue Mar 29 17:48:51 2011 +0200 Move some functions in dsputil.c into a new file dsputil_internal.h. The functions moved are used when decoding h264. Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Michael Niedermayer commit 7bc8032b0768d06f18cac0fb0d16579aeced8b54 Author: Oskar Arvidsson Date: Tue Mar 29 17:48:50 2011 +0200 Move the functions in h264idct into a new file h264idct_internal.h. Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Michael Niedermayer commit c2f38da9010412fb341266fdf24cb6c9e144c8a2 Author: Oskar Arvidsson Date: Tue Mar 29 17:48:49 2011 +0200 Move the functions in h264pred.c into a new file h264pred_internal.h. Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Michael Niedermayer commit 2431689bb3a8ac86d3713b012504cab7f60f738c Author: Oskar Arvidsson Date: Tue Mar 29 17:48:48 2011 +0200 Move the functions in h264dsp.c into a new file h264dsp_internal.h Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Michael Niedermayer commit d4497f6dfb8dddf25b7be441f16d387aa18a65d6 Author: Oskar Arvidsson Date: Tue Mar 29 17:48:47 2011 +0200 Add pixel formats for 9- and 10-bit yuv420p. Also add support for these formats in libswscale. Needed for high bit depth h264 decoding. Signed-off-by: Michael Niedermayer commit af0b2d6736a99203fed3014a3e83f8226dade2af Author: Oskar Arvidsson Date: Tue Mar 29 17:48:46 2011 +0200 Choose h264 chroma dc dequant function dynamically. Needed for high bit depth h264 decoding. Signed-off-by: Michael Niedermayer commit 488efb33a71683a965c99ddd62ee6c32727ecee9 Author: Michael Niedermayer Date: Sun Apr 10 14:26:59 2011 +0200 H264: Fix slice threads Signed-off-by: Michael Niedermayer commit d1c5fdf8920b75f3b824368b8336f18c74b68803 Author: Anton Khirnov Date: Sun Apr 10 08:14:26 2011 +0200 avio: add more documentation for AVIOContext. commit 701d0eb185192542c4a17f296e39e37cedf7abc6 Author: Reimar Döffinger Date: Fri Apr 8 01:19:21 2011 +0200 Fix input buffer size check in adpcm_ea decoder. Unfortunately the output buffer size check assumes that the input buffer is never over-consumed, thus this actually also allowed to write outside the output buffer if "lucky". commit 768c5251141be705d64a480b641c6b17d32a4e7b Author: Alberto Delmás Date: Fri Apr 8 20:00:48 2011 +0200 Parse sprite data for WMVP and WVP2, and decode sprites for the latter Signed-off-by: Anton Khirnov commit 70ff55733d41303f55bee80041095bd10b87363a Author: Lou Logan Date: Sat Apr 9 13:50:07 2011 +0200 Replace outdated info on the FAQ FAQ could use some work. This updates a few little details. Signed-off-by: Michael Niedermayer Signed-off-by: Anton Khirnov commit f8de11cf7dbfefec535c3114a5fced3609d01343 Author: Lou Logan Date: Sat Apr 9 13:50:05 2011 +0200 Redefine sameq I think the documentation of sameq is causing confusion and misuse of this option. Signed-off-by: Michael Niedermayer Signed-off-by: Anton Khirnov commit aeefbf61c0dbed2977c919ea0ef22f2536ee1e48 Author: Stefano Sabatini Date: Sat Apr 9 13:50:01 2011 +0200 pad: fix example explanation "row" and "column" term positions in the explanation were inverted. Signed-off-by: Stefano Sabatini Signed-off-by: Anton Khirnov commit 3eccfaa01291ca90e7dcb934bb06d048fcba1f43 Author: Stefano Sabatini Date: Sat Apr 9 13:49:57 2011 +0200 gradfun: add notice from the MPlayer manual Add notice telling that the filter is designed for playback only. Signed-off-by: Anton Khirnov commit 5ae4251c3b603cc7f44dd0e0839c5b6f6bbac61e Author: Stefano Sabatini Date: Sat Apr 9 13:49:54 2011 +0200 eval: add support for trunc, ceil, and floor functions Signed-off-by: Stefano Sabatini Signed-off-by: Anton Khirnov commit 2fd8756b9f5f5e809bec8f2635216f236106dff4 Author: Stefano Sabatini Date: Sat Apr 9 13:49:48 2011 +0200 documentation: add setdar and setsar description to filters.texi Signed-off-by: Anton Khirnov commit c1a9012d62b76106d02f080adec28e13b039a53d Author: Anton Khirnov Date: Sat Apr 9 12:20:04 2011 +0200 avio: document some members of AVIOContext. commit e782a0c6da0daa7b65e0355e50e68b13441b5faa Author: Anton Khirnov Date: Sat Apr 9 12:43:51 2011 +0200 avio: document avio_close(). commit 893816ba1e7c8d89ee405e55bae8251366ff3df9 Author: Anton Khirnov Date: Sat Apr 9 12:21:36 2011 +0200 avio: cosmetics, vertically align comments. commit 72d4405b66be0ec22ba01cc360a7e826ab910efd Author: Anton Khirnov Date: Sat Apr 9 08:55:53 2011 +0200 avio: cosmetics, group the reading functions. commit 37744e328257f7974e77574d746b338be2e3bab8 Author: Anton Khirnov Date: Sat Apr 9 08:52:35 2011 +0200 avio: cosmetics, merge all the FF_API_OLD_AVIO blocks. commit fafa7290f1bf7f91cc5afe6c5cc65808bacb5c42 Author: Anton Khirnov Date: Sat Apr 9 08:44:14 2011 +0200 avio: cosmetics, move AVIOContext to start of the file. commit 6084ee5dc50aff488b611ad19ae1a6e72aa7ca39 Author: Anton Khirnov Date: Sat Apr 9 08:30:15 2011 +0200 avio: update file header. commit 3028b6ede624410d40ab7c77a67b62fc6ad3a8f0 Author: Brad Date: Sat Apr 2 17:16:59 2011 -0400 os: fix OpenBSD/PowerPC compilation When attempting to re-enable the AltiVec support it was noticed that we need to undefine _POSIX_C_SOURCE to appease the headers for ff_get_cpu_flags_ppc() to be able to compile. Signed-off-by: Luca Barbato commit 73389754c911bc3171019f0bb98b7aeeb0ef32e6 Author: Peter Ross Date: Sat Apr 9 13:49:45 2011 +0200 pixfmt: add PIX_FMT_BGR48LE and PIX_FMT_BGR48BE PIX_FMT_BGR48LE is used by PhantomCINE demuxer. Signed-off-by: Luca Barbato commit 47dec30edb8565b7e0e8716dc6d0dc36d5b7bc40 Author: Clément BÅ“sch Date: Tue Apr 5 00:29:01 2011 +0200 oggdec: fix demuxing chained audio streams Chained ogg served by icecast and mpd should demux properly now. Fixes issue2337 Signed-off-by: Luca Barbato commit cbfa93aca33dda399dd946f1bc4e3097c124fa5d Author: Compn Date: Sat Apr 9 13:49:56 2011 +0200 fix typo Signed-off-by: Luca Barbato commit afaedbd6f76c1601c39007f8bc2627948de78d49 Author: Ronald S. Bultje Date: Sun Apr 10 00:06:28 2011 +0200 Add "Did you provide a clear git commit log message?" to the patch checklist Signed-off-by: Michael Niedermayer commit c55efca05bc0b58b0845f83e73670f76030b82a5 Author: Carl Eugen Hoyos Date: Fri Apr 1 15:56:45 2011 +0000 x11: fix memleak Signed-off-by: Michael Niedermayer commit 05c062e9da370c60f48e433308cccbf7e7aea7fe Author: pin xue Date: Sat Apr 9 16:05:11 2011 +0800 replace movw instruction in ac3dsp_armv6.S AS libavcodec/arm/ac3dsp_armv6.o ffmpeg-src/libavcodec/arm/ac3dsp_armv6.S: Assembler messages: ffmpeg-src/libavcodec/arm/ac3dsp_armv6.S:40: Error: selected processor does not support `movw r8,#0x1fe0' make[1]: *** [libavcodec/arm/ac3dsp_armv6.o] Error 1 MOVW is ARMv7 way to load constant: * movw, or move wide, will move a 16-bit constant into a register, implicitly zeroing the top 16 bits of the target register. * movt, or move top, will move a 16-bit constant into the top half of a given register without altering the bottom 16 bits To load 32 bit constant, movw lower16; movt upper16; is better than ldr if available, because: While this approach takes two instructions, it does not require any extra space to store the constant so both the movw/movt method and the ldr method will end up using the same amount of memory. Memory bandwidth is precious in and the movw/movt approach avoids an extra read on the data side, not to mention the read could have missed the cache. But here it is armv6 optimization, so that we have to use ldr. Signed-off-by: Michael Niedermayer commit a2beabc231f0d0c509e5c8f09fdab0ccb46eca10 Merge: d459d8e 347b375 Author: Michael Niedermayer Date: Sun Apr 10 03:31:53 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: daud: Don't write packets that are too large to have their size expressed in the bytestream. DUPLICATE pthread: validate_thread_parameters() ignored slice-threading being intentionally off DUPLICATE Use consistent condition for whether to run slice-threading execute function. avformat.h: fix a misplaced #endif DUPLCIATE vaapi: cope with VA-API 0.32, i.e. fix VC-1 decoding on Sandy Bridge. DUPLICATE vaapi: filter out DELAYED_PIC_REF flag to determine field. Merged-by: Michael Niedermayer commit 347b375a80afbb27c887a243097c09370cb95d19 Author: Alex Converse Date: Fri Apr 8 14:35:17 2011 -0700 daud: Don't write packets that are too large to have their size expressed in the bytestream. commit d459d8e28df12ee69c71c7181380d91e09764374 Author: Reimar Döffinger Date: Fri Apr 8 01:17:21 2011 +0200 Abort Ogg header parsing when we encounter a data packet. Fixes ticket #15. commit cf39b461d31a213261cb7dab21e8aeb0bb1673d5 Author: Alexander Strange Date: Sun Apr 3 15:54:14 2011 -0400 pthread: validate_thread_parameters() ignored slice-threading being intentionally off The thread_type API allows you to request only FF_THREAD_FRAME (instead of FRAME | SLICE), but it was being ignored. We don't implement both of them at the same time, so there isn't an effect on current codecs, except that you can request no kinds of threading now (a bit useless). Signed-off-by: Ronald S. Bultje commit f82163cf1c0515a59e6aed9748a17604f892c310 Author: Reimar Döffinger Date: Fri Apr 1 20:24:46 2011 -0400 Use consistent condition for whether to run slice-threading execute function. Signed-off-by: Ronald S. Bultje commit 17ca374c7d09b9f0c102709f2437a3a76de7bad0 Author: Anton Khirnov Date: Sat Apr 9 07:30:33 2011 +0200 avformat.h: fix a misplaced #endif commit da21440d46244c424ef4782a18fbcf6823d308fd Author: Gwenole Beauchesne Date: Tue Mar 29 10:52:15 2011 +0200 vaapi: cope with VA-API 0.32, i.e. fix VC-1 decoding on Sandy Bridge. (cherry picked from commit a18e7b4fb77d3799cf21110b5e6dda4691a295b3) Signed-off-by: Reinhard Tartler commit 09ce846206ff9a112cc1e2727d0ba4b5f0216d9c Author: Gwenole Beauchesne Date: Tue Mar 29 11:07:29 2011 +0200 vaapi: filter out DELAYED_PIC_REF flag to determine field. This fixes ticket #23. (cherry picked from commit 621f4c98df4ee9fd604a614f31e09eef9dd7d3ca) Signed-off-by: Reinhard Tartler commit ae7a4a1594e3624f7c844dec44266d2dc74a6be2 Author: Philip Langdale Date: Sat Mar 26 10:34:20 2011 -0700 CrystalHD: Improve detection of h.264 content. As previously discussed, the CrystalHD hardware returns exceptionally useless information about interlaced h.264 content - to the extent that it's not possible to distinguish most MBAFF and PAFF content until it's too late. In an attempt to compensate for this, I'm introducing two mechanisms: 1) Peeking at the picture number of the next picture The hardware provides a capability to peek the next picture number. If it is the same as the current picture number, then we are clearly dealing with two fields and not a frame or fieldpair. If this always worked, it would be all we need, but it's not guaranteed to work. Sometimes, the next picture may not be decoded sufficiently for the number to be known; alternately, a corruption in the stream may cause the hardware to refuse to return the number even if the next intact frame is decoded. In either case, the query will return 0. If we are unable to peek the next picture number, we assume that the picture is a frame/fieldpair and return it accordingly. If that turns out to be incorrect, we discard the second field, and the user has to live with the glitch. In testing, false detection can occur for the first couple of seconds, and then the pipeline stabalizes and we get correct detection. 2) Use the h264_parser to detect when individual input fields have been combined into an output fieldpair. I have multiple PAFF samples where this behaviour is detected. The peeking mechanism described above will correctly detect that the output is a fieldpair, but we need to know what the input type was to ensure pipeline stability (only return one output frame per input frame). If we find ourselves with an output fieldpair, yet the input picture type was a field, as reported by the parser, then we are dealing with this case, and can make sure not to return anything on the next decode() call. Taken together, these allow us to remove the hard-coded hacks for different h.264 types, and we can clearly describe the conditions under which we can trust the hardware's claim that content is interlaced. Signed-off-by: Philip Langdale commit bfde0f1b3d352c064e376554540d8690850a32a1 Author: Philip Langdale Date: Fri Mar 25 22:48:41 2011 -0700 CrystalHD: Carry picture type from input to output picture. Now that we know the type of the input picture, we have to bring that information to the output picture to help identify its type. We do this by adding a field to the opaque_list node. Signed-off-by: Philip Langdale commit f6421e0b5c028b5eaf24377b074b1e50b2c32419 Author: Philip Langdale Date: Fri Mar 25 22:46:22 2011 -0700 CrystalHD: Bring in h.264 parser to establish picture type. As the hardware is unreliable, we will have to use the h.264 parser to identify whether an input picture is a field or a frame. This change loads the parser and extracts the picture type. Signed-off-by: Philip Langdale commit e99fd6ee197f77e512c4092667eed70232f9c875 Author: Philip Langdale Date: Fri Mar 25 22:43:53 2011 -0700 CrystalHD: Change opaque_list_pop to return the node. In preparation for adding additional fields to the node, return the node instead of the pts value. This requires the caller to free the node. Signed-off-by: Philip Langdale commit ca0eed7e37881e9adea11734832dc60961693b07 Author: Philip Langdale Date: Sun Mar 27 09:39:16 2011 -0700 CrystalHD: Fix whitespace after previous change. 'git diff -w' confirmed to return nothing. Signed-off-by: Philip Langdale commit 9ce1d5f03b5579a86a0ef555afbc6bb5ed472062 Author: Philip Langdale Date: Sun Mar 27 09:37:49 2011 -0700 CrystalHD: Handle different h.264 MBAFF packing. I found another MBAFF sample where the input:output pattern is the same as mpeg2 and vc1 (fieldpair input, individual field output). While I'm not sure how you can output individual fields from MBAFF, if I apply the mpeg2/vc1 handling to this file, it plays correctly. So, this changes the detection algorithm to handle the known cases. Whitespace will be fixed in a separate change. Signed-off-by: Philip Langdale commit c0577ceb5569a5f02a9a405f9d8bc9b3ba66fad4 Author: Michael Niedermayer Date: Sat Apr 9 00:03:01 2011 +0200 flv: Only parse keyframe index when the underlaying protocol allows seeking as we need to seek to read the index Signed-off-by: Michael Niedermayer commit ba667e600ffedad9d34caabe13f775b411f33a27 Author: Kharkov Alexander Date: Fri Apr 8 16:20:45 2011 +0700 Fix support for flvtool2 "keyframes based" generated index in FLV format decoder Current keyframes data parser unconditionally rewind metadata to the end at the end of function. As result ALL metadata located after keyframes index not parsed, and as metadata object can have ANY placement inside metadata it can lead to unpredictable result (bitrate can not be found, etc.). As result FLV movie will not play at all in such situation. Signed-off-by: Michael Niedermayer commit f7f9e24d094c5cde404f4178d81212c91b024022 Author: Lou Logan Date: Thu Apr 7 14:26:49 2011 -0800 Replace outdated info on the FAQ FAQ could use some work. This updates a few little details. Signed-off-by: Michael Niedermayer commit d4d09329eef30787da699c7a397b00f6f96940bc Merge: a61bc91 0c68c80 Author: Michael Niedermayer Date: Sat Apr 9 03:09:49 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: lavf: bump minor and add an APIChanges entry for avformat cleanup lavf: get rid of ffm-specific stuff in avformat.h Not pulled: avio: deprecate av_protocol_next(). avio: add a function for iterating though protocol names. lavf: rename a parameter of av_sdp_create from buff->buf lavf: rename avf_sdp_create to av_sdp_create. lavf: make av_guess_image2_codec internal avio: make URLProtocol internal. avio: make URLContext internal. lavf: mark av_pkt_dump(_log) for remove on $next+1 bump. lavf: use designated initializers for all protocols applehttp: don't use deprecated url_ functions. avio: move two ff_udp_* functions from avio_internal to url.h asfdec: remove a forgotten declaration of nonexistent function avio: deprecate the typedef for URLInterruptCB Merged-by: Michael Niedermayer commit a61bc91d42945e6ccefef4867ef32d2073f8f8c7 Author: Michael Niedermayer Date: Sat Apr 9 01:00:44 2011 +0200 Fix ticket21, temporary audio array was too small. Signed-off-by: Michael Niedermayer commit 0c68c804196400de3c40c8849124b292ed62b99c Author: Anton Khirnov Date: Fri Apr 8 11:46:52 2011 +0200 lavf: bump minor and add an APIChanges entry for avformat cleanup commit 3ee53dabcfd8810d01f114599617cf55e481c291 Author: Anton Khirnov Date: Fri Apr 8 11:21:13 2011 +0200 lavf: get rid of ffm-specific stuff in avformat.h commit cdc6a87f193b1bf99a640a44374d4f2597118959 Author: Anton Khirnov Date: Mon Apr 4 20:28:58 2011 +0200 avio: deprecate av_protocol_next(). commit f8270bbf8ce891cc614a5562c02ce18a50a89f1d Author: Anton Khirnov Date: Mon Apr 4 08:18:54 2011 +0200 avio: add a function for iterating though protocol names. commit c234d40bd9c98fc8c5540135cd5055c12e603a0f Author: Anton Khirnov Date: Fri Apr 8 12:22:39 2011 +0200 lavf: rename a parameter of av_sdp_create from buff->buf This is more consistent with the rest of the API. commit c3675dfe1e345a81d704fa0dd31151b8d54589ee Author: Anton Khirnov Date: Fri Apr 8 11:36:12 2011 +0200 lavf: rename avf_sdp_create to av_sdp_create. The new name is more consistent with the rest of the API. commit a9bf9d8e5349114d37cc3baf0b1e7d95197c5ef8 Author: Anton Khirnov Date: Tue Apr 5 13:13:53 2011 +0200 lavf: make av_guess_image2_codec internal It doesn't look very useful as a public function. commit 5593f031489f54ad184dd2d2744e31006c8627a5 Author: Anton Khirnov Date: Thu Apr 7 21:01:17 2011 +0200 avio: make URLProtocol internal. commit c486dade95ba529151391a7879538c9d4787752b Author: Anton Khirnov Date: Thu Apr 7 20:25:52 2011 +0200 avio: make URLContext internal. commit c5704b2b9a9cb38e27d24f9962594def16870c52 Author: Anton Khirnov Date: Tue Apr 5 12:59:27 2011 +0200 lavf: mark av_pkt_dump(_log) for remove on $next+1 bump. commit 9d4cb45dbea845da477f1eeba976a146ab66d9da Author: Michael Niedermayer Date: Fri Apr 8 12:26:45 2011 +0200 Cleanup 'Fix spurious warning when stream has SPS and PPS units.' Signed-off-by: Michael Niedermayer commit f35ff97f2e572a6b02180b248f929541962ffdd3 Author: Anton Khirnov Date: Fri Apr 8 07:41:47 2011 +0200 lavf: use designated initializers for all protocols This is more readable and makes it easier to reorder URLProtocol members. commit a6aa7a1a14dc12d9d745e5d4a8a7feb38eb1c4da Author: Anton Khirnov Date: Fri Apr 8 06:57:54 2011 +0200 applehttp: don't use deprecated url_ functions. commit d6bbe76124c5879099e03754646c4bd70ce5112f Author: Anton Khirnov Date: Thu Apr 7 20:15:43 2011 +0200 avio: move two ff_udp_* functions from avio_internal to url.h commit acaceca2f191b30f64421f6568fd30ad561daec9 Author: Anton Khirnov Date: Thu Apr 7 20:13:36 2011 +0200 asfdec: remove a forgotten declaration of nonexistent function commit 026e175775cd9355067e9ff93fb6df3f64b365c2 Author: Anton Khirnov Date: Thu Apr 7 19:17:55 2011 +0200 avio: deprecate the typedef for URLInterruptCB There's no particular reason to pollute the namespace with a typedef for it. commit d0df2934ca63a1d5c31602e6558f341bd738bd07 Author: Alexander Strange Date: Fri Apr 8 03:03:03 2011 +0200 Merge remote-tracking branch 'ffmpeg-mt/master' * ffmpeg-mt/master: DUPLICATE mingw32 compilation after 'unbreak avcodec_thread_init' pthread: validate_thread_parameters() ignored slice-threading being intentionally off DUPLICATE Remove unnecessary parameter from ff_thread_init() and fix behavior Signed-off-by: Michael Niedermayer commit c88caa522c41cd4108d39d8dd98805e867606ae3 Merge: db95e55 a203125 Author: Michael Niedermayer Date: Fri Apr 8 02:50:13 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: proto: include os_support.h in network.h matroskaenc: don't write an empty Cues element. lavc: add a FF_API_REQUEST_CHANNELS deprecation macro avio: move extern url_interrupt_cb declaration from avio.h to url.h avio: make av_register_protocol2 internal. avio: avio_ prefix for url_set_interrupt_cb. avio: AVIO_ prefixes for URL_ open flags. proto: introduce listen option in tcp doc: clarify configure features proto: factor ff_network_wait_fd and use it on udp Conflicts: ffmpeg.c Merged-by: Michael Niedermayer commit db95e559f2b1c392295b09e8457d6f161eb5acdb Author: Michael Niedermayer Date: Fri Apr 8 01:35:43 2011 +0200 fix another forgotten mplayerhq.hu link Signed-off-by: Michael Niedermayer commit 610b963e82e64055dc56f07bc871745f61255c21 Author: Michael Niedermayer Date: Fri Apr 8 00:17:53 2011 +0200 Fix link to ffmpeg-devel Signed-off-by: Michael Niedermayer commit ffb61814a038e7fe9223e7f8460161d661b94e42 Author: Michael Niedermayer Date: Fri Apr 8 00:15:09 2011 +0200 Fix deblocking with thread_slices Signed-off-by: Michael Niedermayer commit f6d71b3942ae994ed576de81c9ddba2a08cb6f90 Author: Michael Niedermayer Date: Thu Apr 7 15:12:03 2011 +0200 ffplay: Set EMU_EDGE if dr1, this is an alternative fix for ticket40. Idea borrowed from mplayer. Signed-off-by: Michael Niedermayer commit a2031251c7eedd0d82cb9e08717990fa2ae6299f Author: Luca Barbato Date: Thu Apr 7 15:09:03 2011 +0200 proto: include os_support.h in network.h Fix compilation on systems without poll() commit 9181976348cac563977a0450c90f27ad72018f1d Author: Anton Khirnov Date: Mon Apr 4 22:29:21 2011 +0200 matroskaenc: don't write an empty Cues element. commit 9f5ddd1e460a7e25b838286d36bf3fbe17baaa76 Author: Anton Khirnov Date: Wed Apr 6 07:38:11 2011 +0200 lavc: add a FF_API_REQUEST_CHANNELS deprecation macro And hide request_channels AVOption under it. commit 5cec8971056f92215d4199235907d944abdb5a81 Author: Anton Khirnov Date: Mon Apr 4 20:40:38 2011 +0200 avio: move extern url_interrupt_cb declaration from avio.h to url.h commit 8e76a19b63a3fa322a64a7d27bd6e642c7fe7f85 Author: Anton Khirnov Date: Mon Apr 4 20:35:04 2011 +0200 avio: make av_register_protocol2 internal. commit 80c6e238b0f42a0b07fbc195564a50032b3608ba Author: Anton Khirnov Date: Mon Apr 4 20:15:44 2011 +0200 avio: avio_ prefix for url_set_interrupt_cb. commit f87b1b373a0df55080c1e6a5874f9a0a75c6fee8 Author: Anton Khirnov Date: Mon Apr 4 20:11:19 2011 +0200 avio: AVIO_ prefixes for URL_ open flags. commit de174d0d250dc290acc0e7a8d74f26782e084365 Author: Peter Ross Date: Tue Apr 5 20:37:19 2011 +1000 riff: add ATRAC3+ guid Signed-off-by: Michael Niedermayer commit aa9380c89c65873c41a76776296d9095c54731cd Author: Peter Ross Date: Thu Apr 7 20:53:24 2011 +1000 ff_get_wav_header: perform full lookup on WAVEFORMATEXTENSIBLE subformat guid Signed-off-by: Michael Niedermayer commit 36ffabc4eeab2e4489e83d874c19b86a4b44d25a Author: Peter Ross Date: Tue Apr 5 20:36:55 2011 +1000 move PRI_GUID, ARG_GUID, AVCodecGuid, ff_codec_guid_get_id, MEDIASUBTYPE_BASE_GUID and audio_guids[] to riff.c/h (add FF_ prefix to PRI_GUID, ARG_GUID, and MEDIASUBTYPE_BASE_GUID; rename audio_guids to ff_codec_wav_guids) Signed-off-by: Michael Niedermayer commit c1309b27d2fc57a18a22336c7812874191b2bdac Author: Peter Ross Date: Tue Apr 5 20:36:46 2011 +1000 move ff_asf_guid, ff_guidcmp and ff_get_guid into riff.h Signed-off-by: Michael Niedermayer commit dc4103610520ae70d4989ffe3850dcf4deed54a9 Author: Alexis Ballier Date: Thu Apr 7 10:19:23 2011 -0300 Install libavutil/{aes,sha}.h Signed-off-by: Michael Niedermayer commit 4f29941194dd0ed06aa375e437b48e3031125e59 Author: Stefano Sabatini Date: Thu Apr 7 17:45:31 2011 +0200 pad: fix example explanation "row" and "column" term positions in the explanation were inverted. Signed-off-by: Stefano Sabatini commit c0e51ec9c625ccd7b3a8c74754145e6c023a3848 Merge: 4b9c03b 1f6265e Author: Michael Niedermayer Date: Thu Apr 7 03:32:26 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: Fix parser: mark av_parser_parse() for removal on next major bump swscale: postpone sws_getContext removal until next major bump. fate: add AAC LATM test mmst: get rid of deprecated AVERRORs lxfdec: use AVERROR(ENOMEM) instead of deprecated AVERROR_NOMEM. Reemove remaining uses of deprecated AVERROR_NOTSUPP. REIMPLEMENTED in 2 lines of code: lavf: if id3v2 tag is present and all else fails, guess by file extension Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer commit 3d42d4937b029b604da7d53dce16c72e8edde29c Author: Luca Barbato Date: Fri Mar 4 01:41:22 2011 +0100 proto: introduce listen option in tcp This way is possible to have simple micro-server act like ffmpeg -i file.nut -vcodec copy -acodec copy -f nut tcp://foo:1234?listen commit a013291d26d325ba81d8db758d5e5adccc743cf5 Author: Luca Barbato Date: Mon Apr 4 17:43:45 2011 +0200 doc: clarify configure features This way people will not get surprises regarding the current configure behaviour and contributors will have a guideline on what is expected. commit ebba2b3e2a551ce638d17332761431ba748f178f Author: Luca Barbato Date: Mon Apr 4 18:17:12 2011 +0200 proto: factor ff_network_wait_fd and use it on udp Support the URL_FLAG_NONBLOCK semantic and uniform the protocol. The quick retry loop is already part of retry_transfer_wrapper. The polling routine is common to the network protocols: udp, tcp and, once merged, sctp. commit 4b9c03b7f08f51fea3c8719f169368a46a0d3b63 Author: Michael Niedermayer Date: Thu Apr 7 00:31:21 2011 +0200 Align stack variables manually in yadif x86 code, should fix ticket25 Signed-off-by: Michael Niedermayer commit 9f8008a9815ed5ee8846de2bb97c980ddb7b2485 Author: Michael Niedermayer Date: Thu Apr 7 00:24:53 2011 +0200 move image check down in ffplay.c Signed-off-by: Michael Niedermayer commit 454fab721a2d518d814ce50ab545f89af107851d Author: Michael Niedermayer Date: Wed Apr 6 23:41:02 2011 +0200 Disable dr1 in ffplay for svq1 (fixes ticket40) Signed-off-by: Michael Niedermayer commit 1f6265e011f6e56562b2f58c182bc0261062b3c4 Author: Brad Date: Wed Apr 6 17:41:12 2011 -0400 Fix parser: mark av_parser_parse() for removal on next major bump Fix the breakage introduced with 9073ca6c6ebb9e3e9b60d968b7aa16cc8b6d558d commit 8bce71dff5a7fd2851c4718c274d8b2a94fb595c Author: Michael Niedermayer Date: Wed Apr 6 23:39:57 2011 +0200 Check sizes a bit in ffplay, cant hurt. Signed-off-by: Michael Niedermayer commit 326dff7d054f260b11f51062c2d7fc9a537ff58c Author: Michael Niedermayer Date: Wed Apr 6 23:06:47 2011 +0200 Fix ticket34 Signed-off-by: Michael Niedermayer commit bc6047223fda5070d007e605c8fd7cf02b8403aa Author: Michael Niedermayer Date: Wed Apr 6 21:49:25 2011 +0200 Drop checkheaders from check, its useless Signed-off-by: Michael Niedermayer commit 6b1c886b6562eae7bab8cbbeb590478e34859bc7 Author: Michael Niedermayer Date: Wed Apr 6 21:17:32 2011 +0200 Fix ticket20 Signed-off-by: Michael Niedermayer commit 0464ee9af2a3c17d78642f203cfeeb5d66c70bf2 Author: Anton Khirnov Date: Wed Apr 6 14:46:31 2011 +0200 swscale: postpone sws_getContext removal until next major bump. The replacement isn't ready yet. commit 0ba832231dd557475ffb8c4438c2d794812a9216 Author: Janne Grunau Date: Tue Apr 5 20:25:48 2011 +0200 fate: add AAC LATM test commit 1265395b5b1a6cde6549dabbb3820d343642f809 Author: Reimar Döffinger Date: Sat Mar 26 16:25:10 2011 +0100 Add PlayStation Portable PMP format demuxer Not yet complete, for demuxing AAC the AAC header must be generated manually. Possibly the decoder could accept the header as extradata to simplify this. commit 6e37b45888d46ac621095a963013675c47ea1f55 Author: Anton Khirnov Date: Wed Apr 6 08:20:09 2011 +0200 mmst: get rid of deprecated AVERRORs commit a2018b516794f329ef487bca62b4dd7835cad764 Author: Anton Khirnov Date: Wed Apr 6 08:18:16 2011 +0200 lxfdec: use AVERROR(ENOMEM) instead of deprecated AVERROR_NOMEM. commit f5b386afab51a2141447b682793ce001abdaeb5c Author: Anton Khirnov Date: Wed Apr 6 08:16:06 2011 +0200 Reemove remaining uses of deprecated AVERROR_NOTSUPP. commit 56a1000917694b2277064c5573b0dd818ad7a379 Author: Anton Khirnov Date: Tue Apr 5 12:19:35 2011 +0200 lavf: if id3v2 tag is present and all else fails, guess by file extension commit d6c858658f2cd5cabbfecc008503c30951256fdd Author: Michael Niedermayer Date: Wed Apr 6 03:00:46 2011 +0200 Revert "ffmpeg: fix aspect ratio setting" This reverts commit d1eb50bb29caad9745631759265f475177df99b9. Reason, it breaks fate commit 11d78415ca1beaa39303c280d7896024edc45aa7 Merge: ee6db0d 5371803 Author: Michael Niedermayer Date: Wed Apr 6 02:59:49 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: psymodel: extend API to include PE and bit allocation. avio: always compile dyn_buf functions Remove unnecessary parameter from ff_thread_init() and fix behavior Revert "aac_latm_dec: use aac context and aac m4ac" configure: tell user if libva is enabled like the rest of external libs. Add silence support for AV_SAMPLE_FMT_U8. avio: make URL_PROTOCOL_FLAG_NESTED_SCHEME internal avio: deprecate av_url_read_seek avio: deprecate av_url_read_pause ac3enc: NEON optimised extract_exponents Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer commit ee6db0de3760ceb7b7a9968a5322c1d8e8e23861 Author: Michael Niedermayer Date: Wed Apr 6 00:15:42 2011 +0200 Fix ffmpeg-mt fixme in h264. Signed-off-by: Michael Niedermayer commit 98fe404a94063b28e66f32e8047e20136900f25f Author: Michael Niedermayer Date: Wed Apr 6 00:14:56 2011 +0200 Fix REBASE_PICTURE with h.264 Signed-off-by: Michael Niedermayer commit b5ef6f8eb452c37b19d973d61548725d7b91113e Author: Michael Niedermayer Date: Tue Apr 5 23:22:08 2011 +0200 Fix crash in ffmpeg.c with PIX_FMT_NONE Signed-off-by: Michael Niedermayer commit 0c72180ea660e2d1de71d8d03445e014d48b7e52 Author: Michael Niedermayer Date: Tue Apr 5 20:46:46 2011 +0200 Revert "Set the correct target for mingw64 dlltool" Revert due to dlltool/lib revert This reverts commit 417516f63f8a9ee214ee9fa6fcb483962ea0f096. commit 1f3a1fa92110f5e6c02674122bba126feb049f26 Author: Michael Niedermayer Date: Tue Apr 5 18:27:15 2011 +0200 Fix gazeta-20090408-1456-aa.ts regression introduced by 15957b197a63d08c33c34f08ef8b161335736914 Signed-off-by: Michael Niedermayer commit b1eeddf1cc530cfce9a178a8ee7066f9d9910784 Author: Michael Niedermayer Date: Tue Apr 5 11:51:58 2011 +0200 Fix Ticket37 Signed-off-by: Michael Niedermayer commit 5371803dd5d9f7bbc62d68274084d25f10a8dc61 Author: Nathan Caldwell Date: Tue Apr 5 01:05:22 2011 -0600 psymodel: extend API to include PE and bit allocation. Signed-off-by: Janne Grunau commit 668438a31ef654a2836992879f9bcd23f4d3421e Author: Anton Khirnov Date: Tue Apr 5 19:04:28 2011 +0200 avio: always compile dyn_buf functions Fixes build with --disable-muxers --disable-network. Thanks to Hendrik Leppkes for noticing. commit da53f05fd0a51cd630b1fdf03dec04e5761c8b32 Author: Reimar Döffinger Date: Mon Apr 4 20:02:42 2011 +0200 Do not offer unsupported HWAccel PIX_FMT. Only fixes MPEG-1/MPEG-2 as a first step. commit 735c4f0b8460a943623b7b1a83f55299d8c60523 Author: Reimar Döffinger Date: Mon Apr 4 20:11:19 2011 +0200 Use CONFIG_VDPAU as condition for using ff_vdpau_mpeg_picture_complete. CONFIG_VDPAU is the condition on which ff_vdpau_mpeg_picture_complete is compiled in, so it is more appropriate, particularly since the separate VDPAU decoder should be removed in the longer term. commit 6e075dcaf85d9cd32fffe160d3090af47982cf93 Author: Reimar Döffinger Date: Thu Mar 24 21:27:05 2011 +0100 ac3dec: avoid pointless alloc and indirection for input_buffer Since we now always allocate it, it can simply be made part of the context instead. commit ba9ef8d04ecd009036b7c380e71bac081c56c53e Author: Alexander Strange Date: Tue Mar 29 17:18:21 2011 -0400 Remove unnecessary parameter from ff_thread_init() and fix behavior thread_count passed to ff_thread_init() is only used to set AVCodecContext. thread_count, and can be removed. Instead move it to the legacy implementation of avcodec_thread_init(). This also fixes the problem that calling avcodec_thread_init() with pthreads enabled did not set it since ff1efc524cb3c60f2f746e3b4550bb1a86c65316. Signed-off-by: Janne Grunau commit 6f73d5e859f02be7f3677b58be5d7fa741c54a16 Author: Stefano Sabatini Date: Tue Apr 5 15:31:14 2011 +0200 documentation: fix @url syntax in developer.texi Signed-off-by: Stefano Sabatini commit d496d33d26c1781220c49b3ea0e69fcfcc759a8a Author: Stefano Sabatini Date: Sun Mar 27 22:58:08 2011 +0200 scale: make the filter parametric Make the filter accept parametric expressions for the output video size. Signed-off-by: Stefano Sabatini commit 25601bc5649fb71f645e9a619871cc85170f5dd8 Author: Stefano Sabatini Date: Sun Mar 27 22:56:49 2011 +0200 eval: add support for trunc, ceil, and floor functions Signed-off-by: Stefano Sabatini commit d1eb50bb29caad9745631759265f475177df99b9 Author: Stefano Sabatini Date: Mon Apr 4 02:15:34 2011 +0200 ffmpeg: fix aspect ratio setting This is done by adding a setsar filter at the beginning of the configured filterchain. This implementation is more robust, since does not modify the filterchain description (which was creating potential syntax errors), but directly modifies the filterchain structure. This also changes the ffmpeg -aspect behavior, as following filters in the filterchain can change the DAR/SAR set by the inserted setsar filter. Signed-off-by: Stefano Sabatini commit 2ed05f657f622a1c84f97a841a488e876f734201 Author: Carl Eugen Hoyos Date: Tue Apr 5 16:12:41 2011 +0200 Add support for pcm_f32* to alsa. commit 71a2da30cd0bf42e48ab4b0e64a2911ddec5a7ba Author: Carl Eugen Hoyos Date: Tue Apr 5 15:14:51 2011 +0200 Add audio_float to confgigure's CONFIG list. commit d6f66edd65992c1275f8e4271be212e1a4808425 Author: Janne Grunau Date: Tue Apr 5 12:21:50 2011 +0200 Revert "aac_latm_dec: use aac context and aac m4ac" This reverts commit 36864ac3540445c513484017aa9927e942fac24a since it breaks LATM decoding in ffplay. commit 4d1d6f7a3c0a8c9235a5b26c4c5347d23b9ae091 Author: Carl Eugen Hoyos Date: Tue Apr 5 10:53:50 2011 +0200 Support s32 output via alsa audio device. commit efec2d7b35db96014ad33e43383b93d42acd8829 Author: Carl Eugen Hoyos Date: Tue Apr 5 10:15:03 2011 +0200 Template alsa reordering functions. commit f4f05c459c41e8c43d3642a96001c69bc7173544 Author: Konstantin Pavlov Date: Tue Apr 5 00:49:34 2011 +0400 configure: tell user if libva is enabled like the rest of external libs. Signed-off-by: Anton Khirnov commit 14cf0fd2f586471fff4ee379739a5734f568af11 Author: Alex Converse Date: Mon Apr 4 16:07:23 2011 -0700 Add silence support for AV_SAMPLE_FMT_U8. Signed-off-by: Anton Khirnov commit b84048479888739e0aa8d9e534c49a3ab0e02252 Author: Anton Khirnov Date: Mon Apr 4 19:55:07 2011 +0200 avio: make URL_PROTOCOL_FLAG_NESTED_SCHEME internal commit 1305d93c42946ef524c1cdc927a7e66eec510005 Author: Anton Khirnov Date: Mon Apr 4 19:48:31 2011 +0200 avio: deprecate av_url_read_seek It's not used anywhere internally. Salvage its documentation for ffio_read_seek. commit fa104e14abc1361762cb2451cc83072e4d2a5d52 Author: Anton Khirnov Date: Mon Apr 4 19:46:19 2011 +0200 avio: deprecate av_url_read_pause It's not used anywhere internally. Salvage its documentation for ffio_read_pause. commit 9c09dead87cafaef12640ac8d9a009912c367022 Author: Philip Langdale Date: Mon Mar 28 21:43:23 2011 -0700 h264_parser: Fix whitespace after previous change. 'git diff -w' confirmed to return nothing. Signed-off-by: Philip Langdale commit 01f5b9c51eba113b3e8b594ef55e8f08071cdeb6 Author: Philip Langdale Date: Mon Mar 28 21:42:02 2011 -0700 h264_parser: Fix behaviour when PARSER_FLAG_COMPLETE_FRAMES is set. Currently, the parser is buggy and only processes the stream extradata when the flag is set. This fixes it to actually inspect the frames. Whitespce will be fixed in a separate change. Signed-off-by: Philip Langdale commit eb79c528d8285421a009f01e279ad4cda0fa91b5 Author: Michael Niedermayer Date: Tue Apr 5 03:12:46 2011 +0200 Update yadif copyright header Signed-off-by: Michael Niedermayer commit de0f445b5c3d70f9aadba2a689c365e3b27adf13 Author: James Darnley Date: Tue Apr 5 03:11:05 2011 +0200 Factorise the C filtering in yadif commit 2657fd0cd41e150ebba3c1104885c7e4d6cdd551 Author: Michael Niedermayer Date: Tue Apr 5 03:02:52 2011 +0200 Yadif fixes that where missing from the patch Signed-off-by: Michael Niedermayer commit 457be6962bd257f0b76f7e824b2bcbdb0c8cf105 Author: James Darnley Date: Wed Nov 24 21:25:09 2010 +0100 Support 16-bit in yadif commit 257ac5f1d64257ddc3763a3cd9c8d58d3546a2ca Author: James Darnley Date: Tue Apr 5 02:45:10 2011 +0200 support more than yuv420p in yadif (and correctly support grey8) commit 8af3167bb6d32379c5575c67a5b88c82d5019cb4 Author: Lou Logan Date: Mon Mar 28 12:13:44 2011 -0800 Redefine sameq I think the documentation of sameq is causing confusion and misuse of this option. Signed-off-by: Michael Niedermayer commit 30c6fefd013a579f455c230ca9b9b0f8fc68285a Author: Darren Horrocks Date: Tue Apr 5 02:34:26 2011 +0200 fix runtime-cpu-detect bug in swscale swscale doesnt ever actually do any runtime detection at all when runtime cpu detection is enabled, it simply passes whatever is passed to -sws_flags, which could be nothing at all making swscale default to the C implementation. commit 434f248723d4d3e22545c3542ef9fc7c00b2379b Merge: 6114bff 2310ee4 Author: Michael Niedermayer Date: Tue Apr 5 02:24:55 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: (22 commits) ac3enc: move extract_exponents inner loop to ac3dsp avio: deprecate url_get_filename(). avio: deprecate url_max_packet_size(). avio: make url_get_file_handle() internal. avio: make url_filesize() internal. avio: make url_close() internal. avio: make url_seek() internal. avio: cosmetics, move AVSEEK_SIZE/FORCE declarations together avio: make url_write() internal. avio: make url_read_complete() internal. avio: make url_read() internal. avio: make url_open() internal. avio: make url_connect internal. avio: make url_alloc internal. applehttp: Merge two for loops applehttp: Restructure the demuxer to use a custom AVIOContext applehttp: Move finished and target_duration to the variant struct aacenc: reduce the number of loop index variables avio: deprecate url_open_protocol avio: deprecate url_poll and URLPollEntry ... Conflicts: libavformat/applehttp.c Merged-by: Michael Niedermayer commit 5f2e6c0fd11f34ba7cd013a0b22d7bd0d60613b8 Author: Mans Rullgard Date: Sat Mar 12 22:17:14 2011 +0000 ac3enc: NEON optimised extract_exponents Signed-off-by: Mans Rullgard commit 6114bffa91714c83a533ae7e5a597ee605d35c3d Author: Michael Niedermayer Date: Tue Apr 5 01:58:03 2011 +0200 retry_transfer_wrapper: only call interrupt callback when less than requested is r/w. Its a waste of cpu cycles otherwise commit 3e3ea93b3c5041ef983ae459db8b706b7b708ef1 Author: Michael Niedermayer Date: Tue Apr 5 00:06:11 2011 +0200 mpegts: Put CODEC_ID_NONE check back that was removed by mistake in 5b56ad03 Signed-off-by: Michael Niedermayer commit 2310ee4b1cca48609d06774b7c3c70a5f38f3473 Author: Mans Rullgard Date: Sat Mar 12 22:16:49 2011 +0000 ac3enc: move extract_exponents inner loop to ac3dsp Signed-off-by: Mans Rullgard commit 727c7aa02642c97b68356d40d1a8e9e835ba1a69 Author: Anton Khirnov Date: Thu Mar 31 18:00:55 2011 +0200 avio: deprecate url_get_filename(). URLContext.filename should be used directly. commit 5958df341de69d94b9958c10cc4aaca510b8cd24 Author: Anton Khirnov Date: Thu Mar 31 17:58:04 2011 +0200 avio: deprecate url_max_packet_size(). URLContext.max_packet_size should be used directly. commit 1869ea03b7fb8e3db2f034f4214e03bd3f8b3d30 Author: Anton Khirnov Date: Thu Mar 31 17:51:24 2011 +0200 avio: make url_get_file_handle() internal. commit 32a97d4630e8e742cba0344054842ed059dda807 Author: Anton Khirnov Date: Thu Mar 31 17:46:00 2011 +0200 avio: make url_filesize() internal. commit e52a9145c8bf0748ae970e210e528ff56508964c Author: Anton Khirnov Date: Thu Mar 31 17:36:06 2011 +0200 avio: make url_close() internal. commit 58a48c6511f1aded04885933fdb2449251f0ec64 Author: Anton Khirnov Date: Thu Mar 31 17:30:31 2011 +0200 avio: make url_seek() internal. commit 230a4686790ce97f9016b4e617f6bb4078560a3f Author: Anton Khirnov Date: Thu Mar 31 17:26:09 2011 +0200 avio: cosmetics, move AVSEEK_SIZE/FORCE declarations together commit 925e908bc7a3ddbd31f94ae9a67fbee170fef3d3 Author: Anton Khirnov Date: Thu Mar 31 16:48:01 2011 +0200 avio: make url_write() internal. commit dce375645945e31687493ebe82a7a89623e49bdc Author: Anton Khirnov Date: Thu Mar 31 16:40:31 2011 +0200 avio: make url_read_complete() internal. commit bc371aca468c3dd8d1a8cb2b44c99798f232b145 Author: Anton Khirnov Date: Thu Mar 31 16:31:43 2011 +0200 avio: make url_read() internal. commit 0589da0aa525e4ba7c554408339fa3e862402af5 Author: Anton Khirnov Date: Thu Mar 31 16:25:10 2011 +0200 avio: make url_open() internal. commit 62eaaeacb5ac083d9a96e95ec7df12113cd3ca81 Author: Anton Khirnov Date: Thu Mar 31 16:10:50 2011 +0200 avio: make url_connect internal. commit 5652bb94719c0bb0c58f73e44531af9977493223 Author: Anton Khirnov Date: Thu Mar 31 16:04:59 2011 +0200 avio: make url_alloc internal. commit 02fd687bbe15b6a3859532898c5d90bc7fa181d6 Author: Carl Eugen Hoyos Date: Mon Apr 4 16:43:15 2011 +0200 Only make buffer smaller in fill_buffer() if read_packet() is set. Fixes a possible invalid free(). commit 37ffba2a445b2ec82ea3096041f29ffca0af99d1 Author: Alexandre Colucci Date: Mon Apr 4 15:20:10 2011 +0200 Communicate pulldown flags to clients to fix VC-1 playback with pulldown content The pulldown flags should be communicated to the client of the libavcodec library. Not doing so causes jerky playback with pulldown content. Note that this change requires the patch previously provided here: http://ffmpeg.org/pipermail/ffmpeg-devel/2011-April/110314.html Signed-off-by: Michael Niedermayer commit 2506ad9f170ba3c21eed5dd884f51413adc51d37 Author: Alexandre Colucci Date: Mon Apr 4 15:08:50 2011 +0200 Fix VC-1 playback with pulldown content The attached patch fixes the jerky playback of VC-1 content with pulldown. The pulldown flags were incorrectly set. They must be correct in order to display the frames with the correct timing as mentioned in the specifications: "SMPTE 421M: VC-1 Compressed Video Bitstream Format and Decoding Process". More precisely the following tables: Table 20: Progressive P picture layer bitstream for Advanced Profile Table 22: Progressive B picture layer bitstream for Advanced Profile Table 23: Progressive Skipped picture layer bitstream for Advanced Profile Table 82: Interlaced Frame I and BI picture layer bitstream for Advanced Profile Table 83: Interlaced Frame P picture layer bitstream for Advanced Profile Table 84: Interlaced Frame B picture layer bitstream for Advanced Profile Table 85: Picture Layer bitstream for Field 1 of Interlace Field Picture for Advanced Profile Signed-off-by: Michael Niedermayer commit 0d8a33b11e605f7fb6b51640d438d41fec08db1c Author: Martin Storsjö Date: Mon Mar 21 00:23:54 2011 +0200 applehttp: Merge two for loops The previous commit didn't do this straight away, to keep the diff slightly simpler. commit 6cc7f1398257d4ffa89f79d52f10b2cabd9ad232 Author: Martin Storsjö Date: Mon Mar 21 00:21:56 2011 +0200 applehttp: Restructure the demuxer to use a custom AVIOContext This avoids issues where EOF at the end of the segment is given the variant demuxer. Now the demuxers only see one single data stream (as when using the applehttp protocol handler). commit d3964da2c2d5e92b555a89e9650ad5e6c1d10010 Author: Martin Storsjö Date: Mon Mar 21 00:08:59 2011 +0200 applehttp: Move finished and target_duration to the variant struct This is a preparation for a restructuring of the demuxer, to minimize the later diff. commit 57cc1ad35fd488c7a879661498f6f3508038d5a9 Author: Young Han Lee Date: Thu Mar 31 22:41:53 2011 +0900 aacenc: reduce the number of loop index variables Signed-off-by: Janne Grunau commit 333e8943635b794099b1fb04e9d3fbb4b16a75b2 Author: Anton Khirnov Date: Thu Mar 31 16:00:49 2011 +0200 avio: deprecate url_open_protocol The unbuffered API will be made private and it's not used anywhere internally. commit e2307053925260331803412b35e5731069e787c3 Author: Anton Khirnov Date: Thu Mar 31 15:22:18 2011 +0200 avio: deprecate url_poll and URLPollEntry They're unimplemented and nobody cared to do anything with that for 10 years. commit e05a3ac713d3343a202d795699020eca3d397144 Author: Justin Ruggles Date: Mon Mar 28 09:18:37 2011 -0400 ac3enc: select bandwidth based on bit rate, sample rate, and number of full-bandwidth channels. This reduces high-frequency artifacts and improves the quality of the lower frequency audio at low bit rates. commit e3c007bb43d991836e2ebf941d14a04903ece654 Author: Justin Ruggles Date: Sun Apr 3 15:15:36 2011 -0400 flvdec: fix segfault in amf_parse_object() due to NULL key fixes Issue 2674 commit 2cae9809e2d59c7336fc2cccb97b82c7f764868a Merge: 3c9bfb3 906fd03 Author: Michael Niedermayer Date: Mon Apr 4 02:15:12 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: fate: fix partial run when no samples path is specified ARM: NEON fixed-point forward MDCT ARM: NEON fixed-point FFT lavf: bump minor version and add an APIChanges entry for avio changes avio: simplify url_open_dyn_buf_internal by using avio_alloc_context() avio: make url_fdopen internal. avio: make url_open_dyn_packet_buf internal. avio: avio_ prefix for url_close_dyn_buf avio: avio_ prefix for url_open_dyn_buf avio: introduce an AVIOContext.seekable field ac3enc: use generic fixed-point mdct lavfi: add fade filter Change yadif to not use out of picture lines. lavc: deprecate AVCodecContext.antialias_algo lavc: mark mb_qmin/mb_qmax for removal on next major bump. Conflicts: doc/filters.texi libavcodec/ac3enc_fixed.h libavcodec/ac3enc_float.h libavfilter/Makefile libavfilter/allfilters.c libavfilter/vf_fade.c Merged-by: Michael Niedermayer commit 3c9bfb336867ccd32a6e8490930961bcc14b3fdc Author: Aurelien Jacobs Date: Fri Sep 10 23:10:53 2010 +0200 add MicroDVD muxer and demuxer Signed-off-by: Aurelien Jacobs commit deff8a6d3a7020fdda7fdb3f80d0003b5f44279b Author: Justin Ruggles Date: Sun Apr 3 15:18:36 2011 -0400 flvdec: fix segfault in amf_parse_object() due to NULL key fixes Issue 2674 Signed-off-by: Michael Niedermayer commit 100a6b7c77fb4fa5b3a91e9206b9b3e7a7d01238 Author: Peter Ross Date: Sun Apr 3 10:14:00 2011 +1000 ffmpeg: make 'bits_per_raw_sample' option more useful Currently bits_per_raw_sample is exposed as an AVCodecContext option. The option is not very useful, because ffmpeg 1) overwrites it with a value from the upstream codec, or 2) it resets the value whenever the video is resampled. This patch adds the -bits_per_raw sample option to FFmpeg, and caches the value like is done for the -pix_fmt option. Example usage: ffmpeg v210.avi -pix_fmt rgb48 -bits_per_raw_sample 10 out%d.dpx Signed-off-by: Michael Niedermayer commit 906fd03070c7dc39b4c937befa2c3559bccf7ba7 Author: Mans Rullgard Date: Sun Apr 3 23:12:16 2011 +0100 fate: fix partial run when no samples path is specified This restores the behaviour of running only the builtin regression tests when no path to external samples is given. aa3805a inadvertently broke this by always setting SAMPLES to something. Using := makes the ifdef test work as expected when the FATE_SAMPLES environment variable is empty. Signed-off-by: Mans Rullgard commit f7653904c8a136787d9dda97a02aecfe1746a465 Author: Mans Rullgard Date: Mon Mar 28 19:39:44 2011 +0100 ARM: NEON fixed-point forward MDCT Signed-off-by: Mans Rullgard commit dba9852935f31d81d16bf26ee21d164d5d5f5764 Author: Mans Rullgard Date: Sun Mar 27 10:26:58 2011 +0100 ARM: NEON fixed-point FFT Signed-off-by: Mans Rullgard commit 4dcde00cfcf7914dec32683a8d511e281d0875fc Author: Anton Khirnov Date: Thu Mar 17 13:42:45 2011 +0100 lavf: bump minor version and add an APIChanges entry for avio changes commit 8bea72f7ebcb57ab929657ff5e2dcd1f6f28f222 Author: Anton Khirnov Date: Sun Apr 3 22:55:31 2011 +0200 avio: simplify url_open_dyn_buf_internal by using avio_alloc_context() commit 0e09997fa452565e59bfbdf81a96917b3c503470 Author: clsid2 Date: Mon Mar 7 00:08:34 2011 +0000 Libavcodec AC3/E-AC3/DTS decoders now output floating point data. git-svn-id: https://ffdshow-tryout.svn.sourceforge.net/svnroot/ffdshow-tryout@3769 3b938f2f-1a1a-0410-8054-a526ea5ff92c commit 361fa0ed40a042393a2691e3dba9bd7c4bcfe188 Author: clsid2 Date: Mon Mar 7 00:28:50 2011 +0000 Float output for libavcodec AAC decoder git-svn-id: https://ffdshow-tryout.svn.sourceforge.net/svnroot/ffdshow-tryout@3770 3b938f2f-1a1a-0410-8054-a526ea5ff92c commit ba7a28045f0de749f5e84fbefeb626da9952226c Author: clsid2 Date: Mon Mar 7 00:46:59 2011 +0000 Float output for libavcodec Vorbis decoder git-svn-id: https://ffdshow-tryout.svn.sourceforge.net/svnroot/ffdshow-tryout@3771 3b938f2f-1a1a-0410-8054-a526ea5ff92c commit 724f6a0fa43f615dcebb2cb16ccb7c60ef7ec95c Author: Anton Khirnov Date: Thu Mar 17 08:44:44 2011 +0100 avio: make url_fdopen internal. The unbuffered URLContext API will be made private, so there's no point in this function being public. commit 403ee835e7913eb9536b22c2b22edfdd700166a9 Author: Anton Khirnov Date: Thu Mar 17 08:19:54 2011 +0100 avio: make url_open_dyn_packet_buf internal. It doesn't look fit to be a part of the public API. Adding a temporary hack to ffserver to be able to use it, should be cleaned up when somebody is up for it. commit 6dc7d80de7236d04a6ee30f0e4cd03f055893bcf Author: Anton Khirnov Date: Thu Mar 17 08:16:07 2011 +0100 avio: avio_ prefix for url_close_dyn_buf commit b92c5452822f9f58d33daf933a0d2a5516866bc1 Author: Anton Khirnov Date: Thu Mar 17 08:13:34 2011 +0100 avio: avio_ prefix for url_open_dyn_buf commit 8978fedaeefdff50ed4deefbfe822ad07f19f616 Author: Anton Khirnov Date: Sat Mar 5 21:06:46 2011 +0100 avio: introduce an AVIOContext.seekable field Use it instead of url_is_streamed and AVIOContext.is_streamed. commit c9d6da73a8d3b0ff7201b37b1bb2d5f717b8aa37 Author: Carl Eugen Hoyos Date: Sun Apr 3 22:45:16 2011 +0200 Remove superfluous free(). commit 79997def65fd2313b48a5f3c3a884c6149ae9b5d Author: Mans Rullgard Date: Mon Mar 21 18:07:59 2011 +0000 ac3enc: use generic fixed-point mdct This makes the AC3 encoder use the shared fixed-point MDCT rather than its own implementation. The checksum changes are due to different rounding in the MDCT. Signed-off-by: Mans Rullgard commit 7f125c3e87f0ce48abfdbcf02e3d4c1c33f025ba Author: Michael Niedermayer Date: Thu Mar 10 11:48:43 2011 +0100 Move frame_pred_frame_dct check elsewhere. Fixes issue2405 commit 2ee453610fafb83f1442d764c75554d83508cdb5 Author: Michael Niedermayer Date: Thu Mar 10 10:32:46 2011 +0100 Fix mpeg-ps misdetected as m4v. Fix issue2326 Signed-off-by: Michael Niedermayer commit 19457a5d4a4bd25783a6a7fb665eb509a693eb2e Author: Michael Niedermayer Date: Wed Mar 9 17:03:09 2011 +0100 Fix issue2246 ignore last ctts duration Signed-off-by: Michael Niedermayer commit 7d948dc424c3620e351d27afdf933c99f9435467 Author: Michael Niedermayer Date: Wed Mar 9 15:13:59 2011 +0100 Support changing pixel formats on avfilter input. Fix issue2217 Signed-off-by: Michael Niedermayer commit 0b9dffc67ab506a5d148993b98d8713a76623892 Author: Michael Niedermayer Date: Wed Mar 9 15:12:24 2011 +0100 Improve codec_tag guessing code. Signed-off-by: Michael Niedermayer commit 24009f3601e883199e6dc232cec7d60e57764b3c Author: Michael Niedermayer Date: Wed Mar 9 15:11:50 2011 +0100 Make find_pix_fmt() non static Signed-off-by: Michael Niedermayer commit bbd1c43fa3231cae594e9103a0e041977eafa244 Author: Michael Niedermayer Date: Wed Mar 9 03:30:24 2011 +0100 Dont leak sws contexts. Signed-off-by: Michael Niedermayer commit 2f9815dd26bf9d63720fb3e0b38900180c35f3b3 Author: Michael Niedermayer Date: Wed Mar 9 01:07:35 2011 +0100 fixed issue1962 EVO detection Signed-off-by: Michael Niedermayer commit 512f973eac9a8c38ca33f089b6f3bb433ffc6a2e Author: Michael Niedermayer Date: Tue Mar 8 22:39:14 2011 +0100 Fix issue2437 commit 5b56ad03fa3c580e38322c902891a77ecc93686b Author: Michael Niedermayer Date: Fri Mar 4 01:12:17 2011 +0100 Reimplement stream probe try #2 Signed-off-by: Michael Niedermayer commit 15957b197a63d08c33c34f08ef8b161335736914 Author: Michael Niedermayer Date: Tue Mar 1 20:17:33 2011 +0100 Partial rewrite stream probe code. Fix issue2312. Signed-off-by: Michael Niedermayer commit 6e77feb201924f16bd69cbb5cfabb1a7b5e8a52e Author: Michael Niedermayer Date: Tue Mar 1 15:59:00 2011 +0100 Dont be so picky on decoding pps in extradata. Fixes issue2517 Signed-off-by: Michael Niedermayer commit 116758a358a2f176a27d521723a6c6c4d2ef52c7 Author: Michael Niedermayer Date: Fri Feb 25 02:46:12 2011 +0100 Fix yuvj420p scaling artefact, issue1108. Signed-off-by: Michael Niedermayer commit 151193603402aa2dde105c342b658696ccb441b0 Author: Michael Niedermayer Date: Sat Feb 26 22:51:56 2011 +0100 Correctly implement: commit c0ec9918b066c6bfca8613ac75b589bd3e405971 Author: MÃ¥ns RullgÃ¥rd Date: Tue Aug 24 17:47:05 2010 +0000 Remove global mm_flags variable Originally committed as revision 24909 to svn://svn.ffmpeg.org/ffmpeg/trunk Signed-off-by: Michael Niedermayer commit fcd62e1265a2eeddd3af7565af419043264a748b Author: Michael Niedermayer Date: Sun Apr 3 11:01:20 2011 +0200 Add sign off recommandition and definition of meaning. Signed-off-by: Michael Niedermayer commit 731bf41279f49e0c10cea47fa72ea845ac14d208 Author: compn Date: Sun Apr 3 10:45:20 2011 +0200 Reword make fate patch checklist entry Signed-off-by: Michael Niedermayer commit aadfc9ee747eeb37f9ea77c0cc56a88226b9d21b Author: Brandon Mintern Date: Mon Feb 21 12:02:57 2011 +0100 lavfi: add fade filter Port fade filter from libavfilter soc repo, with minor fixes by Stefano. Signed-off-by: Michael Niedermayer Signed-off-by: Anton Khirnov commit 233ed6b314ee6b8d37d16a958f1bc309ae667393 Author: Michael Niedermayer Date: Fri Feb 18 19:10:33 2011 +0100 Change yadif to not use out of picture lines. Fixes issue2272. Signed-off-by: Michael Niedermayer Signed-off-by: Anton Khirnov commit 4e3945fd2875c497d25f49a3c35cd6cf6577259e Author: Anton Khirnov Date: Sat Apr 2 13:34:12 2011 +0200 lavc: deprecate AVCodecContext.antialias_algo It's been unused since mp3float decoder was added. commit 4a49d2d59cce5d10b8ac40ca0185ccf1f8deb99c Author: Anton Khirnov Date: Sat Apr 2 13:18:00 2011 +0200 lavc: mark mb_qmin/mb_qmax for removal on next major bump. They've been unused and deprecated for about five years. commit f38fa75d976c06649cd67d0b581b199679c26470 Author: Wim Lewis Date: Sat Apr 2 15:30:24 2011 -0700 Add or elaborate on some documentation comments in avcodec.h. Signed-off-by: Michael Niedermayer commit 71aed40b56af81d46c19620af5c4579703167475 Author: Michael Niedermayer Date: Sun Apr 3 02:47:17 2011 +0200 patch checklist:git format-patch Signed-off-by: Michael Niedermayer commit 7d6f61bdd26ec1e09328545983730261d5e7978d Author: Michael Niedermayer Date: Sun Apr 3 02:45:27 2011 +0200 patch checklist:uggest fate instead of regression tests Signed-off-by: Michael Niedermayer commit a3b718436510c0e0930431a8a5255bcf4d4b4068 Author: Michael Niedermayer Date: Sun Apr 3 02:44:17 2011 +0200 patch checklist:Remove pointless checkheaders comment, its just a waste of time Signed-off-by: Michael Niedermayer commit 78431098f9e306ebe27e7698d0ae539e3df2afe9 Author: Anssi Hannula Date: Mon Feb 28 02:20:56 2011 +0200 lavf: inspect more frames for fps when container time base is coarse As per issue2629, most 23.976fps matroska H.264 files are incorrectly detected as 24fps, as the matroska timestamps usually have only millisecond precision. Fix that by doubling the amount of timestamps inspected for frame rate for streams that have coarse time base. This also fixes 29.970 detection in matroska. Signed-off-by: Michael Niedermayer commit f35439699f5546774b840ae9fba7df82729ef0ff Merge: 85c9365 bc15488 Author: Michael Niedermayer Date: Sun Apr 3 02:28:01 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: Fixed-point MDCT with 32-bit unscaled output lavc: deprecate rate_emu lavc: mark hurry_up for removal on next major bump parser: mark av_parser_parse() for removal on next major bump lavc: add missing audioconvert includes jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer commit 85c9365d65c4d03c468cead13f722ddce89d8495 Author: Michael Niedermayer Date: Sun Apr 3 02:06:31 2011 +0200 Revert "configure: use dlltools instead of lib.exe" Reason, is this was requested by the windows experts / seems dlltool causes alot of problems This reverts commit ec10a9ab461b26b96eff7bbbb8623f42d8ee04ad. Conflicts: configure Signed-off-by: Michael Niedermayer commit bc154882e11f4a218cc8cfb10ae0b4cbc83b5f9f Author: Mans Rullgard Date: Mon Mar 21 17:52:34 2011 +0000 Fixed-point MDCT with 32-bit unscaled output Signed-off-by: Mans Rullgard commit 679191a5df5eb94bb9e68e6090e0bf6b742cc4f3 Author: Michael Niedermayer Date: Sat Apr 2 20:26:39 2011 +0200 yadif:Fix assert() failure Signed-off-by: Michael Niedermayer commit c4804feca2b81e9c482cc21c72ea8b942e4cca04 Author: Michael Niedermayer Date: Sat Apr 2 19:26:47 2011 +0200 dpx:fix typo Signed-off-by: Michael Niedermayer commit ba24c5a3d3ca4e2e67c0947df9a6360ccccf084c Author: Peter Ross Date: Sat Apr 2 15:59:44 2011 +1100 cosmetics: indentation Signed-off-by: Michael Niedermayer commit 4ec720059cc1ddfa849c4d199f4fd974d8ab5d92 Author: Peter Ross Date: Sat Apr 2 15:59:28 2011 +1100 dpx encoder: support 10-bit packing method Signed-off-by: Michael Niedermayer commit 1b5282a221b9e9544c3807b56335d577eedda264 Author: Peter Ross Date: Fri Apr 1 23:23:28 2011 +1100 dpx decoder: read sample aspect ratio Signed-off-by: Michael Niedermayer commit 4ce776d63691afd39900b5be48e20c4c42ae8057 Author: Michael Niedermayer Date: Sat Apr 2 17:59:10 2011 +0200 H264: fix slice end error detection Signed-off-by: Michael Niedermayer commit 0d5e6843b421c643574da7ba2cc148ce6025f6f6 Author: Michael Niedermayer Date: Sat Apr 2 17:57:53 2011 +0200 h264: change a few comments into error messages Signed-off-by: Michael Niedermayer commit ed5fcd60b2d1d4993e2094c9836dedb8ef9b2ed3 Author: Anton Khirnov Date: Sat Apr 2 12:51:28 2011 +0200 lavc: deprecate rate_emu It's not used anywhere and apparrently hasn't been for a very long time. commit 8ed2ae09a25e5860342b97f7c2c7729fffaec320 Author: Anton Khirnov Date: Sat Apr 2 11:56:21 2011 +0200 lavc: mark hurry_up for removal on next major bump It has been deprecated for about five years, skip_idct/skip_frame should be used instead. commit 9073ca6c6ebb9e3e9b60d968b7aa16cc8b6d558d Author: Anton Khirnov Date: Sat Apr 2 11:55:04 2011 +0200 parser: mark av_parser_parse() for removal on next major bump Fixes build with the bump, since the prototype is already marked for removal. commit 6f3d3eacf627a8c677384b73c6385e9b8a7095df Author: Anton Khirnov Date: Sat Apr 2 11:50:10 2011 +0200 lavc: add missing audioconvert includes commit b4b167ecbff793a08242494a7d76effec81f43be Author: Anton Khirnov Date: Sat Apr 2 11:35:14 2011 +0200 jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY commit b25d931a82c7b95b2f47e6759c9d9be7705d664b Author: Michael Niedermayer Date: Sat Apr 2 16:09:47 2011 +0200 Fix stream mapping regression Signed-off-by: Michael Niedermayer commit 7dd29fb606e4989fce7ddc15f25f0e84b4b2edf1 Author: Stefano Sabatini Date: Sat Apr 2 11:42:16 2011 +0200 drawtext: extend/clarify examples in the filter description commit 7e3373d2cfdf2b152885f34af33ece7f50f73c91 Author: Stefano Sabatini Date: Sat Apr 2 11:29:43 2011 +0200 drawtext: fix wrong reference in boxcolor option description commit 17be8ef709fb0597bb8e619f64be72e7abe43118 Author: Stefano Sabatini Date: Sat Apr 2 11:27:09 2011 +0200 drawtext: add documentation for the shadow parameters commit 0fff764bdb68f480d75f001f1b09e337cb264990 Author: Stefano Sabatini Date: Sat Apr 2 11:26:41 2011 +0200 drawtext: allow negative shadow offset values commit 4defa68fe25eae4d7c27341e3b35811c047dcd3f Merge: a2f5e14 aa05f21 Author: Michael Niedermayer Date: Sat Apr 2 01:51:44 2011 +0200 Merge remote branch 'qatar/master' * qatar/master: ac3enc: ARM optimised ac3_compute_matissa_size ac3: armv6 optimised bit_alloc_calc_bap fate: simplify fft test rules avio: document avio_alloc_context. lavf: make compute_chapters_end less picky. sierravmd: fix Indeo3 videos FFT: simplify fft8() fate: add fixed-point fft/mdct tests Fixed-point support in fft-test ape: check that number of seektable entries is equal to number of frames Merged-by: Michael Niedermayer commit a2f5e14a867768019b49b830e29801f1bfb2abb7 Author: Michael Niedermayer Date: Sat Apr 2 00:29:07 2011 +0200 Timeout TCP open() after 5 seconds. Signed-off-by: Michael Niedermayer commit ecf94986c8ba7c9fb4f674ee93e3be5f73d8ccdd Author: Carl Eugen Hoyos Date: Sat Apr 2 00:50:39 2011 +0200 Fix compilation with --disable-vdpau commit 2a0bd2bfc957abe3fab97cc27e6d997099082841 Author: Carl Eugen Hoyos Date: Sat Apr 2 00:48:43 2011 +0200 Make a plausibility check when setting channel layout for TrueHD. TrueHD supports more channels than FFmpeg, so a valid sample could set the channel layout to a value that represents less channels than the sample actually consists of. commit e1cfe04c766c1a703bc3671fde7d651f2b79b230 Author: Carl Eugen Hoyos Date: Sat Apr 2 00:24:26 2011 +0200 Match the documentation of -s with the current implementation. commit aa05f2126e18d23432bde77e6f44e41691472fef Author: Mans Rullgard Date: Fri Mar 11 17:25:45 2011 +0000 ac3enc: ARM optimised ac3_compute_matissa_size Signed-off-by: Mans Rullgard commit 182826c8846f2f7f0538c4b2a09e882e29881804 Author: Mans Rullgard Date: Fri Mar 11 02:50:57 2011 +0000 ac3: armv6 optimised bit_alloc_calc_bap Signed-off-by: Mans Rullgard commit 5085a1a068d85cf68501d8efe09acfbd42ff3860 Author: Mans Rullgard Date: Thu Mar 31 16:46:36 2011 +0100 fate: simplify fft test rules Signed-off-by: Mans Rullgard commit 3c96c64821184247b46052dee74442024098f47f Author: Anton Khirnov Date: Thu Mar 31 13:57:48 2011 +0200 avio: document avio_alloc_context. commit ab11317c1f97db19eddebe1bc5d4cb5a53718c9f Author: Anton Khirnov Date: Fri Apr 1 03:02:02 2011 +0200 lavf: make compute_chapters_end less picky. In particular, now it assumes that a) chapters are chronologically ordered b) chapters have the same timebases c) duration of the stream is known and asserts if any of these is not met. Make it properly deal with harsher conditions. fixes issue2320 commit 7b9750ed9b4d500e8f322a58a9cc2032eddc666b Author: Reimar Döffinger Date: Fri Apr 1 19:42:31 2011 +0200 Fix doxy-style for comment ("///>" should be "///<" instead). commit 0e635f3e86956bd85896831f3c7e6dfaef97bf7d Author: Matthew Hoops Date: Thu Mar 31 10:42:22 2011 -0400 sierravmd: fix Indeo3 videos Signed-off-by: Anton Khirnov commit 9b7a0c5d886223802df54b754caf75b6e125e76f Author: Reimar Döffinger Date: Mon Mar 28 22:33:58 2011 +0200 Allow selecting VDPAU, XvMC via get_format for MPEG-2 To avoid further special-casing, dummy AVHWAccels are added for VDPAU. It should be possible to move VDPAU completely to AVHWAccel later. commit 41327cca613e52a3030b0f133b38bcddff05243c Author: Mans Rullgard Date: Sun Mar 27 14:49:55 2011 +0100 FFT: simplify fft8() Part of the fft8() function corresponds to the BUTTERFLIES macro, so use it. Signed-off-by: Mans Rullgard commit e7c7b0d000e81d24327602e04d8fed400dbb7193 Author: Michael Niedermayer Date: Fri Apr 1 17:30:45 2011 +0200 Another aspect ratio fix try. This leaves the setdar addition at the end (preferred by people). Signed-off-by: Michael Niedermayer commit a0350330cdbbb39544e64f4909d86a969b4664dd Author: Michael Niedermayer Date: Fri Apr 1 13:45:39 2011 +0200 Move flv format #defines to common header so they can be used by the encoder too. Signed-off-by: Michael Niedermayer commit b41a1089141ae819fee1e3d37967edb622bce841 Author: Mans Rullgard Date: Thu Mar 31 16:02:25 2011 +0100 fate: add fixed-point fft/mdct tests Signed-off-by: Mans Rullgard commit 6efe6028ed182d82d4ac8b9801fbcee91a88c053 Author: Mans Rullgard Date: Wed Mar 30 21:13:21 2011 +0100 Fixed-point support in fft-test Signed-off-by: Mans Rullgard commit 6408529b5d5e8564312ed1b70c0db5a9bc8ea9d5 Author: Peter Ross Date: Fri Apr 1 23:11:52 2011 +1100 Increase ffmpeg video encoding buffer size to permit encoding of DPX images The header generated by the DPX encoder is 1664 bytes. commit c178fdeaecf442e6aa88ce1c5ec6db189823805e Author: Peter Ross Date: Fri Apr 1 23:11:24 2011 +1100 Add .dpx to the list of supported file extensions for the image2 muxer commit f339f908a4eb08e1d49559e085159d78b99285f1 Author: Peter Ross Date: Sat Mar 26 15:12:35 2011 +1100 DPX image encoder commit 0c4d4a9355bc7e531ed9995252379611be3027e0 Author: Michael Niedermayer Date: Fri Apr 1 13:33:51 2011 +0200 Cleanup flv keyframe index reading and add some saftey checks. Signed-off-by: Michael Niedermayer commit 676d380f2adda2fdd5170e89b95bb9a112c3d18f Author: Michael Niedermayer Date: Fri Apr 1 12:46:36 2011 +0200 Fix undefined behavior in ffv1 with insane widths. The new tables is large enough to prevent this together with our image size checks. Signed-off-by: Michael Niedermayer commit 29a290439ba28fde00b2a27d5afef863c63abb37 Author: Kostya Shishkov Date: Fri Apr 1 09:26:38 2011 +0200 ape: check that number of seektable entries is equal to number of frames fixes issue2480 Signed-off-by: Anton Khirnov commit 7ac167493e5404fd2d3f307d02127f23fca970f0 Merge: 859676d e006d71 Author: Michael Niedermayer Date: Fri Apr 1 02:55:29 2011 +0200 Merge remote-tracking branch 'newdev/master' * newdev/master: mpegts: propagate avio EOF in read_packet() configure: Initial support for --target-os=symbian Fixed-point FFT and MDCT Include dependencies for test programs ac3enc: simplify sym_quant() flvdec: read index stored in the 'keyframes' tag. mov: Add support for zero-sized stsc runs. Merged-by: Michael Niedermayer commit 859676dd426e7051b41b174886e6e64271e93cdc Author: Michael Niedermayer Date: Fri Apr 1 02:13:51 2011 +0200 Insert setdar at the begin of a filter chain instead the end. This fixes -vf setsar Signed-off-by: Michael Niedermayer commit b1ca9642a2a3968a6f6ab80c6d2f1c37e9046d3d Author: Michael Niedermayer Date: Fri Apr 1 00:24:12 2011 +0200 Revert "Remove support for stripping executables" People did not like this change. This reverts commit e0be794a71be25a350f68287ee291b4942bcb7d8. commit 607cd90cdbcc1bf1160dc4ee15b079fd5a568462 Author: Peter Ross Date: Wed Mar 30 18:06:10 2011 +1100 make image2 muxer/demuxer support sequence of individual rawvideo files Signed-off-by: Michael Niedermayer commit 0bb240acb39428fb418835e5d43534bb2959e20d Author: Peter Ross Date: Wed Mar 30 18:03:40 2011 +1100 img2: stop using CODEC_ID_RAWVIDEO to trigger processing of independant y/u/v image files This is requireed, as img2 will be modified soon to support .raw image file sequences. Signed-off-by: Michael Niedermayer commit e006d71fa849542eb27146efac629288703b3d75 Author: Jindrich Makovicka Date: Thu Mar 31 16:58:50 2011 +0200 mpegts: propagate avio EOF in read_packet() Allows distinguishing between EOF and IO error in read_packet return code. Signed-off-by: Jindrich Makovicka Signed-off-by: Anton Khirnov commit 1e96d4c71e68fdefc284d7dfb9701d1378a024c8 Author: Nicolas George Date: Thu Mar 31 18:49:07 2011 +0200 ALSA: fix a stupid bad use of av_freep. It caused a segfault when channel reordering was in use and the last chunk of data was not silent. Spotted and diagnosed by Carl Eugen Hoyos. commit 1c69c79f2b11627cb50f1bc571de97ad8cbfefb7 Author: Martin Storsjö Date: Tue Jan 25 10:48:38 2011 +0200 configure: Initial support for --target-os=symbian Signed-off-by: Martin Storsjö commit 7087ce08c84dd20404ba258096530cc547d25c15 Author: Mans Rullgard Date: Sat Mar 26 15:20:30 2011 +0000 Fixed-point FFT and MDCT commit 2f97b12eaf8ada30b3884604d66dbdf51e727b67 Author: Mans Rullgard Date: Wed Mar 30 21:23:04 2011 +0100 Include dependencies for test programs This makes sure the various *-test programs are correctly rebuilt when necessary. Signed-off-by: Mans Rullgard commit 7f6e05cdfd1242a6774e89283b6e2cefde191590 Author: Mans Rullgard Date: Thu Mar 31 01:28:08 2011 +0100 ac3enc: simplify sym_quant() These expressions are equivalent since levels is always odd, and overflow is impossible due to the constraints set by the assert(). Signed-off-by: Mans Rullgard commit 1caa4123bd83f8b1f8a4e11a8d8539be7d54b105 Merge: 8b8bf89 229e263 Author: Michael Niedermayer Date: Thu Mar 31 12:47:35 2011 +0200 Merge remote-tracking branch 'newdev/master' * newdev/master: rtsp: Use GET_PARAMETER for keep-alive for generic RTSP servers mlp_parse.c: set AVCodecContext channel_layout APIChanges: mark the place where 0.6 was branched. avio: make get_checksum() internal. avio: move ff_crc04C11DB7_update() from avio.h -> avio_internal.h avio: make init_checksum() internal. NOT MERGED Add MxPEG decoder NOT MERGED Add support for picture_ptr field in MJpegDecodeContext NOT MERGED Move MJPEG's input buffer preprocessing in separate public function NOT MERGED Support reference picture defined by bitmask in MJPEG's SOS decoder sndio bug fix Merged-by: Michael Niedermayer commit cb7e2c1ca864a2ff44c851689ba8a2d4a81dfd27 Author: Kharkov Alexander Date: Fri Mar 18 08:26:51 2011 +0100 flvdec: read index stored in the 'keyframes' tag. 'keyframes' metatag is not part of the standard, it is just convention to use such kind of metatag information for indexing. Structure is following, it allows to have it inconsistent: keyframes: times (array): time0 (num) time1 (num) time2 (num) filepositions (array) position0 (num) position1 (num) Signed-off-by: Anton Khirnov commit 9dd94f8379a0f7b3c820bf73c45fa888971c7432 Author: Alex Converse Date: Mon Mar 28 13:54:18 2011 -0700 mov: Add support for zero-sized stsc runs. A zero sized stsc run doesn't make a lot of sense but the spec does not prohibit them and MPlayer VLC demuxers support them. Signed-off-by: Anton Khirnov commit 8b8bf89e52bc3bf4be1a9f10eb1eb153a443172f Author: Michael Niedermayer Date: Wed Mar 30 20:58:13 2011 +0200 Revert "Do no modify terminal parameters using termios.h" This reverts commit cb48e245e6e770f146220fac0a8bd4dc1a5e006c. Reason being we like pressing "q" to quit ffmpeg. Conflicts: ffmpeg.c Signed-off-by: Michael Niedermayer commit 93dfda88968c5e4d3f596f35a446fb7c238e96b2 Author: Baptiste Coudurier Date: Wed Mar 30 14:08:16 2011 -0700 In ipod/mov/mp4 muxer, always write esds descriptor length using 4 bytes, ipod shuffle doesn't support anything else. commit 229e2631be528c595650a7568c1d4df8af9c4944 Author: Martin Storsjö Date: Wed Mar 30 23:35:28 2011 +0300 rtsp: Use GET_PARAMETER for keep-alive for generic RTSP servers According to the RFC, GET_PARAMETER should be used for this, and according to a report from Tim Ouellette, OPTIONS doesn't work for keeping the connection alive for some servers. Also, live555 uses GET_PARAMETER for this purpose. Signed-off-by: Luca Barbato commit da3534b01e00502b202ed3f51ffde12866e5111d Author: Stefano Sabatini Date: Wed Mar 30 00:15:34 2011 +0200 gradfun: add notice from the MPlayer manual Add notice telling that the filter is designed for playback only. commit 2ccbb3428b9f4d77ef3f46d1f89bdf7f4ed6f148 Author: Stefano Sabatini Date: Sat Mar 26 16:14:15 2011 +0100 documentation: add setdar and setsar description to filters.texi commit 2f86e7bd12d8023da3349f10490b1e5b64531e23 Author: Stefano Sabatini Date: Wed Mar 30 21:30:31 2011 +0200 graphparser: add a NULL check on the argument passed to strstr Fix crash in create_filter() which occurrs if a scale filter with no args is provided. commit ffd39f9d2366b4bbfcac3c47087a77c6eced362b Author: Michael Niedermayer Date: Wed Mar 30 20:25:32 2011 +0200 Fix typo from e3a84542. Signed-off-by: Michael Niedermayer commit d9699ea825304bfbc4bbf61d9fcdf97e74ff6361 Author: Baptiste Coudurier Date: Wed Mar 30 08:47:30 2011 -0700 Fix dnxhd custom options, add AVClass in private context commit efdad9fbc777e6e27a524598c8f0ecf040a7b0c9 Author: Baptiste Coudurier Date: Wed Mar 23 10:22:05 2011 -0700 In mov muxer, fix yuv range in avid atoms used by dnxhd. commit 4b6f097b21d29ac11dd587038b0d385dbbed1c24 Author: John Stebbins Date: Fri Mar 25 19:34:19 2011 -0700 mlp_parse.c: set AVCodecContext channel_layout The channel layout isn't getting set for mlp and truehd audio. Signed-off-by: Anton Khirnov commit 95c851e2c69bb379b9458558561526bcbd02d5db Author: Anton Khirnov Date: Wed Mar 30 16:57:08 2011 +0200 APIChanges: mark the place where 0.6 was branched. commit da3716021b707d284454bd294ad9254188dd7caa Author: Gwenole Beauchesne Date: Wed Mar 30 09:29:34 2011 +0200 vaapi: allow build against older VA-API 0.31. commit dd950e2ebb08cadf8f5a5c42d6506a89abc06996 Author: Gwenole Beauchesne Date: Wed Mar 30 09:21:04 2011 +0200 vaapi: require version >= 0.32.0. commit f9c215e260d62c1213ea4f241b01ba4c4cf1c7b7 Author: Gwenole Beauchesne Date: Wed Mar 30 09:19:50 2011 +0200 vaapi: move configure check down. commit 39530272c5ab218407e5d7bcca80fd7f608a6eca Author: Sven C. Dack Date: Wed Mar 30 17:02:29 2011 +0200 Remove a memory allocation and the associated memcpy. commit 007b1f04d76175da1befd8853c30b4fada90a0f2 Author: Peter Ross Date: Wed Mar 30 16:39:24 2011 +1100 h264: permit h264 decoder to be compiled when svq3 decoder is disabled Signed-off-by: Michael Niedermayer commit e3a8454205b5c6141c9a525c261de9b75b3add40 Author: Frank Barchard Date: Tue Mar 29 23:56:17 2011 -0700 SWSCALE: Increase maximim with from 5120 to 21504 Heres a benchmark VOFW 5120 VOFW 21504 Note 10438.8 10344.2 timex ffmpeg -y -i tulip2.mp4 tulip2.yuv 25611.9 24256.9 timex ffmpeg -y -itulip2.mp4 -s 1272x724 tulip2.yuv 24485.7 26006.6 28573.1 24291.3 24069.1 26995.9 25684.95 25387.675 average This is on a Nehalem i7. Despite being a 500 frame, 720p video, the numbers fluctuate, so I took an average of 4 runs. Another reason I'd like this change is youtube accepts videos with higher resolutions than 5120. 16384 is vp8's maximum resolution, so that should keep us amused for a little longer. Signed-off-by: Michael Niedermayer commit 11c6d28eced1aa39d7d52f0d3d0fa68851371766 Author: Michael Niedermayer Date: Sun Mar 27 03:06:24 2011 +0200 A few points for the changelog commit dd9134c22ed601a97122c64f23aed56c6f96cd9a Author: Maksym Veremeyenko Date: Wed Mar 30 12:36:15 2011 +0200 Fix compilation with win32 threads.after 'unbreak avcodec_thread_init' commit 3efaa24f85d74e0cad6e730dd047412a1930e9cf Author: Carl Eugen Hoyos Date: Sun Mar 27 00:32:47 2011 +0100 Also use alsa_reorder_s16_out_51() for AV_CH_LAYOUT_5POINT1. commit 65daa942eb51c348e205ae3a54f77b8781907a81 Author: Reimar Döffinger Date: Tue Mar 29 21:14:55 2011 +0200 Fix buffer overflow checks to avoid integer overflows. commit b64030f26d2ace99b9c782f5d5e264802d2d80a0 Author: Anton Khirnov Date: Thu Mar 17 13:04:38 2011 +0100 avio: make get_checksum() internal. commit d09cc22d9c2dd2843179e7d11a1b564387f62dd2 Author: Anton Khirnov Date: Thu Mar 17 13:02:54 2011 +0100 avio: move ff_crc04C11DB7_update() from avio.h -> avio_internal.h commit 4c4427a75da1cbb81f3097e0a0fbd6755516bc0d Author: Anton Khirnov Date: Thu Mar 17 12:56:25 2011 +0100 avio: make init_checksum() internal. commit ce02f9becfc2e89bf552a86303b00d0b36323cdf Author: anatoly Date: Mon Mar 28 20:02:19 2011 +0400 Add MxPEG decoder Signed-off-by: Anton Khirnov commit e0e3b8b297bae5144f23fd4b46a1309857040b63 Author: anatoly Date: Sun Mar 27 22:16:25 2011 +0200 Add support for picture_ptr field in MJpegDecodeContext Signed-off-by: Anton Khirnov commit f16055eedf7999bb0c754dfde47d8c726b94c847 Author: anatoly Date: Sun Mar 27 22:16:24 2011 +0200 Move MJPEG's input buffer preprocessing in separate public function Signed-off-by: Anton Khirnov commit 8f0bd2c07d354d804b88229b621479cf0388c873 Author: anatoly Date: Sun Mar 27 22:16:23 2011 +0200 Support reference picture defined by bitmask in MJPEG's SOS decoder Signed-off-by: Anton Khirnov commit 2eddfb2b13921af10d096e03f63ca98226a2a292 Author: Brad Date: Tue Mar 29 19:37:57 2011 -0400 sndio bug fix Since the code already supports both little- and big-endian audio for recording, do not fail just because the endianness is not what we expect. Signed-off-by: Ronald S. Bultje commit 445fdc014017a236fa7aa2645ffad7e8d0b45bee Merge: 55ce3c6 52fd16a Author: Michael Niedermayer Date: Wed Mar 30 03:01:41 2011 +0200 Merge remote-tracking branch 'newdev/master' * newdev/master: ac3enc: move compute_mantissa_size() to ac3dsp ac3enc: move mant*_cnt and qmant*_ptr out of AC3EncodeContext Remove support for stripping executables ac3enc: NEON optimised float_to_fixed24 ac3: move ff_ac3_bit_alloc_calc_bap to ac3dsp dfa: protect pointer range checks against overflows. Duplicate: mimic: implement multithreading. Merged-by: Michael Niedermayer commit 55ce3c67bb25cd44889f2143ce9fd7dac3ab4a9d Author: Michael Niedermayer Date: Wed Mar 30 02:58:38 2011 +0200 Merge remote-tracking branch 'ffmpeg-mt/master' * ffmpeg-mt/master: Update todo. More items appeared... Fix mdec Duplicate: id3v1: change filesize to int64_t. Duplicate: id3v1: Seek back to old position after reading. Conflicts: libavcodec/mpegvideo.c libavcodec/snow.c libavformat/id3v1.c Signed-off-by: Michael Niedermayer commit 52fd16a264d1eb14b1a84b7b38041da1756fb216 Author: Mans Rullgard Date: Fri Mar 11 17:16:27 2011 +0000 ac3enc: move compute_mantissa_size() to ac3dsp Signed-off-by: Mans Rullgard commit 6f718471eaae9d25c4fd2dd8d8defa412e2d041c Author: Mans Rullgard Date: Sun Mar 13 16:22:07 2011 +0000 ac3enc: move mant*_cnt and qmant*_ptr out of AC3EncodeContext These fields are only used in quantize_mantissas() and reset on each call, no need to store them in the main context. Signed-off-by: Mans Rullgard commit cd39549e2c386edfa5f4d4bdc0cda78f882a4fe4 Author: Stefano Sabatini Date: Mon Mar 28 00:14:41 2011 +0200 mp: add filter description to filters.texi commit e0be794a71be25a350f68287ee291b4942bcb7d8 Author: Mans Rullgard Date: Tue Mar 29 20:50:26 2011 +0100 Remove support for stripping executables Stripping is generally best left to package management tools, and since unstripped copies are kept in the build tree, any arguments about saving space (no matter how insignificant) are void. Signed-off-by: Mans Rullgard commit d782bca4156cfd91cd3d9a7d4eda6ff580915170 Author: Mans Rullgard Date: Tue Mar 29 02:30:13 2011 +0100 ac3enc: NEON optimised float_to_fixed24 Signed-off-by: Mans Rullgard commit 6d9f52b2cd760eacf6cc6b7d694b0b00d991f1de Author: Mans Rullgard Date: Fri Mar 11 02:49:55 2011 +0000 ac3: move ff_ac3_bit_alloc_calc_bap to ac3dsp Signed-off-by: Mans Rullgard commit 1862778732f35a198ff52bf6c2f41d20f4ea0f6b Author: Reimar Döffinger Date: Tue Mar 29 20:20:29 2011 +0200 sndio: allow any endianness when recording Since the code already supports both little- and big-endian audio for recording, do not fail just because the endianness is not what we expect. It is possible that 8-bit recording would not have worked at all on some systems without that change. commit e76c0c6a00b4530f2939602204520c7eabf5efdf Author: Reimar Döffinger Date: Tue Mar 29 20:18:45 2011 +0200 Simplify: Use FFMIN. commit d38345878cbb89e4d8d33bd79f47836d4e9cd637 Author: Ronald S. Bultje Date: Tue Mar 29 07:14:44 2011 -0700 dfa: protect pointer range checks against overflows. commit 621f4c98df4ee9fd604a614f31e09eef9dd7d3ca Author: Gwenole Beauchesne Date: Mon Mar 28 15:55:41 2011 +0200 vaapi: filter out DELAYED_PIC_REF flag to determine field. This fixes ticket #23. commit f99abb15a1f666b66a83ec31b13bfe01e3dd3845 Author: Gwenole Beauchesne Date: Tue Mar 29 09:12:03 2011 +0200 vaapi: disable if check_lib failed. commit a18e7b4fb77d3799cf21110b5e6dda4691a295b3 Author: Gwenole Beauchesne Date: Thu Jan 27 16:01:43 2011 +0100 vaapi: cope with VA-API 0.32, i.e. fix VC-1 decoding on Sandy Bridge. commit a75529e81ea14c6d7c449e205aef97a0acb2645f Author: Alexander Strange Date: Mon Mar 28 21:44:38 2011 -0700 mimic: implement multithreading. commit 5c98af952d07d9b0523af4e6bfdd0f2a35bf4d51 Author: Gwenole Beauchesne Date: Mon Mar 28 10:18:58 2011 +0200 Fix check for new enough CrystalHD library. Signed-off-by: Philip Langdale commit 31f00274f8cda7141a17a7b33820e652d89a9de6 Author: Carl Eugen Hoyos Date: Fri Mar 25 19:46:28 2011 +0100 id3v1: change filesize to int64_t. Signed-off-by: Ronald S. Bultje commit 13eadbaca4768a2b49b8403178c818bf8d75e0af Author: Carl Eugen Hoyos Date: Fri Mar 25 19:46:27 2011 +0100 id3v1: Seek back to old position after reading. FFmpeg did not seek back to the original position, but to "0", making reading a VBR tag impossible. (issue 2645) Signed-off-by: Ronald S. Bultje commit 59bf303d6806e1ab0fa415f5313131c9ca7aedb7 Merge: 7dfd58e c4549bd Author: Michael Niedermayer Date: Tue Mar 29 02:46:11 2011 +0200 Merge remote-tracking branch 'newdev/master' * newdev/master: ac3enc: avoid memcpy() of exponents and baps in EXP_REUSE case by using exponent reference blocks. Chronomaster DFA decoder DUPLICATE: framebuffer device demuxer NOT MERGED: cosmetics: fix dashed line length after 070c5d0 http: header field names are case insensitive Conflicts: LICENSE README doc/indevs.texi libavdevice/fbdev.c Merged-by: Michael Niedermayer commit 7dfd58ef495f2724cca40cd4a59b1d0c4d81aa28 Author: Michael Niedermayer Date: Tue Mar 29 02:13:33 2011 +0200 Add crystalhd maintainer Signed-off-by: Michael Niedermayer commit 34c27ada10f085ddb0b9bbe12217f22886683ee1 Author: Michael Niedermayer Date: Mon Mar 28 21:57:00 2011 +0200 Revert some silly renamings that leaked in from a pull. commit c50998675d0c1a932dcf2b79a150a4dfe430050c Author: Stefano Sabatini Date: Mon Mar 28 00:03:19 2011 +0200 mp: extend syntax, make it accept mp=filter=params Make the mp wrapper accept the syntax mp=filter=params as alternative to mp=filter:params. The alternative syntax is sligthly more readable and should simplify copy&paste of MPlayer filter strings to the mp filter. commit 681ba7229e8cb0106e7d641be4f6fb0cf6a9fba8 Author: Stefano Sabatini Date: Sun Mar 27 23:02:24 2011 +0200 documentation: sort filter descriptions in filters.texi Change position of the fade filter description, put it between drawtext and fifo descriptions. commit cdf7cbd6c887f15527bb89245153c9819b7ea87e Author: Stefano Sabatini Date: Sat Mar 26 16:17:18 2011 +0100 documentation: extend documentation for ffmpeg -aspect option commit e93d97156d19fd686b7b9ab574c295e0fc7b7ffb Author: Stefano Sabatini Date: Mon Mar 28 16:07:08 2011 +0200 sndio: prefer "FFmpeg" over "Libav" in the license header commit e9ccdae09b1913fa2427c2a7f87a5ba6ce8c5d60 Author: Reimar Döffinger Date: Sun Mar 27 14:38:21 2011 +0200 Use consistent condition for whether to run slice-threading execute function. commit 46027c7286144294dee565946dccb59f1a8dfeca Author: Reimar Döffinger Date: Sat Mar 26 13:55:30 2011 +0100 Unbreak avcodec_thread_init avcodec_thread_init currently doesn't do anything at all with pthreads enabled. commit c4549bd66a94bec1284dcca0da19e5038a82cbe3 Author: Justin Ruggles Date: Mon Mar 28 14:01:27 2011 -0400 ac3enc: avoid memcpy() of exponents and baps in EXP_REUSE case by using exponent reference blocks. commit 42315dabce376fd7085e2a1bbab4d230d3d2ccd8 Author: Kostya Shishkov Date: Tue Mar 15 09:37:48 2011 +0100 Chronomaster DFA decoder Signed-off-by: Anton Khirnov commit c6f951442efb34dd63e1e00b19bc30447075d5a3 Author: Stefano Sabatini Date: Mon Mar 7 18:54:52 2011 +0100 framebuffer device demuxer Signed-off-by: Anton Khirnov commit 95c8bb03edf5d5c7310947819c4c8691a5e3dfb0 Author: Michael Niedermayer Date: Mon Mar 28 16:46:45 2011 +0200 Fix compilation failure with runtime cpudetect (Ticket #22) commit 364cbc346b336e5d09b371ce05650f30be813276 Author: Janne Grunau Date: Mon Mar 28 09:53:40 2011 +0200 cosmetics: fix dashed line length after 070c5d0 commit bc61920d89dde3e35762ace10bb6830a091a15b9 Author: Tyler Date: Sat Mar 26 17:59:09 2011 -0700 http: header field names are case insensitive Amazon S3 sends header field names all lowercase. This is actually acceptable according to the HTTP standard. http://tools.ietf.org/html/rfc2616#section-4.2 Signed-off-by: Luca Barbato commit 25d8099beb4c7eb93539f9162af1336ef7130fed Merge: 57e2ded 991f3de Author: Michael Niedermayer Date: Mon Mar 28 01:50:36 2011 +0200 Merge remote-tracking branch 'newdev/master' * newdev/master: ac3enc: Add codec-specific options for writing AC-3 metadata. NOT MERGED: Remove arrozcru URL from documentation sndio support for playback and record Conflicts: doc/faq.texi doc/general.texi Merged-by: Michael Niedermayer commit 57e2ded4234356c26bf92b0a627ec383ea8d288f Author: Michael Niedermayer Date: Mon Mar 28 00:09:58 2011 +0200 Implement interlaced scaling. Fixes issue2632 if interl=1 is used or the automatic interlace detection is enabled and works. This has the advantage compared to the patch in issue2632 that it causes no speed loss and it also works when scaling is used. The disadvantage is that interlacing autodetection does not yet work very well it seems. This is the same method mplayer uses Signed-off-by: Michael Niedermayer commit 8e43b6fed905eb30ae941a3968825d88c78d5a12 Author: Aurelien Jacobs Date: Tue Sep 14 05:55:12 2010 +0200 add SubRip encoder Signed-off-by: Aurelien Jacobs commit efc8c709c93875dffa4c4181fa9b56fa6d20d4c7 Author: Stefano Sabatini Date: Sun Mar 27 18:32:52 2011 +0200 drawtext: draw glyphs for the strftime()-expanded text In draw_glyphs(), draw glyphs in dtext->expanded_text rather than in dtext->text. Fix crash if a strftime() sequence is used. commit 5c5816c4e3e4b267788ce5756728539fe6c49549 Author: Stefano Sabatini Date: Sun Mar 27 18:21:54 2011 +0200 drawtext: fix minor errors and typos in the filter description commit 991f3de1bb696a55f7604e4b7d53492299fe44b5 Author: Justin Ruggles Date: Fri Mar 25 17:12:26 2011 -0400 ac3enc: Add codec-specific options for writing AC-3 metadata. commit 3ea031b3f2bcbf867cf00211684d0f2ea4931c50 Author: Stefano Sabatini Date: Sat Mar 26 15:49:07 2011 +0100 setdar: prefer "sar" over "par" in log info message This is more consistent with the terminology adopted by the aspect filter names. commit 2ee85c067129e5c456dc2eb1807140dc2e434d9a Author: Stefano Sabatini Date: Sat Mar 26 15:26:45 2011 +0100 ffmpeg: warns the user when the selected pixel format is ignored commit c6c2dfcf15c1d93b2189adff6f71c5c4b6b05338 Author: Ramiro Polla Date: Sat Mar 26 21:22:23 2011 -0300 Remove arrozcru URL from documentation Signed-off-by: Anton Khirnov commit 15d59d2cea25cfd73bfe6ea03a498a62e24d0536 Author: Brad Date: Sat Mar 26 19:03:41 2011 -0400 sndio support for playback and record Signed-off-by: Anton Khirnov commit 3c8493074bc43aced247a34d6b981e6f9acde0f1 Merge: b0efaee 1500be1 Author: Michael Niedermayer Date: Sun Mar 27 01:40:18 2011 +0100 Merge remote-tracking branch 'newdev/master' * newdev/master: dsputil: allow to skip drawing of top/bottom edges. Split fate-psx-str-v3 into a video-only and audio-only test. Conflicts: libavcodec/dsputil.c libavcodec/mpegvideo.c libavcodec/snow.c libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer commit b0efaee6c1a07b4e7575bf523542ce846202b6e2 Author: Michael Niedermayer Date: Sat Mar 26 19:29:37 2011 +0100 make xvid less picky about unkown aspect Signed-off-by: Michael Niedermayer commit 3583eb93410a73cac8ddf291baa405005ff4c405 Author: Philip Langdale Date: Fri Mar 25 23:06:28 2011 -0700 CrystalHD: Remove redundant interlaced check. Signed-off-by: Philip Langdale commit a1749eb3c3720b33177401b45102881adfc7915e Author: Philip Langdale Date: Fri Mar 25 22:50:08 2011 -0700 CrystalHD: Add 2011 to Copyright Signed-off-by: Philip Langdale commit b45aceb64a958298f9677b85f5ed1557d613e7bc Author: Philip Langdale Date: Sat Mar 26 16:04:48 2011 -0700 Revert "CrystalHD: Improve interlaced h.264 support." This reverts commit e44073ca5e7143934ffa79d317dc65150db1637c. commit 85b010987fd89853c5bb92fe3ab707f5891a36a5 Author: Philip Langdale Date: Sat Mar 26 16:04:43 2011 -0700 Revert "CrystalHD: Add heuristics to try and distinguish h.264 PAFF variants." This reverts commit 4ab57cffba1d151898837a9a07a6a72f78716702. commit 3188d33a117e1d85cfef1840090035e46133f5cf Author: Philip Langdale Date: Sat Mar 26 16:04:36 2011 -0700 Revert "CrystalHD: Refine heuristic logic." This reverts commit f968ef922d5b1e1ba29145bceaa0278ece4f88e0. commit f968ef922d5b1e1ba29145bceaa0278ece4f88e0 Author: Philip Langdale Date: Sun Mar 20 16:29:04 2011 -0700 CrystalHD: Refine heuristic logic. commit 4ab57cffba1d151898837a9a07a6a72f78716702 Author: Philip Langdale Date: Wed Mar 16 22:27:51 2011 -0700 CrystalHD: Add heuristics to try and distinguish h.264 PAFF variants. As previously discussed, the CrystalHD hardware treats some PAFF clips different from others; even when input fields are always in separate packets, the hardware might return a single fieldpair for one clip and individual fields for another. Given the bogus flags set by the hardware, it is impossible to distinguish these two cases without knowing about the current picture and the next one. The hardware can usually provide the picture number of the next picture and when that is available, we can detect the two cases. When it is not available, we have to guess - and find out later if we were right or wrong. With this change, clips will play correctly unless they are PAFF where individual fields are returned *and* no next picture number is available. Generally speaking, the incorrect cases arise in the first couple of seconds of a clip as the delay calibration takes place. Once that's set, things work fine. commit e44073ca5e7143934ffa79d317dc65150db1637c Author: Philip Langdale Date: Mon Mar 14 21:47:35 2011 -0700 CrystalHD: Improve interlaced h.264 support. As previously discussed, the CrystalHD hardware returns exceptionally useless information about interlaced h.264 content - to the extent that it's not possible to distinguish MBAFF and PAFF content until it's too late. This change introduces use of the h264_parser to help bridge the gap; it can indicate if the input data is PAFF fields or not. With this clarity, some of heuristics can be removed from the code, making this less convoluted. Finally, I found an MBAFF clip that acts like non h.264 content so I had to make allowances for that. Note that I still cannot distinguish between two forms of PAFF, where the hardware either returns individual fields or a field-pair. It's not clear that there's even a spec relevant difference between the two forms, as opposed to hardware ideosyncracies. commit 1500be13f204acb7e74dac4325ef0052576fa2a9 Author: Alexander Strange Date: Sat Mar 26 17:31:13 2011 -0400 dsputil: allow to skip drawing of top/bottom edges. commit c56e618b4b731d761a44fd4666b03829388ad028 Author: Ronald S. Bultje Date: Sat Mar 26 16:28:16 2011 -0400 Split fate-psx-str-v3 into a video-only and audio-only test. commit 907783f221ad9594a528681e30777705f11bf0b5 Author: Ilya Date: Sat Mar 26 17:13:36 2011 +0100 Use strtoul to parse rtptime and seq values. strtol could return negative values, leading to various error messages, mainly "non-monotonically increasing dts". commit 813dbb44424846274a318bfc6d02a53b4189f884 Author: Nicolas George Date: Thu Mar 10 12:10:34 2011 +0100 ALSA: implement channel layout for playback. Currently, only S16 quad, 5.1 and 7.1 are implemented. Implementing support for other formats/layouts and capture should be straightforward. 7.1 support by Carl Eugen Hoyos. commit 98ac192b4e4df786107d7f6adb3e4e7d1336510e Author: Stefano Sabatini Date: Thu Mar 24 14:39:23 2011 +0100 ffprobe: provide format parameters to av_open_input_file() Provide a non-NULL AVFormatParameters structure to av_open_input_file() in open_input_file(). This is required because otherwise av_open_input_file() will allocate and use a new format context, discarding the options set in the provided format context. commit ca1a2a471156347b0d8351d0861c483d355276cc Author: Stefano Sabatini Date: Tue Mar 15 12:34:55 2011 +0100 lavf: make compute_pkt_fields2() return meaningful error values commit 0c55c6d30e0aa07b47645fafc6a817dfbfa2e85b Author: Stefano Sabatini Date: Sat Mar 12 12:44:22 2011 +0100 cmdutils: remove list_fmts(), simplify The function was only used in opt_sample_fmt() for listing the sample formats. Move list_fmts() functionality directly into opt_sample_fmt(). Als fix the warning: ffmpeg.c: In function ‘opt_audio_sample_fmt’: ffmpeg.c:2877: warning: passing argument 1 of ‘list_fmts’ from incompatible pointer type cmdutils.h:163: note: expected ‘void (*)(char *, int, int)’ but argument is of type ‘char * (*)(char *, int, enum AVSampleFormat)’ commit 836131546947db75f2ff81a452e5ee9392c4acf8 Author: Reimar Döffinger Date: Fri Mar 25 18:58:07 2011 +0100 DPX decode: add buffer size checks. commit f55dd6c60d13f331ca8956427004825ef0bbb7af Author: Peter Ross Date: Sun Mar 20 00:25:18 2011 +1100 nut format: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE commit 7181627686ae107aecfdf6eee09d3cd066be6d5b Author: Peter Ross Date: Sun Mar 20 00:24:24 2011 +1100 rawvideo codec: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE commit f5607c83613a4cf1524b64cc5f2951933acf7376 Author: Peter Ross Date: Sat Mar 19 22:11:03 2011 +1100 Make the hflip filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats commit af555733792f7c7246d11797784b067b3bd619ea Author: Peter Ross Date: Sat Mar 19 22:05:53 2011 +1100 Make the crop filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats commit 3e2523db20dfc11e76f0fedf6499ade3a7f7304d Author: Peter Ross Date: Thu Mar 17 21:07:18 2011 +1100 libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation commit 27ef7b1bcd0577e3f5bdfc524b42b0548567be20 Merge: 0bfe349 eb81cf8 Author: Michael Niedermayer Date: Sat Mar 26 02:42:40 2011 +0100 Merge remote-tracking branch 'newdev/master' * newdev/master: mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom. Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser and decoder, and vice-versa for the AC-3 encoder. Use audio_service_type to set stream disposition. Add APIchanges entry for audio_service_type. Add audio_service_type field to AVCodecContext for encoding and reporting of the service type in the audio bitstream. configure: in check_ld, place new -l flags before existing ones support @heading, @subheading, @subsubheading, and @subsubsection in texi2pod.pl doc: update build system documentation aacenc: indentation aacenc: fix the side calculation in search_for_ms vp8.c: rename EDGE_* to VP8_EDGE_*. Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/version.h libavcodec/vp8.c Merged-by: Michael Niedermayer commit eb81cf860cbb23ece082e6a463a2c6ced8c55ead Author: Justin Ruggles Date: Thu Mar 24 12:42:05 2011 -0400 mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom. commit be18738801b1723cc6aee126dfea466584012793 Author: Justin Ruggles Date: Thu Mar 24 12:10:38 2011 -0400 Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser and decoder, and vice-versa for the AC-3 encoder. commit c70a6a41ddb759a5c6e8e810ebd603e39c36a315 Author: Justin Ruggles Date: Thu Mar 24 12:09:02 2011 -0400 Use audio_service_type to set stream disposition. commit 0b18b49b3b7dace5c5840529600fcddbcebcf878 Author: Justin Ruggles Date: Thu Mar 24 12:08:13 2011 -0400 Add APIchanges entry for audio_service_type. commit 34b47d7cbc6b7db607e8980453876d5106d0c387 Author: Justin Ruggles Date: Thu Mar 24 12:00:21 2011 -0400 Add audio_service_type field to AVCodecContext for encoding and reporting of the service type in the audio bitstream. commit 7e75f9fe5e53707e0609691d6cc2ca8cd015f132 Author: Mans Rullgard Date: Fri Mar 25 19:26:10 2011 +0000 configure: in check_ld, place new -l flags before existing ones This fixes some library tests when --as-needed is in effect. Signed-off-by: Mans Rullgard commit 0bfe349d4a3e2a98c6f4f02fb03d8585e531d850 Author: Reimar Döffinger Date: Thu Mar 24 21:23:15 2011 +0100 Update to latest MPlayer version. Avoids warnings due to pointlessly casting away const. commit ab8b73ff4e305bfdf0aaf1a61a8060605805040b Author: Michael Niedermayer Date: Fri Mar 25 18:41:39 2011 +0100 lavc: Bump micro for dvd subtitle cb/cr fix Signed-off-by: Michael Niedermayer commit 5fd7bc25f182e26affdf5ff6e4573188733b38b0 Author: Alexandre Colucci Date: Fri Mar 25 17:31:28 2011 +0100 Fix incorrect colors when decoding Blu-ray subtitles On Blu-ray colors are stored in the order YCrCb (and not YCbCr) as mentioned in the specifications: see System Description Blu-ray Disc Read-Only Format, 9.14.4.2.2.1 Palette Definition Segment When decoding a Blu-ray subtitle, the colors were incorrectly set. commit 9743e909f113b2f7b09e4879871e3b8e66d32204 Author: Alexandre Colucci Date: Fri Mar 25 11:25:02 2011 +0100 Fix incorrect colors when decoding DVD subtitles On DVD and HD-DVD colors are stored in the order YCrCb (and not YCbCr) as mentioned in the specifications: see DVD Specifications for Read-Only Disc / Part 3, 4.3 Program Chain Information (7) PGC_SP_PLT see DVD Specifications for High Definition Disc, 5.2 Navigation for Standard Content (11) PGC_SDSP_PLT see DVD Specifications for High Definition Disc, 5.2 Navigation for Standard Content (12) PGC_HDSP_PLT see DVD Specifications for High Definition Disc, 5.5 Presentation Data (4) SET_COLOR2 When decoding a DVD or HD-DVD subtitle, the colors were incorrectly set. commit 10a7831aa182d841cfabb8b578fd31e6fd334310 Author: Stefano Sabatini Date: Fri Mar 25 18:49:24 2011 +0100 configure: sort filter deps entries commit 63ec0aa888700aa1eb0658f765ee1e85762500e0 Author: Stefano Sabatini Date: Fri Mar 25 18:47:22 2011 +0100 configure: update ffmpeg-user mailing-list address The address recently changed from ffmpeg-user@mplayerhq.hu to ffmpeg-user@ffmpeg.org. commit 4ffc79e7a02c1d52c88148fd046896ceab89aad4 Author: Stefano Sabatini Date: Fri Mar 25 18:42:51 2011 +0100 ffmpeg: include conditionally the sws_flags variable The variable is not used when libavfilter is enabled. Fix the warning: ffmpeg.c: At top level: ffmpeg.c:242: warning: ‘sws_flags’ defined but not used commit 7f0e747b8c2f732ea40c4cc072fe5a3c25ec3799 Author: Justin Ruggles Date: Thu Mar 24 18:39:19 2011 -0400 support @heading, @subheading, @subsubheading, and @subsubsection in texi2pod.pl commit 1c0a472630838c3b32231e646ad44e8afd313a66 Author: Michael Niedermayer Date: Fri Mar 25 12:00:17 2011 +0100 Revert "matroskadec: set default duration for simple block" This reverts commit 98a7d560b4f835ba5b99b9974ee1a2c096198bea. This has been implemented differently by aurel already commit c535d0896e6f08d9526da57b0b4fece19c22b59f Author: Luca Barbato Date: Tue Mar 22 00:20:56 2011 +0100 doc: update build system documentation Split normal build system documentation and the fate one. Document THREADS make variable and provide an introduction to fate. Document DESTDIR make variable and add some generic targets. commit 00f0b4b92efbe78fd39fbb18d387d060d604ac75 Author: Young Han Lee Date: Fri Mar 25 12:17:48 2011 +0900 aacenc: indentation commit 92efa2bdd9b6e36a70457240fd227beff1d0d039 Author: Young Han Lee Date: Thu Mar 24 10:49:36 2011 +0900 aacenc: fix the side calculation in search_for_ms commit 797ef671dda9094640ade203a09dc59e9bf328a4 Merge: 5d6c5dd 98a7d56 Author: Michael Niedermayer Date: Fri Mar 25 02:57:24 2011 +0100 Merge remote-tracking branch 'newdev/master' * newdev/master: matroskadec: set default duration for simple block When building for MinGW32 disable strict ANSI compliancy. ARM: fix ff_apply_window_int16_neon() prototype configure: check for --as-needed support early ARM: NEON optimised apply_window_int16() ac3enc: NEON optimised shift functions ac3enc: NEON optimised ac3_max_msb_abs_int16 and ac3_exponent_min mpeg12.c: fix slice threading for mpeg2 field picture mode. ffmetadec.c: fix compiler warnings. configure: Don't explicitly disable ffplay or in/outdevices on dos configure: Remove the explicit disabling of ffserver configure: Add fork as a dependency to ffserver Merged-by: Michael Niedermayer commit 5d6c5dd36c024784a9cd36391c3698c2f1f2d2ab Author: Michael Niedermayer Date: Fri Mar 25 02:37:37 2011 +0100 Merge remote-tracking branch 'ffmpeg-mt/master' * ffmpeg-mt/master: Update todo. Draw edges in MPV_frame_end when encoding Conflicts: libavcodec/mpegvideo.c Signed-off-by: Michael Niedermayer commit 3eb9e571dc8ddfc9d1ae99c2ee75f607181819c7 Author: Michael Niedermayer Date: Fri Mar 25 02:50:09 2011 +0100 Remove a tab, somehow it sneaked past the hooks in the merge war. Signed-off-by: Michael Niedermayer commit 66f608a6aaae0145ba7fb0f06311905c59b5362a Author: Alexander Strange Date: Thu Mar 24 21:20:13 2011 -0400 vp8.c: rename EDGE_* to VP8_EDGE_*. commit 6dfb4ab8c8e8069ecf6b9c3d056f43df57a1c643 Author: Michael Niedermayer Date: Fri Mar 25 02:26:49 2011 +0100 Make multiple Ctrl-C capable to kill stuck protocols. Signed-off-by: Michael Niedermayer commit 48ee302e0fa84fe93855f81716cd2e27a8de9de7 Author: Michael Niedermayer Date: Fri Mar 25 02:24:32 2011 +0100 Fix apparently exploitable race condition. Signed-off-by: Michael Niedermayer commit 628724b61d744738e21ada8341a282d6802625a3 Author: Michael Niedermayer Date: Fri Mar 25 01:13:08 2011 +0100 More advanced ffmpeg mpeg2 aspect guessing code. Fixes issue1613, 621, 562 simultaneously Signed-off-by: Michael Niedermayer commit 0a51362b3f3c3a0df09b24fbd9049711bff6fb94 Author: Michael Niedermayer Date: Fri Mar 25 00:20:07 2011 +0100 log:Sanitize string of most control chars before printing. This may be security relevant depending upon the used terminal. Signed-off-by: Michael Niedermayer commit eea4fa059134253cf720c7fa2045b011723c60ef Author: XV Date: Thu Mar 24 22:32:21 2011 +0100 Intel H.263 aspect ratio processing fix. commit b14748dd7563b5cf026a198bd011f70d3af5f4e3 Author: XV Date: Thu Mar 24 22:29:31 2011 +0100 Fix Intel I.263 "Strict H.263 compliance" file playback / issue2449 commit 71af7377bf17017ed28c6266cb2840952211443a Author: Aurelien Jacobs Date: Fri Mar 25 01:02:53 2011 +0100 srtdec: make sure we don't write past the end of buffer Signed-off-by: Aurelien Jacobs commit 98a7d560b4f835ba5b99b9974ee1a2c096198bea Author: John Stebbins Date: Fri Mar 25 00:34:18 2011 +0100 matroskadec: set default duration for simple block When a normal Block is parsed, duration is initialized to AV_NOPTS_VALUE. If it is not changed, then the track's default duration is used. But for SimpleBlock, duration is initialized to 0 instead of AV_NOPTS_VALUE. This is due to the difference in how EBML_NEST vs EBML_PASS are processed. Setting duration to 0 leads eventually to wrongly estimate the frame duration in util.c Signed-off-by: Luca Barbato commit 5666a9f20c6ef2b207e0517c8eeb9556badf76a3 Author: Diego Elio Pettenò Date: Thu Mar 24 12:18:35 2011 +0100 When building for MinGW32 disable strict ANSI compliancy. When -std=c99 is used, GCC defines __STRICT_ANSI__ to hide non-ANSI interfaces; on MinGW32, when this macro is defined, some functions that are part of POSIX but not of Windows APIs are disabled, including strcasecmp(). Signed-off-by: Luca Barbato commit d743065e18c19b63591a5e3eb9aa8aeeeaefdb37 Author: Mans Rullgard Date: Thu Mar 24 20:22:34 2011 +0000 ARM: fix ff_apply_window_int16_neon() prototype The length argument should be unsigned. No change in code. Signed-off-by: Mans Rullgard commit 4a7e068b8fb15b646c465d360ee478e02d100ca4 Author: Mans Rullgard Date: Sun Mar 6 13:57:34 2011 +0000 configure: check for --as-needed support early This moves the check for --as-needed linker support before all library tests, ensuring consistent behaviour between the checks and the actual link step. Signed-off-by: Mans Rullgard commit 2d3b21ffb91610f806a6c550dc142520d7a11e50 Author: Mans Rullgard Date: Wed Mar 23 01:45:43 2011 +0000 ARM: NEON optimised apply_window_int16() Signed-off-by: Mans Rullgard commit 245c78313fac79d3336f139fbca88c8d799f866a Author: Mans Rullgard Date: Sat Mar 12 23:16:06 2011 +0000 ac3enc: NEON optimised shift functions commit f4855a904e4d3a12822739cda149262f98e8723a Author: Mans Rullgard Date: Wed Mar 9 19:51:50 2011 +0000 ac3enc: NEON optimised ac3_max_msb_abs_int16 and ac3_exponent_min commit f71142496931d264ceeedfaac399eba07b7c5def Author: Ronald S. Bultje Date: Thu Mar 24 12:16:22 2011 -0400 mpeg12.c: fix slice threading for mpeg2 field picture mode. Fixes "make THREADS=2 fate-mpeg2-field-enc". commit 0cd138340e5d7c668eb392721fa0015e5732cb39 Author: Tomas Härdin Date: Mon Mar 21 10:52:36 2011 +0100 Improve channel count and bitrate error handling in wmav* encode_init() Signed-off-by: Michael Niedermayer commit cd256c3b89c14651b9ff75d9235f2c146fa48aba Author: Ronald S. Bultje Date: Thu Mar 24 07:41:03 2011 -0400 ffmetadec.c: fix compiler warnings. commit da21225ae2d1803450b054db0e5ae13064f6fbbe Author: Martin Storsjö Date: Wed Mar 23 12:49:37 2011 +0000 configure: Don't explicitly disable ffplay or in/outdevices on dos The normal dependency tracking system disables them just fine. commit 8bb605c11fd745bad3b4a454cb8a5a37efa6bdd7 Author: Martin Storsjö Date: Wed Mar 23 13:13:31 2011 +0200 configure: Remove the explicit disabling of ffserver It is automatically disabled on both mingw and dos due to the lack of fork. commit 1ff49c231436413830223e4b1b5692ba67464e6b Author: Martin Storsjö Date: Wed Mar 23 12:26:58 2011 +0200 configure: Add fork as a dependency to ffserver commit 2fd41c9067fc67b40f80e9cbd4787018009040db Merge: 00dc020 4ec153b Author: Michael Niedermayer Date: Thu Mar 24 02:12:17 2011 +0100 Merge remote-tracking branch 'newdev/master' * newdev/master: avio: make udp_set_remote_url/get_local_port internal. asfdec: also subtract preroll when reading simple index object matroskaenc: remove a variable that's unused after bc17bd9. avio: cosmetics - nicer vertical alignment. Remove unnecessary icc version checks Disable 'attribute "foo" ignored' warnings from icc rtsp: Don't use a locale dependent format string Add xd55 codec tag for XDCAM HD422 720p25 CBR files. configure: get libavcodec version from new version.h header lavc: move the version macros to a new installed header. matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config Do not use format string "%0.3f" for RTSP Range field. Add apply_window_int16() to DSPContext with x86-optimized versions and use it in the ac3_fixed encoder. Document usage of import libraries created by dlltool configure: Set the correct lib target for arm/wince dlltool fate: simplify regression-funcs.sh fate: add support for multithread testing Conflicts: libavformat/rtspdec.c libavutil/attributes.h libavutil/internal.h libavutil/mem.h Merged-by: Michael Niedermayer commit 00dc0206cb5b351a66d7cce77b8a65fabe6ea7da Author: Aurelien Jacobs Date: Thu Mar 24 01:56:26 2011 +0100 matroskaenc: make sure we don't produce invalid file with no codec ID Signed-off-by: Aurelien Jacobs commit 75f4d1fadf8d46b95fd225e7cc74e65dac57b7be Author: Aurelien Jacobs Date: Thu Mar 24 01:54:15 2011 +0100 matroskaenc: add missing new line in av_log() call Signed-off-by: Aurelien Jacobs commit 2851b1f6566580485dceb67cbb6b93f64ee9a9bd Author: Aurelien Jacobs Date: Thu Mar 24 00:28:19 2011 +0100 matroskadec: check that pointers were initialized before accessing them fix ticket #14 Signed-off-by: Aurelien Jacobs commit 2a0d4d4cd0119cfe9e439afe5941aee2ca0c1109 Author: Compn Date: Wed Mar 23 13:53:24 2011 -0400 fix typo commit 4ec153bb66a95da46c98e269bd0aa787e6172ed3 Author: Anton Khirnov Date: Tue Mar 8 10:35:52 2011 +0100 avio: make udp_set_remote_url/get_local_port internal. commit 4377fafda100117f75d62ba91bce6d8509e01a50 Author: Vladimir Pantelic Date: Thu Mar 17 22:34:52 2011 +0100 asfdec: also subtract preroll when reading simple index object This was missed when ASF was changed to return timestamps without preroll. Signed-off-by: Mans Rullgard commit 264935c96212c922e63c1fdb3c6ebf0bfce5c45d Author: Anton Khirnov Date: Wed Mar 23 11:09:34 2011 +0100 matroskaenc: remove a variable that's unused after bc17bd9. Signed-off-by: Ronald S. Bultje commit 491653ed90e12feefada217a59af9cd69cc7ca31 Author: Anton Khirnov Date: Wed Mar 23 11:58:02 2011 +0000 avio: cosmetics - nicer vertical alignment. Signed-off-by: Mans Rullgard commit 820818a330b0918557bf8403d10bec95c9b6ace7 Author: Mans Rullgard Date: Wed Mar 23 11:30:44 2011 +0000 Remove unnecessary icc version checks With unknown attribute warnings disabled, these checks are no longer needed. Removing them improves readability while having no effect on generated code. Signed-off-by: Mans Rullgard commit 91bcad197175bf82610ea52498854b5b0ed73de0 Author: Mans Rullgard Date: Wed Mar 23 11:24:10 2011 +0000 Disable 'attribute "foo" ignored' warnings from icc ICC lies about the version of gcc it emulates, which results in unsupported attributes sometimes being used. The warning is an annoyance and should be disabled. Signed-off-by: Mans Rullgard commit 28e9c42afbf0088aa1f4280a95d304dca4b675a0 Author: Martin Storsjö Date: Wed Mar 23 10:26:22 2011 +0200 rtsp: Don't use a locale dependent format string In this particular case, we aren't ever printing anything else than 0.000 anyway. Signed-off-by: Ronald S. Bultje commit 1b7ecc1662956fc30d20bdcdbc0617127b2976cc Author: Tomas Härdin Date: Mon Mar 21 12:06:56 2011 +0100 Add xd55 codec tag for XDCAM HD422 720p25 CBR files. Signed-off-by: Ronald S. Bultje commit b9d2f4a956dc7cfdf8b8ca1f3be4f26c752c8a22 Author: Mans Rullgard Date: Wed Mar 23 09:39:00 2011 +0000 configure: get libavcodec version from new version.h header This fixes shared library versioning after 3dd851c. Signed-off-by: Mans Rullgard commit 3dd851c46b21e858a3fd9a99d8e659a6d0baa868 Author: Anton Khirnov Date: Mon Mar 14 21:58:13 2011 +0100 lavc: move the version macros to a new installed header. Signed-off-by: Ronald S. Bultje commit 4fa0e24736bff7d7fbdfb36ed578a1db166817d4 Merge: 4952aff ee26abf Author: Michael Niedermayer Date: Wed Mar 23 02:42:56 2011 +0100 Merge remote-tracking branch 'newdev/master' * newdev/master: (33 commits) Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size. Add kbdwin.o to AC3 decoder Detect byte-swapped AC-3 and support decoding it directly. cosmetics: indentation Always copy input data for AC3 decoder. ac3enc: make sym_quant() branch-free cosmetics: indentation Add a CPU flag for the Atom processor. id3v2: skip broken tags with invalid size id3v2: don't explicitly skip padding Make sure kbhit() is in conio.h fate: update wmv8-drm reference vc1: make P-frame deblock filter bit-exact. configure: Add the -D parameter to the dlltool command amr: Set the AVFMT_GENERIC_INDEX flag amr: Set the pkt->pos field properly to the start of the packet amr: Set the codec->bit_rate field based on the last packet rtsp: Specify unicast for TCP interleaved streams, too Set the correct target for mingw64 dlltool applehttp: Change the variable for stream position in seconds into int64_t ... Conflicts: ffmpeg.c ffplay.c libavcodec/ac3dec.c libavformat/avio.h libavformat/id3v2.c Merged-by: Michael Niedermayer commit bc17bd90f51a6eb464746b2d5144e1ec57ca4bfb Author: Anton Khirnov Date: Mon Mar 21 09:05:36 2011 +0100 matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config This also fixes broken SBR detection, which produced files with double sample rate since 8ae0fa2. Signed-off-by: Ronald S. Bultje commit 78e99e0f32b610a3cf302b2b35e500f4e9eaff07 Author: Carl Eugen Hoyos Date: Tue Mar 22 22:38:44 2011 +0100 Do not use format string "%0.3f" for RTSP Range field. The format string was locale-depending. Signed-off-by: Ronald S. Bultje commit e6e9823488b4cf42778411f1239592f0787e121e Author: Justin Ruggles Date: Sun Mar 20 13:31:36 2011 -0400 Add apply_window_int16() to DSPContext with x86-optimized versions and use it in the ac3_fixed encoder. commit e971d81364e93feae8c399075a3be2643192e031 Author: Martin Storsjö Date: Tue Mar 22 15:07:16 2011 +0200 Document usage of import libraries created by dlltool Signed-off-by: Luca Barbato commit 15c5156d245af4c16ac4b1895495818ecdda2e41 Author: Martin Storsjö Date: Tue Mar 22 15:07:15 2011 +0200 configure: Set the correct lib target for arm/wince dlltool The correct machine name for dlltool is arm-wince. Signed-off-by: Luca Barbato commit a96c176aed2ef7924941d690d6c3107ffe35c4cd Author: Luca Barbato Date: Tue Mar 22 00:13:48 2011 +0100 fate: simplify regression-funcs.sh Factor ffmpeg calls using run_ffmpeg() commit 7851eb68c60e61497ec715f28f071c1527de1d38 Author: Luca Barbato Date: Tue Mar 22 00:07:54 2011 +0100 fate: add support for multithread testing Add a THREADS variable to fate calls. commit ee26abf2a4884bb56959bac8215758195776c553 Author: Vitor Sessak Date: Sun Mar 20 18:30:29 2011 +0100 Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size. Signed-off-by: Ronald S. Bultje commit a6d2227bc8a269c243bbcf3c3a22e94912755bb8 Author: Kieran Kunhya Date: Tue Mar 22 22:17:41 2011 +0000 Add kbdwin.o to AC3 decoder Fixes --disable-everything --enable-decoder=ac3 Signed-off-by: Mans Rullgard commit 4952afff75bc60df9c842bc248f1da8fe57e04a6 Author: Carl Eugen Hoyos Date: Tue Mar 22 22:38:44 2011 +0100 Do not use format string "%0.3f" for RTSP Range field. Fixes ticket 10. The format string was locale-depending. commit d375c1040032ed42f84b7d4ea53baad4a661b628 Author: Michael Niedermayer Date: Tue Mar 22 22:36:57 2011 +0100 Fake-Merge remote-tracking branch 'ffmpeg-mt/master' commit 4c886d613df8b217c6d62cb2c94e88f848177b23 Author: Reimar Döffinger Date: Tue Mar 22 14:22:07 2011 -0400 Detect byte-swapped AC-3 and support decoding it directly. This allows the AC-3 decoder to be used directly with RealMedia decoders that unlike the libavformat one do not byte-swap automatically. Since the new code is only used in case we would fail directly otherwise there should be no risk for regressions. commit 40728b5169f23a6420b3d9758f485fd2cd99050d Author: Justin Ruggles Date: Tue Mar 22 14:14:41 2011 -0400 cosmetics: indentation commit 67fc8652b9866978cdd6b49ecd293f2891466058 Author: Justin Ruggles Date: Tue Mar 22 14:11:34 2011 -0400 Always copy input data for AC3 decoder. Depending on error_recognition is not correct, low values do certainly not mean it is ok to crash. Based on a patch by Reimar Döffinger commit 85ab2904700c5bf8b55a33ad598191e36318e195 Author: Justin Ruggles Date: Tue Mar 22 14:36:18 2011 -0400 ac3enc: make sym_quant() branch-free commit 45ed82255025a200beae3b56a84bee20aad41465 Author: Justin Ruggles Date: Mon Mar 21 23:33:00 2011 -0400 cosmetics: indentation commit eba586b0d9f0546c7c9c965edb71e7b29721217d Author: Justin Ruggles Date: Mon Mar 21 23:32:40 2011 -0400 Add a CPU flag for the Atom processor. The Atom has SSSE3 support, which is useful in many cases, but sometimes the SSSE3 version is slower than the SSE2 equivalent on the Atom, but is generally faster on other processors supporting SSSE3. This flag allows for selectively disabling certain SSSE3 functions on the Atom. commit c5f4c0fd5c791ba97eb266cc30ae2172c10feb20 Author: Anton Khirnov Date: Tue Mar 22 10:35:35 2011 +0100 id3v2: skip broken tags with invalid size fixes issue2649. commit 1885488757dc4c6b2d275e4524ed6dd19e97f9b0 Author: Anton Khirnov Date: Tue Mar 22 10:35:34 2011 +0100 id3v2: don't explicitly skip padding It's pointless, since there's a seek to the end of tag later. commit b58b9fa3b5243f02e5212db9171b2f02de4524ea Author: Dave Yeo Date: Tue Mar 22 03:47:48 2011 +0000 Make sure kbhit() is in conio.h Conio.h is a non-standard header and may not have kbhit() prototyped. This fixes compile on OS/2 where the EMX version (we're using a fork) of conio.h only has getch() and getche(). Signed-off-by: Mans Rullgard commit 2a569799a90986cf137792cc03a56752447652c7 Author: Mans Rullgard Date: Tue Mar 22 02:49:37 2011 +0000 fate: update wmv8-drm reference This updates the wmv8-drm reference after c47d383. Signed-off-by: Mans Rullgard commit c47d3835021effc04bc1fd2cef6be31e1b186491 Author: Ronald S. Bultje Date: Mon Mar 21 21:26:26 2011 -0400 vc1: make P-frame deblock filter bit-exact. commit 77e41e047dc487e318a0a47e02cfa99d25459b8a Author: Martin Storsjö Date: Mon Mar 21 22:41:38 2011 +0200 configure: Add the -D parameter to the dlltool command This is required for the generated .lib file to actually be usable by MSVC. Signed-off-by: Luca Barbato commit af79dd36f302d209eff18ee21410d987faad01a4 Author: Martin Storsjö Date: Wed Feb 9 12:19:39 2011 +0200 amr: Set the AVFMT_GENERIC_INDEX flag This makes the amr demuxer support seeking, closing roundup issue 2593. commit 026fa81de4cf4f1af742245fa9e750a38040f9fd Author: Martin Storsjö Date: Wed Feb 9 12:16:51 2011 +0200 amr: Set the pkt->pos field properly to the start of the packet Previously, the field pointed to the second byte of the packet (which is the first byte of the actual AMR payload). commit 2890cba8b50cc8c6656bc5f5cd0ebb5fd80fb5e4 Author: Martin Storsjö Date: Wed Feb 9 12:13:32 2011 +0200 amr: Set the codec->bit_rate field based on the last packet This allows libavformat to guess an estimated duration for amr files. For streams with varying bit rates (or with silence descriptors or "no frame" blocks) the guess is, of course, inaccurate. commit 895678f8239213db1d074a39653fcd78bdf87c25 Author: Martin Storsjö Date: Mon Mar 21 14:19:09 2011 +0200 rtsp: Specify unicast for TCP interleaved streams, too According to the RFC, the default is multicast if nothing is specified, which doesn't make sense for TCP. According to a bug report, some Axis camera models give a "400 Bad Request" error if this is omitted. Signed-off-by: Luca Barbato commit 417516f63f8a9ee214ee9fa6fcb483962ea0f096 Author: Luca Barbato Date: Mon Mar 21 20:22:51 2011 +0100 Set the correct target for mingw64 dlltool That fixes .lib creation for the win64 target. commit dc8b73c0690fbefaf8147653758919875361e8d8 Author: Martin Storsjö Date: Mon Mar 21 12:20:18 2011 +0200 applehttp: Change the variable for stream position in seconds into int64_t A similar variable for the total stream duration was changed to int64_t in b79c3df08807c96a945, due to overflows in some odd streams. Signed-off-by: Luca Barbato commit 648c79624fa70414dfb644fcb84b9de15e6568b0 Author: Martin Storsjö Date: Mon Mar 21 15:52:54 2011 +0200 ffplay: Don't assume ic->pb is non-null This fixes crashes on exit when plaing some RealRTSP streams (among other), e.g. rtsp://dl.lib.brown.edu:554/areserves/1093545294660883.mp3. These crashes have been present since 3e68b3ba7b015cf21. Signed-off-by: Ronald S. Bultje commit eb1e7f78ea9f8db391961d8fe30b3fae3ea20d5c Author: Anton Khirnov Date: Tue Mar 15 07:54:22 2011 +0100 id3v2: simplify error handling. Signed-off-by: Ronald S. Bultje commit bca6dee386307e4f3646632d98a9db87ce9de249 Author: Anton Khirnov Date: Thu Mar 17 07:10:23 2011 +0100 id3v2: explicitly seek to the end of the tag after reading Current code might stop in the middle of an invalid tag. fixes issue2650 Signed-off-by: Ronald S. Bultje commit 933e90a69a4b9c558d4fae9dffb15378910481d3 Author: Anton Khirnov Date: Mon Mar 14 20:38:59 2011 +0100 avio: make av_url_read_fseek/fpause internal. Signed-off-by: Ronald S. Bultje commit 038566a5edc73205120f30d41233a9911a42da44 Author: Stefano Sabatini Date: Sun Mar 13 21:22:59 2011 +0100 ffprobe: tweak error message in open_input_file() Replace "codec (id=%d)" with "codec with id %d", slightly more readable. commit f44d6445b7a189fde27ca0e95c7eb08f697e109f Author: Ronald S. Bultje Date: Mon Mar 21 10:00:43 2011 -0400 vc1: slice support. Also reset coded_block at each new slice, fixes problems in slice playback. commit b81a935bd99c2664b07f717113e71d1aa32be991 Author: Ronald S. Bultje Date: Tue Mar 1 11:37:55 2011 -0500 vc1: fix up memleaks in the error codepath. Introduce end: and err: labels at the end of vc1_decode_frame(), which will clean up allocated memory consistently. commit 72452cc475544b6e294676abd3fa5e0518f81841 Author: Ronald S. Bultje Date: Tue Mar 1 11:37:55 2011 -0500 vc1: warn for unimplemented pan-scan feature. commit 60c68c0ab93e6ad7a2b3cda845050c1a9f4363b8 Author: Peter Ross Date: Sun Mar 20 13:19:51 2011 +1100 Remove unused pixel format (PIX_FMT_UNUSED) and swap PIX_FMT_BGR48LE and PIX_FMT_BGR48BE enum order Signed-off-by: Michael Niedermayer commit 139313827c32a95884650b6aac8cddedabd3759f Author: Tomas Härdin Date: Mon Mar 21 12:06:56 2011 +0100 Add xd55 codec tag for XDCAM HD422 720p25 CBR files. commit 88f8805f3ef3c83af8f80f03f159480d0c8cab4b Author: Carl Eugen Hoyos Date: Mon Mar 21 12:04:10 2011 +0100 Allow demuxing of APE files with metadata tags. Fixes ticket 11. commit d4a50a2100a2b3539d238e64af98e16f47b47a89 Merge: 849f80f cf752d0 Author: Michael Niedermayer Date: Mon Mar 21 03:09:46 2011 +0100 Merge remote-tracking branch 'newdev/master' Merged-by: Michael Niedermayer commit 8d9769a77b49b0d633c835d99ed3c0aa3f3b77a1 Author: Anton Khirnov Date: Thu Mar 17 14:03:31 2011 +0100 avio: deprecate url_fileno It's an evil hack that assumes an AVIOContext is always based on top of an URLContext. It's also not used anywhere. Signed-off-by: Ronald S. Bultje commit 447fe3369177c11a49a3d376cfa3a2be468ac913 Author: Anton Khirnov Date: Thu Mar 17 07:41:19 2011 +0100 rmenc: replace avio_seek(0) with avio_tell() Signed-off-by: Ronald S. Bultje commit e42500cb4f5e51aec072fe1994c367823ca36f47 Author: Anton Khirnov Date: Thu Mar 17 07:35:18 2011 +0100 lavf: replace some more avio_seek(SEEK_CUR) with avio_skip Signed-off-by: Ronald S. Bultje commit 027f60f32b758aa8e7c08685729084b1a12d81e9 Author: Mans Rullgard Date: Sun Mar 20 22:04:47 2011 +0000 ffv1: allocate correct size for sample buffer This fixes a typo in the size calculation for the sample buffer introduced in cbabccc367424. Signed-off-by: Mans Rullgard commit cb48e245e6e770f146220fac0a8bd4dc1a5e006c Author: Panagiotis H.M. Issaris Date: Thu Mar 10 16:07:52 2011 +0100 Do no modify terminal parameters using termios.h Remove usage of tcgetattr and tcsetattr to modify terminal parameters, and rely on ctrl-c to stop instead of pressing 'q'. On systems with conio.h, keep the old behavior. Changing the terminal settings causes problems if multiple instances are running asynchronously on the same terminal, such as during a parallel FATE run, or if the process crashes before restoring the terminal. In both cases, the terminal state is messed up requiring a manual reset. Signed-off-by: Mans Rullgard commit e87a6f0dc99c2266e68ef66afaf83462d353964c Author: Mans Rullgard Date: Sun Mar 20 19:49:10 2011 +0000 Move ff_dct_init_mmx declaration to dct.h This was missed in 0aded94. Signed-off-by: Mans Rullgard commit cf752d027fafe691951fa00d9c25e2fda032b536 Author: Mike Scheutzow Date: Sun Mar 20 08:01:41 2011 +0100 doc: add details to the documentation for ffmpeg -map Patch by Mike Sheutzow with some additions and changes by Stefano. Signed-off-by: Luca Barbato commit 17a4ec8e7edf478f877f99f7dcac6b4c3268c821 Author: Stefano Sabatini Date: Sun Mar 20 08:01:40 2011 +0100 ffmpeg: modify help text for the map option Change "file:stream[:syncfile:syncstream]" to "file.stream[:syncfile.syncstream]", the latter syntax is more consistent with the stream identifier form printed by av_dump_format(), and more readable. Both syntaxes are currently accepted by the opt_map() code. Signed-off-by: Luca Barbato commit 8eec00278c2ccad7fba840416a3a22740aa8e60f Author: Mans Rullgard Date: Sun Mar 20 02:14:52 2011 +0000 dct: remove superflous #include Signed-off-by: Mans Rullgard commit 0aded9484da7da6fe23254e23382767635f8360a Author: Mans Rullgard Date: Sun Mar 20 02:14:25 2011 +0000 Move dct and rdft definitions to separate files This leaves fft.h with only the core FFT and MDCT definitions thus making it more managable. Signed-off-by: Mans Rullgard commit 4538729afed44a0ee0a762d3ef69aa4bbb7f10b3 Author: Mans Rullgard Date: Sat Mar 19 23:44:00 2011 +0000 Move sine windows to a separate file These windows do not really belong in fft/mdct files and were easily confused with the similarly named tables used by rdft. Signed-off-by: Mans Rullgard commit a45fbda994df54600101e845e29f0af60e456e95 Author: Mans Rullgard Date: Sat Mar 19 17:19:04 2011 +0000 Move ff_kbd_window_init() to a separate file This function is not tightly coupled to mdct, and it's in the way of making a fixed-point mdct implementation. Signed-off-by: Mans Rullgard commit 26f548bb59177cfc8c45ff633dd37b60cfd23edf Author: Mans Rullgard Date: Sat Mar 19 15:14:17 2011 +0000 fft: remove inline wrappers for function pointers This removes the rather pointless wrappers (one not even inline) for calling the fft_calc and related function pointers. Signed-off-by: Mans Rullgard commit 849f80fecbada7c512737e13edec9516541996e3 Author: Mans Rullgard Date: Sun Mar 6 13:50:21 2011 +0000 configure: use pkg-config helpers This makes existing pkg-config uses as well as the libsdl checks use the new pkg-config helper functions, which should be more robust against broken systems. Signed-off-by: Mans Rullgard Signed-off-by: Michael Niedermayer commit 5d117bd4629582e58a84922b74e6446004e4ed4f Author: Mans Rullgard Date: Sun Mar 6 13:48:30 2011 +0000 configure: improve pkg-config support This adds helper functions for checking packages with pkg-config and managing the associated flags. Note that pkg-config use is still discouraged due to widespread poor practices resulting in broken flags in many situations. A few badly designed packages require flags only obtainable using pkg-config, and these functions are intended for those cases. Signed-off-by: Mans Rullgard (cherry picked from commit 3f8040db3e13c3dbdf07c74d92ca34817a69f733) Signed-off-by: Michael Niedermayer commit 05aa8c4441c74732d411480ab3e477d602dd7695 Author: Mans Rullgard Date: Mon Mar 7 02:49:55 2011 +0000 configure: allow checking multiple functions in check_func_headers() This makes it possible to pass a space-separated list of functions to check_func_headers and check_lib2. If any function is missing, none are enabled as available, so this should only be used for all-or-nothing sets, i.e. groups in which none will be used if any one is missing. Signed-off-by: Mans Rullgard (cherry picked from commit edaf1ae2763ce1a23dec70e730ba2bb8ee476dfd) Signed-off-by: Michael Niedermayer commit 8ea36711b0a85e24a77e1c76b1cb24aa63df217f Merge: 43dc31f ec10a9a Author: Michael Niedermayer Date: Sat Mar 19 20:02:42 2011 +0100 Merge remote-tracking branch 'newdev/master' Merged-by: Michael Niedermayer Not Pulled: commit 42cfb3835b5dad327b7dc22740e8b6e482ecfcd2 Author: Mans Rullgard Date: Mon Feb 28 18:06:58 2011 +0000 Remove Sonic experimental audio codec commit 2912e87a6c9264d556734e2bf94a99c64cf9b102 Author: Mans Rullgard Date: Fri Mar 18 17:35:10 2011 +0000 Replace FFmpeg with Libav in licence headers commit 43dc31f7469c873ccf3927c732a9c2d7d85360bb Author: Peter Ross Date: Sat Mar 19 15:24:09 2011 +1100 Add unused pixel format (PIX_FMT_UNUSED) to make PIX_FMT_BGR48BE an odd-valued enumeration This is required for the isBE() macro internal to libswscale. Signed-off-by: Michael Niedermayer commit c743a5e287f2c4732cf2787cdb500bae0228a31d Author: Stefano Sabatini Date: Sat Mar 19 15:42:37 2011 +0100 ffplay: add braces around union definition Fix warning: ffplay.c: At top level: ffplay.c:3027: warning: missing braces around initializer ffplay.c:3027: warning: (near initialization for ‘options[53].u’) commit eb4d1cb90e14250fc52c8fe73153b72603b029f8 Author: Stefano Sabatini Date: Sat Mar 19 15:35:30 2011 +0100 ffplay: add existence check on ic->pb in decode_thread() Fix crash if ic->pb is NULL and ic->pb->error is evaluated. This happens for example with: ffplay photo.jpeg. commit ec10a9ab461b26b96eff7bbbb8623f42d8ee04ad Author: Luca Barbato Date: Thu Mar 17 02:54:12 2011 +0100 configure: use dlltools instead of lib.exe This way building ffmpeg on mingw won't require windows specific tools commit 8f1b06c81c7cc9ffc239bf1752abd9244793a48f Author: Luca Barbato Date: Sat Mar 19 15:45:48 2011 +0100 configure: check for SDL_Linked_Version instead of SDL_Init This avoids the main/SDL_main declaration clash caused by SDL on Windows and other platforms. commit 42cfb3835b5dad327b7dc22740e8b6e482ecfcd2 Author: Mans Rullgard Date: Mon Feb 28 18:06:58 2011 +0000 Remove Sonic experimental audio codec Since initially committed in 2004, this codec has only been touched for maintenanance. Functionally, it contains no novel ideas and its intended audience is better served by existing mature codecs. Signed-off-by: Mans Rullgard commit 5a15602a4e99c730036c33b467f60248889219e1 Author: Mans Rullgard Date: Thu Mar 17 17:05:11 2011 +0000 fate: remove stale fate-update.sh script This script was used to import Mike's old fate database and is no longer needed. Signed-off-by: Mans Rullgard commit 2912e87a6c9264d556734e2bf94a99c64cf9b102 Author: Mans Rullgard Date: Fri Mar 18 17:35:10 2011 +0000 Replace FFmpeg with Libav in licence headers Signed-off-by: Mans Rullgard commit 6820008a5cf810eca791477f5ef9d10883a88d35 Author: Reimar Döffinger Date: Sat Mar 19 12:29:07 2011 +0100 Fix compiler warnings due to missing casts. commit c9f6eab184cac379c7a44d5899979165798d45d4 Author: Reimar Döffinger Date: Sat Mar 5 13:49:13 2011 +0100 Detect byte-swapped AC-3 (aka DNET) and support decoding it directly. This allows the AC-3 decoder to be used directly with RealMedia decoders that unlike the libavformat one do not byte-swap automatically. Since the new code is only used in case we would fail directly otherwise there should be no risk for regressions. The "buf" pointer needs to be overwritten since otherwise the CRC check fails. commit 19d82cb14cc5967b8e09b242da1c2aa2d32be028 Author: Mark Himsley Date: Fri Mar 18 15:25:26 2011 +0000 fade: fix draw_slice() check on fade->factor value draw_slice() checks that the fade factor is < 65536 and only calculates the fade if so. But the fade factor is clipped in end_frame() by av_clip_uint16() to 65535, so the fade is calculated for every frame. This patch alters the check so that it compares with < 65535 (UINT16_MAX). commit 1527e689cfe3d1f0062f7d3935bad6ed027b3bc8 Author: Mark Himsley Date: Fri Mar 18 14:42:29 2011 +0000 fade: make draw_slice() chroma check against planes 1 and 2 draw_slice() checks that planes 0 and 1 of AVFilterBufferRef's data are not NULL before manipulating planes 1 and 2. This patch makes the check against planes 1 and 2. More senseful and possibly more robust. commit faa6f1c306b817a7349e3fe16590371d6d499998 Author: Janne Grunau Date: Wed Mar 16 21:53:58 2011 +0100 get rid of the last svn mentions commit a96c0059d8da241a39ec7283dacf3161964733d8 Author: Peter Ross Date: Fri Mar 18 22:28:52 2011 +1100 patcheck: warn about assert usage Signed-off-by: Michael Niedermayer commit 133055c5e47b047b0806ccdeb42b82e418bd5dfa Author: Michael Niedermayer Date: Fri Mar 18 13:16:14 2011 +0100 reverts parts of commit de11ee906ed232157392924735c18ab7d8522ccb. The author of this patch has a poor understanding of the code commit 4eb41d16bee406d1481d412639230510015ea708 Merge: 12bcfe0 350785a Author: Michael Niedermayer Date: Fri Mar 18 17:58:49 2011 +0100 Merge remote-tracking branch 'newdev/master' Merged-by: Michael Niedermayer commit 12bcfe05b45175cc7fc5cc719392c35ee5a3c39c Author: Stefano Sabatini Date: Thu Mar 17 12:52:40 2011 +0100 lavf: fix function name in compute_pkt_fields2 av_dlog message commit fda299f0d01c1691625180786a01b01065df7156 Author: Konstantin Pavlov Date: Thu Mar 17 10:11:14 2011 +0000 configure: use -r option for pr when listing enabled config options. This fixes ugliness when configure outputs its (empty) results on HPUX (maybe some other UNIXes too): Enabled indevs: pr: -- empty file Signed-off-by: Mans Rullgard commit 350785a6621529c50771f4e7043b4d159a96ed26 Author: Nathan Caldwell Date: Thu Mar 17 19:33:05 2011 -0600 aacenc: 10l, missed a reference when refactoring the psymodel. commit 0f999cfddb0746602288eabddf38679fd25a2ff7 Author: Justin Ruggles Date: Tue Mar 15 22:29:04 2011 -0400 ac3enc: add float_to_fixed24() with x86-optimized versions to AC3DSPContext and use in scale_coefficients() for the floating-point AC-3 encoder. commit 487fef2dcc24d7b4051b4402acf5c619fb082351 Author: Mans Rullgard Date: Thu Mar 17 19:43:57 2011 +0000 asf: update seek test reference This updates the seek test reference to match de11ee9. Before this change, most of the seeks requested positions before the supposed start of the file (the preroll time), resulting in the first packet being returned. With the preroll subtracted, some of these seeks will land within the file and some beyond the end, thus returning a different set of packets. Signed-off-by: Mans Rullgard commit 3660b5bca9aa076214e8ee7f6c3cceee8641f31f Author: j@v2v.cc Date: Thu Mar 17 17:57:52 2011 +0100 remove definition of swab right now swab is defined in libavfilter/libmpcodecs/mpbswap.h this breaks mingw32 cross compiles. since it its not used, it should be removed. alternatively swab has to be added to HAVE_LIST in configure. Signed-off-by: Michael Niedermayer commit afbfb2a81dde6d154216b72ac839aa4585a80d1c Author: Michael Niedermayer Date: Thu Mar 17 17:02:54 2011 +0100 Revert "jvdec: don't use deprecated url_feof()" This reverts commit 1dac4d554734b16757b36a0adc71642c5ef2c4e6. commit c0b1bc8d1797355c4f65ae4c488705b98cf9c8e9 Author: Michael Niedermayer Date: Thu Mar 17 17:02:14 2011 +0100 Revert "partially rename FFmpeg to Libav" This reverts commit 070c5d0f3530c16c92b81f3f0de2943410367c00. commit e528cdac8a95a5364cdd408412b64dc605a8eba6 Author: Michael Niedermayer Date: Thu Mar 17 17:01:10 2011 +0100 Revert "replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION" This reverts commit 29ba091136a5e04574f7bfc1b17536c923958f6f. commit 0cb88628fbd467636fcf3ebfe6a26c51b0f49504 Author: Michael Niedermayer Date: Thu Mar 17 16:57:37 2011 +0100 Revert "use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*" This reverts commit a03be6e1ba4cbf9984b0bbdb674704bbb2da6713. commit a6be21d3baf09be1e22648e4802b955191d26b67 Author: Michael Niedermayer Date: Thu Mar 17 16:55:58 2011 +0100 Revert "replace FFmpeg with Libav in doc/" This reverts commit f8a45fa1b1764b34d4263eacd93411e8ba0484a4. Conflicts: doc/optimization.txt commit 2cface71ca58b1ab811efae7d22f3264f362f672 Author: Anton Khirnov Date: Thu Mar 17 17:00:21 2011 +0100 nutenc: fix a memleak This fixes a minor memory leak introduced in 073f8b1. Signed-off-by: Mans Rullgard commit de11ee906ed232157392924735c18ab7d8522ccb Author: Vladimir Pantelic Date: Thu Mar 17 14:56:14 2011 +0100 asfdec: subtract the preroll value and thus output 0 based timestamps Signed-off-by: Mans Rullgard commit 0fecf2642b9d909820683647c70031a954f5e58d Merge: e309fdc f1f60f5 Author: Michael Niedermayer Date: Thu Mar 17 16:53:58 2011 +0100 Merge remote-tracking branch 'newdev/master' Conflicts: Changelog doc/APIchanges doc/optimization.txt libavformat/avio.h Merged-by: Michael Niedermayer commit e309fdc7018a1027d187ec27fb1d69a41a4ee167 Author: Peter Ross Date: Thu Mar 17 21:15:57 2011 +1100 Add PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats Signed-off-by: Michael Niedermayer commit 969eb21ba21f0ed7154dd2a2fc754ef159df94a2 Author: Philip Langdale Date: Mon Mar 14 22:14:23 2011 -0700 CrystalHD: Use doxygen compatible comments where relevant. Signed-off-by: Philip Langdale Signed-off-by: Michael Niedermayer commit f1f60f5252b0b448adcce0c1c52f3161ee69b9bf Author: Martin Storsjö Date: Thu Mar 17 12:24:23 2011 +0200 lavf: Make make_absolute_url a lavf internal function This is shared by both applehttp demuxer and protocol. Signed-off-by: Luca Barbato commit dc6fdad5dcbf4e796543929ccbce0de1f8535efd Author: Martin Storsjö Date: Thu Mar 17 12:23:52 2011 +0200 Add missed APIchanges and changelog entries Add an APIchanges entry for the av_pkt_dump2 and av_pkt_dump_log2 functions, and a changelog entry for the apple http live streaming protocol handler. Since neither of them got a minor bump at commit time, but were applied before the jv demuxer, they all can be considered added in this minor version. Signed-off-by: Luca Barbato commit bc040cb3e2eac2882b4af01de3b769620634b2aa Author: Martin Storsjö Date: Thu Mar 17 10:24:08 2011 +0000 applehttp: Fix a typo in a comment Signed-off-by: Mans Rullgard commit 68d875addcffe6941e0f75202e3972e37371180f Author: Stefano Sabatini Date: Tue Mar 15 13:03:03 2011 +0100 lavf: make av_interleave_packet() return meaningful error codes Signed-off-by: Michael Niedermayer (cherry picked from commit c5dcb3d493a6bb73efeb8bfae24f5cc31908201f) Signed-off-by: Reinhard Tartler commit 70abc32314b220cbf4d0a087e52b6ea43bb36b96 Author: Stefano Sabatini Date: Tue Mar 15 13:12:15 2011 +0100 lavf: enable av_dlog message in av_interleaved_write_frame() Help debugging timestamp issues. Signed-off-by: Michael Niedermayer (cherry picked from commit d541c8b468c12892fe7b7e655e1ed45e11e2166d) Signed-off-by: Reinhard Tartler commit 79f43a8cb6ff426e706a4cf4f21ad6dd7ebf3467 Author: Stefano Sabatini Date: Tue Mar 15 13:11:57 2011 +0100 lavf: enable av_dlog() in compute_pkt_fields2() Turns a comment into an av_dlog() instruction, also add a commented issues. Signed-off-by: Michael Niedermayer (cherry picked from commit 77f21ce4641b53f3277ba30ca3d009b6250fd9ea) Signed-off-by: Reinhard Tartler commit 4afedfd8e5c5f102d3a67c224c33b51bbed47eee Author: Nathan Caldwell Date: Wed Mar 16 23:35:39 2011 -0400 aacenc: cosmetics, indentation, and comment clarification Correct bad indentation in aaccoder Clarify and correct comments in 3GPP psymodel, other cosmetics. commit b7c96769c52a312c6f6abe43f5d8c83701118a0b Author: Nathan Caldwell Date: Wed Mar 16 23:34:12 2011 -0400 aacenc: Refactor the parts of the AAC psymodel. 3GPP: Remove ffac from and move min_snr out of AacPsyBand. Rearrange AacPsyCoeffs to make it easier to implement energy spreading. Rename the band[] array to bands[] Copy energies and thresholds at the end of analysis. LAME: Use a loop instead of an if chain in LAME windowing. commit f578854efce12842ed4e4e25b36cf2f798054468 Author: Young Han Lee Date: Fri Mar 11 11:39:24 2011 +0900 aaccoder: Change FFMAX for allzero flag to OR bit operation Signed-off-by: Ronald S. Bultje commit b7f2fdde74608d848f943377c40d3df804c5f955 Author: Anton Khirnov Date: Mon Mar 14 20:39:06 2011 +0100 avio: rename put_flush_packet -> avio_flush Signed-off-by: Ronald S. Bultje commit 35f1023592b46e608a4de1566b12268e3e9e72f0 Author: Anton Khirnov Date: Mon Mar 14 20:39:05 2011 +0100 avio: deprecate url_close_buf It's not used anywhere and its return value looks broken. Signed-off-by: Ronald S. Bultje commit 83fddaeb81f782e06281730a809ae2bf4c86a229 Author: Anton Khirnov Date: Mon Mar 14 20:39:04 2011 +0100 avio: deprecate url_open_buf It's only used in one place and does the same thing as avio_alloc_context. Signed-off-by: Ronald S. Bultje commit eda4cf92d795ae7e233e83f5ad37209d475b7805 Author: Anton Khirnov Date: Mon Mar 14 20:39:03 2011 +0100 avio: always compile avio_printf, rather than on CONFIG_MUXERS Signed-off-by: Ronald S. Bultje commit d9d86e00b2891a2651fd41f0d2d220a67f7968c3 Author: Anton Khirnov Date: Mon Mar 14 20:39:02 2011 +0100 avio: avio_ prefix for url_fprintf Signed-off-by: Ronald S. Bultje commit af02073225e5b34a8ea72bd3ff531868ed0b5061 Author: Anton Khirnov Date: Mon Mar 14 20:39:01 2011 +0100 avio: change avio_tell/skip from macros to inline functions Signed-off-by: Ronald S. Bultje commit 59f65d9579262651731e9a22845957d78b4c4f57 Author: Anton Khirnov Date: Mon Mar 14 20:38:58 2011 +0100 avio: make url_setbufsize internal. Signed-off-by: Ronald S. Bultje commit 4839c192de7782605e1b7c9cc84aaf692cf67284 Author: Anton Khirnov Date: Mon Mar 14 20:38:57 2011 +0100 lavf: move ff_get_v from avio.h to avio_internal.h And rename it to ffio_read_varlen. Signed-off-by: Ronald S. Bultje commit 073f8b10d8d7638fcee33aba04ca2a7b90bdb2c3 Author: Anton Khirnov Date: Wed Mar 16 06:42:43 2011 +0100 nutenc: mux chapters. Signed-off-by: Luca Barbato commit 4af9c1a56f70418cb0256179f8200a8e37996035 Author: Luca Barbato Date: Sun Mar 13 19:50:37 2011 +0100 doc: update applehttp documentation Integrate more comments from Stefano. commit 45a8a02a4151c9ff0d1161bf90bffcfbbb312fb8 Author: Anton Khirnov Date: Tue Mar 15 09:14:38 2011 +0100 lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes sense Signed-off-by: Ronald S. Bultje commit c5dcb3d493a6bb73efeb8bfae24f5cc31908201f Author: Stefano Sabatini Date: Tue Mar 15 13:03:03 2011 +0100 lavf: make av_interleave_packet() return meaningful error codes Signed-off-by: Michael Niedermayer commit 77f21ce4641b53f3277ba30ca3d009b6250fd9ea Author: Stefano Sabatini Date: Tue Mar 15 13:11:57 2011 +0100 lavf: enable av_dlog() in compute_pkt_fields2() Turns a comment into an av_dlog() instruction, also add a commented issues. Signed-off-by: Michael Niedermayer commit d541c8b468c12892fe7b7e655e1ed45e11e2166d Author: Stefano Sabatini Date: Tue Mar 15 13:12:15 2011 +0100 lavf: enable av_dlog message in av_interleaved_write_frame() Help debugging timestamp issues. Signed-off-by: Michael Niedermayer commit a7844c580d83d8466c161a0e3979b3902d0d9100 Author: Thierry Foucu Date: Wed Mar 16 13:37:41 2011 -0700 Fix compilation error when CONFIG_AVFILTER is not defined. Signed-off-by: Michael Niedermayer commit cbf5d22d24945e52b3c1e4c1a00d4d8179be930a Author: Ramiro Polla Date: Wed Mar 16 15:28:43 2011 -0300 Remove occurrences of my old email address Signed-off-by: Mans Rullgard commit 381d37fda91494e312ab2938080a379c5e11998b Author: Mans Rullgard Date: Wed Apr 21 00:09:00 2010 +0100 dsputil: add bswap16_buf() There are several places where a buffer is byte-swapped in 16-bit units. This allows them to share code which can be optimised for various architectures. Signed-off-by: Mans Rullgard commit dff68563d846274cee0a2cd2430d6f1a2cb51eaa Author: Sean McGovern Date: Wed Mar 16 01:01:17 2011 +0000 darwin: use -read_only_relocs flag only on 32-bit x86 Avoids the linker warning: ld: warning: -read_only_relocs cannot be used with x86_64 Signed-off-by: Mans Rullgard commit 6f1260f87061bdf7a8ff2472e309d9635e5d770d Author: Aurelien Jacobs Date: Wed Mar 16 23:37:16 2011 +0100 matroskadec: set a default duration also for packets comming from a simple block commit 69aab68037089b96519496fd8acd71780f62ab2c Author: Baptiste Coudurier Date: Wed Mar 16 14:26:25 2011 -0700 Use av_strdup instead of strdup, fixes mingw build commit f8a45fa1b1764b34d4263eacd93411e8ba0484a4 Author: Janne Grunau Date: Mon Mar 14 22:59:19 2011 +0100 replace FFmpeg with Libav in doc/ unless it stands for ffmpeg the program or is historic commit a03be6e1ba4cbf9984b0bbdb674704bbb2da6713 Author: Janne Grunau Date: Mon Mar 14 22:27:40 2011 +0100 use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_* commit 29ba091136a5e04574f7bfc1b17536c923958f6f Author: Janne Grunau Date: Mon Mar 14 22:23:10 2011 +0100 replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION also update the multiple inclusion guards in config.h|mak commit 070c5d0f3530c16c92b81f3f0de2943410367c00 Author: Janne Grunau Date: Mon Mar 14 21:39:58 2011 +0100 partially rename FFmpeg to Libav update mailing list references and irc channels in configure commit 57149a92f8b4886fd699eefcf9fe1b3552af8193 Author: Ramiro Polla Date: Wed Mar 16 15:40:33 2011 -0300 Remove occurrences of my old email address. Signed-off-by: Michael Niedermayer commit fed5676ffeba2a37e6233e5fef42dc50d6cfeb64 Author: Anton Khirnov Date: Wed Mar 16 14:31:32 2011 +0100 mp3enc: remove mp3_write_packet(), use ff_raw_write_packet() instead The two functions are identical, no point in duplicating code here. commit 8312e3fc9041027a33c8bc667bb99740fdf41dd5 Author: Kostya Date: Tue Mar 15 09:19:43 2011 +0000 Do not attempt to decode APE file with no frames This fixes invalid reads/writes with this sample: http://packetstorm.linuxsecurity.com/1103-exploits/vlc105-dos.txt commit 1dac4d554734b16757b36a0adc71642c5ef2c4e6 Author: Anton Khirnov Date: Wed Mar 16 04:46:22 2011 +0000 jvdec: don't use deprecated url_feof() commit 79414257e23a0dee82a9978b5444ae8953376221 Author: Justin Ruggles Date: Tue Mar 15 20:38:23 2011 -0400 mathops: fix MULL() when the compiler does not inline the function. If the function is not inlined, an immmediate cannot be used for the shift parameter, so the %cl register must be used instead in that case. This fixes compilation for x86-32 using gcc with --disable-optimizations. commit 1c31b26bdf66879a46a7a3e340da815c1b2125a8 Author: Kostya Shishkov Date: Tue Mar 15 20:37:37 2011 +0100 Do not attempt to decode APE file with no frames. This fixes invalid reads/writes with this sample: http://packetstorm.linuxsecurity.com/1103-exploits/vlc105-dos.txt commit 56e2ac6b45ada4f9c107fe7b25f0706ec2e4dc11 Author: Anton Khirnov Date: Tue Mar 15 10:14:16 2011 +0100 id3v2: merge TYER/TDAT/TIME to date tag commit aaff3b312ed0a67750aa0a3a3300a3b69bb87150 Author: Justin Ruggles Date: Tue Mar 15 13:35:05 2011 -0400 mathops: change "g" constraint to "rm" in x86-32 version of MUL64(). The 1-arg imul instruction cannot take an immediate argument, only a register or memory argument. commit b181b8fb96f9fdc2b166fcbd048110cec653cdf9 Author: Justin Ruggles Date: Tue Mar 15 13:30:24 2011 -0400 mathops: convert MULL/MULH/MUL64 to inline functions rather than macros. This fixes unexpected name collisions that were occurring with variables declared within the macros. It also fixes the fate-acodec-ac3_fixed regression test on x86-32. commit 6947b0c42e0649f0c8355442d1732d642e467902 Merge: 27293b8 c76374c Author: Michael Niedermayer Date: Tue Mar 15 16:18:40 2011 +0100 Merge remote-tracking branch 'newdev/master' Merged-by: Michael Niedermayer commit 27293b840ccae95ddb1f4d8af519e7962b0e373d Author: Michael Niedermayer Date: Tue Mar 15 15:12:17 2011 +0100 Revert "ac3enc: shift coefficients to 24-bit following MDCT rather than using an exponent offset." This reverts commit 7e0a284b9f1967d46603711e85e0be01e084eadf. revert at authors request due to better impementation Signed-off-by: Michael Niedermayer commit f7a5e7791dda0b26df198f301db5605555a7a9d3 Author: Michael Niedermayer Date: Tue Mar 15 15:11:22 2011 +0100 Revert "ac3enc: add SIMD-optimized shifting functions for use with the fixed-point AC3 encoder" This reverts commit cc4d3dd3e2171f63cd4297292349b58788fff260. revert at authors request due to better impementation being available Signed-off-by: Michael Niedermayer commit c76374c6db5f486672f9df223f43e4892bd655c9 Author: Nicolas George Date: Sun Mar 13 00:42:27 2011 +0100 Use AVERROR_EXIT with url_interrupt_cb. Functions interrupted by url_interrupt_cb should not be restarted. Therefore using AVERROR(EINTR) was wrong, as it did not allow to distinguish when the underlying system call was interrupted and actually needed to be restarted. This fixes roundup issues 2657 and 2659 (ffplay not exiting for streamed content). Signed-off-by: Nicolas George Signed-off-by: Ronald S. Bultje commit bafa4dd3e69531f262472ac286e0ae7d4dbfbd97 Author: Nicolas George Date: Sun Mar 13 00:42:26 2011 +0100 Add AVERROR_EXIT. This is different from AVERROR(EINTR) because calls that fail with EINTR should usually be restarted. Signed-off-by: Nicolas George Signed-off-by: Ronald S. Bultje commit 3e68b3ba7b015cf2154ad2023781eedd47f0f4bb Author: Anton Khirnov Date: Mon Mar 14 20:38:55 2011 +0100 avio: deprecate url_ferror AVIOContext.error should be used directly instead. Signed-off-by: Ronald S. Bultje commit 75b9ed04b977bfd467816f7e60c6511ef89b8a2b Author: Anton Khirnov Date: Mon Mar 14 20:38:54 2011 +0100 lavf/utils: dont't explicitly check AVIOContext.error The error should be caught in write_packet()/write_trailer() Signed-off-by: Ronald S. Bultje commit 025225d7ee0e7585dff9617c60259febd9e7299c Author: Philip Langdale Date: Mon Mar 14 22:14:22 2011 -0700 h264_mp4toannexb_bsf: Fix spurious warning when stream has SPS and PPS units. Signed-off-by: Philip Langdale Signed-off-by: Ronald S. Bultje commit 9f8f62d4a37735ea823e82bad566a2aa69732888 Author: Mans Rullgard Date: Mon Mar 14 17:15:34 2011 +0000 Delete MAINTAINERS file This file is a bad idea and also badly outdated. Signed-off-by: Mans Rullgard commit f1efbca5e914b28cd37cb1ea82d371acf3b96f61 Author: Justin Ruggles Date: Fri Mar 11 16:45:01 2011 -0500 ac3enc: add SIMD-optimized shifting functions for use with the fixed-point AC3 encoder. commit 323e6fead07c75f418e4b60704a4f437bb3483b2 Author: Justin Date: Fri Mar 11 13:03:26 2011 -0500 ac3enc: do not right-shift fixed-point coefficients in the final MDCT stage. This increases the accuracy of coefficients, leading to improved quality. Rescaling of the coefficients to full 25-bit accuracy is done rather than offsetting the exponent values. This requires coefficient scaling to be done before determining the rematrixing strategy. Also, the rematrixing strategy calculation must use 64-bit math to prevent overflow due to the higher precision coefficients. commit 6e7cf13b6b1d0e08969b64129b9022cc1171d875 Author: Peter Ross Date: Sun Mar 13 16:27:05 2011 +1100 mm decoder: move buffer allocation from decode_init() to decode_frame() This permits playback in ffplay when libavfilter is enabled. Signed-off-by: Ronald S. Bultje commit 7f05c164d8ccbfded9bcefdb41942bc28d85c87a Author: Peter Ross Date: Sun Mar 13 16:15:38 2011 +1100 jv demuxer: prevent video packet size overflow In the event of overflow, the JV_PADDING state will avio_skip over any overflow bytes (using JVFrame.total_size). Signed-off-by: Ronald S. Bultje commit 772cb06281d9b82f283fc6c2ca7fb55a562d0ad9 Author: Peter Ross Date: Sat Mar 12 13:31:40 2011 +1100 jv demuxer: define JV_PREAMBLE_SIZE instead of hard coding the number Signed-off-by: Ronald S. Bultje commit 20c1281fe3fb30a8583d3a56ab2978e4ac8e9ee6 Author: Peter Ross Date: Sat Mar 12 13:31:26 2011 +1100 jv demuxer: calculate palette_size for each frame in read_header Signed-off-by: Ronald S. Bultje commit 402f9ad5fd13f594719408ca8d4cea8238db1de9 Author: Peter Ross Date: Wed Mar 9 02:11:10 2011 +1100 Bitmap Brothers JV errata Signed-off-by: Ronald S. Bultje commit bfaefd87dc5c46a4d422cebcff7a9a6dbaad046f Author: Peter Ross Date: Thu Mar 10 23:29:22 2011 +1100 Bitmap Brothers JV demuxer Signed-off-by: Ronald S. Bultje commit 0697440c1ef55e6def219cdf0e22682b0b71f089 Author: Peter Ross Date: Thu Mar 10 23:23:25 2011 +1100 Bitmap Brothers JV video decoder Signed-off-by: Ronald S. Bultje commit 21de920472cc3d338312957bfd03dcac278b5ae3 Author: Johan Andersson Date: Sun Mar 13 23:29:19 2011 +0100 Update the url to the site website and change ffmpeg-devel to libav-devel Signed-off-by: Ronald S. Bultje commit 0e6a3ee4fa317f674a3e895188620aa5839cc414 Author: Luca Barbato Date: Wed Mar 9 10:11:53 2011 +0100 doc: document applehttp protocol The documentation might be extended once/if a live/store override option will have to be provided for non-compliant segmenter. commit 6e1f0d5edf720afa835fb97e0f74b51848323b6d Author: Peter Ross Date: Sun Mar 13 16:21:52 2011 +1100 mm decoder: move buffer allocation from decode_init() to decode_frame(). this permits playback in ffplay when libavfilter is enabled. commit 435535e41159fbe7423a12078d684329a554776d Author: Peter Ross Date: Sat Mar 12 13:12:05 2011 +1100 jv demuxer: prevent video packet size overflow In the event of overflow, the JV_PADDING state will avio_skip over any overflow bytes (using JVFrame.total_size). commit 478607668c8840278c3fdd97382c3fae3f8cd7a2 Author: Stefano Sabatini Date: Sat Mar 12 14:46:16 2011 +0100 fbdev: fix check on nanosleep return vale In fbdev_read_packet(): nanosleep returns -1 in case of errors, the EINTR check has to be done on errno. Spotted by Nicolas. Signed-off-by: Michael Niedermayer commit 57d63d43cf508ae99c3a536d8c63d67cd26c628a Author: Peter Ross Date: Sat Mar 12 13:31:40 2011 +1100 jv demuxer: define JV_PREAMBLE_SIZE instead of hard coding the number Signed-off-by: Michael Niedermayer commit 2f1084ca87e465dde74cf70a26a6bcd6076aac82 Author: Peter Ross Date: Sat Mar 12 13:31:26 2011 +1100 jv demuxer: calculate palette_size for each frame in read_header Signed-off-by: Michael Niedermayer commit 81a131312d0b56808e3f794cfd5d54ca6e13156f Author: Jason Garrett-Glaser Date: Sat Mar 12 15:30:18 2011 -0800 VP8: fix other function declaration Was missed in 3efbe137. commit fbe98aee201ea448fb561e14e523f68c80ac53f9 Author: Michael Niedermayer Date: Sat Mar 12 19:14:55 2011 +0100 Revert "configure: allow checking multiple functions in check_func_headers()" This reverts commit edaf1ae2763ce1a23dec70e730ba2bb8ee476dfd. breaks windows builds commit 8876c8ae24b4abfeeb62184ceeb0de4b11be8acc Author: Michael Niedermayer Date: Sat Mar 12 19:14:49 2011 +0100 Revert "configure: improve pkg-config support" This reverts commit 3f8040db3e13c3dbdf07c74d92ca34817a69f733. breaks windows builds commit a0a1b7b90d2311c74177949fa938dd7bd15a0012 Author: Michael Niedermayer Date: Sat Mar 12 19:14:25 2011 +0100 Revert "configure: use pkg-config helpers" This reverts commit 4fa18c5666de24316710df670e44d4850e0796a7. breaks windows builds commit 27efa296c217dcd9d55354395e4f41991b7cc131 Merge: 3efbbbb 0215006 Author: Michael Niedermayer Date: Sat Mar 12 17:55:59 2011 +0100 Merge branch 'master' of git://git.ffmpeg.org/ffmpeg Merged-by: Michael Niedermayer commit 0215006ab75be1f49fa8eacf2c6d3c1bd22edfc7 Author: Hendrik Leppkes Date: Fri Mar 11 23:12:04 2011 +0100 VC1: Export profile/level Signed-off-by: Mans Rullgard commit 5dbe78bf91112b61ee6948c275d6bcf87b68251f Author: Stefano Sabatini Date: Sat Mar 12 11:17:52 2011 +0000 ffmpeg: remove unused variable in ffmpeg_exit() Fix the warning: ffmpeg.c: In function ‘ffmpeg_exit’: ffmpeg.c:509: warning: unused variable ‘j’ Signed-off-by: Mans Rullgard commit 1eeca88691ad0fd232f110f3a389ebb494c0a6dc Author: Jason Garrett-Glaser Date: Fri Mar 11 13:43:10 2011 -0800 VP8: optimize VP8Context struct ordering Shaves at least 3KB off code size on x86, should improve cache utilization. This would probably be useful to do for other decoders/encoders as well. commit 3efbe137396d39e225315a9d1e4bf82d1a9c92e5 Author: Jason Garrett-Glaser Date: Wed Mar 9 19:53:52 2011 -0800 VP8: fix function declaration commit b1d2f812c9c581d38fe7c93a4ea24430fedc89f1 Author: Jason Garrett-Glaser Date: Wed Mar 9 19:54:05 2011 -0800 VP8: token probs doesn't need padding prob[0] is the only prob array ever accessed, so prob[1] can serve as padding for prob[0]. commit 628b48db85dae7ad212a63dafcd6a3bf8d8e93f3 Author: Jason Garrett-Glaser Date: Wed Mar 9 13:46:23 2011 -0800 VP8: use a goto to break out of two loops A break statement was supposed to break out of two loops, but only broke out of one. Didn't affect output, just could have been marginally slower. commit a5444fee06e9d14637396b4237d0204187a076e0 Author: Mans Rullgard Date: Fri Mar 11 23:37:00 2011 +0000 Add CONFIG_AC3DSP symbol to simplify makefiles Signed-off-by: Mans Rullgard commit 4fa18c5666de24316710df670e44d4850e0796a7 Author: Mans Rullgard Date: Sun Mar 6 13:50:21 2011 +0000 configure: use pkg-config helpers This makes existing pkg-config uses as well as the libsdl checks use the new pkg-config helper functions, which should be more robust against broken systems. Signed-off-by: Mans Rullgard commit 3f8040db3e13c3dbdf07c74d92ca34817a69f733 Author: Mans Rullgard Date: Sun Mar 6 13:48:30 2011 +0000 configure: improve pkg-config support This adds helper functions for checking packages with pkg-config and managing the associated flags. Note that pkg-config use is still discouraged due to widespread poor practices resulting in broken flags in many situations. A few badly designed packages require flags only obtainable using pkg-config, and these functions are intended for those cases. Signed-off-by: Mans Rullgard commit edaf1ae2763ce1a23dec70e730ba2bb8ee476dfd Author: Mans Rullgard Date: Mon Mar 7 02:49:55 2011 +0000 configure: allow checking multiple functions in check_func_headers() This makes it possible to pass a space-separated list of functions to check_func_headers and check_lib2. If any function is missing, none are enabled as available, so this should only be used for all-or-nothing sets, i.e. groups in which none will be used if any one is missing. Signed-off-by: Mans Rullgard commit 3efbbbb5094a146efeb1f0613918ea97d31d00d2 Merge: 2800e8d 35d7d6f Author: Michael Niedermayer Date: Fri Mar 11 14:59:51 2011 +0100 Merge remote-tracking branch 'remotes/newdev/master' Merged-by: Michael Niedermayer commit 2800e8d62e4c6cdd8a7e218cb15a10f216946f18 Author: Michael Niedermayer Date: Wed Mar 9 19:50:36 2011 +0100 Revert "ac3enc: use MUL64() to multiply fixed-point coefficients" Author says, this is unneeded. This reverts commit 67fc32ac6197a7fe265795d0bf60bf704464394e. commit 5126a8ecbbb6981ac29f437f1d35f5248c8f234d Author: Marton Balint Date: Sun Feb 20 01:18:30 2011 +0100 Fix av_find_best_stream when providing a wanted stream In the main loop, stream_number is incremented after checking the stream type, so the search usually will not find the wanted stream. This patch eliminates the useless stream_number variable and introduces a new one, called real_stream_index to store the real stream index of the current stream, no matter if we are looping through all the streams or only the streams of a program. Signed-off-by: Michael Niedermayer commit fa14610df5e21fd562922a5622daf42f746df978 Author: Marton Balint Date: Sun Feb 20 01:18:49 2011 +0100 Fix av_find_best_stream when decoder_ret is given and using a related stream Yet another fix for the code originally designed for use without related_stream. Signed-off-by: Michael Niedermayer commit 9f720d5f9a8d7ffd3d8152e06828b2cea663dcee Author: Peter Ross Date: Wed Mar 9 02:11:10 2011 +1100 Bitmap Brothers JV errata Signed-off-by: Michael Niedermayer commit 48e0d2225183479705dced3d7a17e8ce5a700d1a Author: Peter Ross Date: Thu Mar 10 23:29:22 2011 +1100 Bitmap Brothers JV demuxer Signed-off-by: Michael Niedermayer commit 2f46a0af8d0058c308d2365d1da76c6a0ff185a4 Author: Peter Ross Date: Thu Mar 10 23:23:25 2011 +1100 Bitmap Brothers JV video decoder Signed-off-by: Michael Niedermayer commit 75a8e0f0ab644701061aec87f11a79fcaa8c1c29 Author: Michael Niedermayer Date: Fri Mar 11 12:24:53 2011 +0100 Add avio_skip() commit 35d7d6f7489c75aaa2fcb39820fb25b0fd44524b Author: Benjamin Larsson Date: Wed Mar 9 10:55:20 2011 +0100 Add one more avc intra fourcc and extend the description Signed-off-by: Ronald S. Bultje commit aecd0a44962a6531340d1439be094c577d711014 Author: Benjamin Larsson Date: Thu Mar 10 11:29:56 2011 +0100 Export profiles from the mpeg2 video decoder Signed-off-by: Ronald S. Bultje commit b33fa8a1cdbe92824b833eb1ee3ec360f8d8b00f Author: Philip Langdale Date: Wed Mar 9 22:09:00 2011 -0800 CrystalHD decoder support v7 The Broadcom CrystalHD decoder chips provide hardware video decoding for a number of video formats. It does so using a memory:memory interface where a compressed bitstream is fed in and decompressed pictures are copied out. As such, it works independent of any graphics hardware in the system. Features supported in this initial version: * Support for Linux (using current drivers/library from git.wilsonet.com) * Support for 70015 hardware * Formats: MPEG2, MPEG4 Part 2, H.264, VC1 and DivX 3.11 (untested) * Progressive content * Non-H.264 Interlaced content * H.264 MBAFF content Features missing in this initial version: * Support for OSX (might work - untested) * Support for Windows * Support for 70012 hardware * H.264 PAFF content Signed-off-by: Philip Langdale Signed-off-by: Michael Niedermayer commit 0b82612d350ac0756c71e80d872f2f6b95f89585 Author: Michael Niedermayer Date: Thu Mar 10 19:56:27 2011 +0100 ffplay: Continue if the file was appended to. This is a bit experimental Signed-off-by: Michael Niedermayer commit 3bd624b4ee355328382295af411f5343b1329f43 Author: Michael Niedermayer Date: Thu Mar 10 13:21:52 2011 +0100 Fix url_feof() for file appendings. Signed-off-by: Michael Niedermayer commit 9c55fe8f4c9c3965e47a8ed49ba5c99e54a3eb3b Merge: ffb0304 fb61a7c Author: Michael Niedermayer Date: Wed Mar 9 18:55:51 2011 +0100 Merge remote-tracking branch 'remotes/newdev/master' Merged-by: Michael Niedermayer commit ffb0304593547dd31424d7df62de771b7c1d7719 Author: Anton Khirnov Date: Mon Mar 7 22:32:05 2011 +0000 id3v2: fix typo in error message Signed-off-by: Mans Rullgard (cherry picked from commit fb61a7c5343a23d845ab73dd28caf6ec98cd6101) commit fb61a7c5343a23d845ab73dd28caf6ec98cd6101 Author: Anton Khirnov Date: Mon Mar 7 22:32:05 2011 +0000 id3v2: fix typo in error message Signed-off-by: Mans Rullgard commit 31ff9bd7b8cd8236f70e2bf5368a480fa49f7d27 Author: Nathan Caldwell Date: Tue Mar 8 01:22:14 2011 -0700 aacenc: Fix a segfault in search_for_quantizers This reverts the removal of scoefs from AACEncContext. It resulted in scoefs being a NULL pointer when search_for_quantizers() is called. Signed-off-by: Ronald S. Bultje commit 0de8ebf49125c48688a800b45009cfa222e5dbac Author: Carl Eugen Hoyos Date: Tue Mar 8 20:45:26 2011 +0100 Do not use AVFMT_FLAG_NONBLOCK for the output file. Allows to use output device alsa. commit cc4d3dd3e2171f63cd4297292349b58788fff260 Author: Justin Ruggles Date: Tue Mar 8 13:18:57 2011 -0500 ac3enc: add SIMD-optimized shifting functions for use with the fixed-point AC3 encoder Signed-off-by: Michael Niedermayer commit 7e0a284b9f1967d46603711e85e0be01e084eadf Author: Justin Ruggles Date: Tue Mar 8 13:18:56 2011 -0500 ac3enc: shift coefficients to 24-bit following MDCT rather than using an exponent offset. This makes channel coupling more accurate, increasing quality for stereo content. It also simplifies exponent extraction and mantissa quantization by no longer needing to apply an offset to the exponents. Signed-off-by: Michael Niedermayer commit 67fc32ac6197a7fe265795d0bf60bf704464394e Author: Justin Ruggles Date: Tue Mar 8 13:18:55 2011 -0500 ac3enc: use MUL64() to multiply fixed-point coefficients Signed-off-by: Michael Niedermayer commit 76d4c1676f6367df2847d59754717fb076d98f43 Author: Benjamin Larsson Date: Tue Mar 8 15:29:46 2011 +0100 Add a dummy option -i to ffplay so that it is easy to switch between ffmpeg -i "file" and ffplay -i "file". Signed-off-by: Michael Niedermayer commit 1a204f07602bca48cfa867db8c9f2037a8c221c7 Author: Stefano Sabatini Date: Mon Mar 7 18:54:52 2011 +0100 framebuffer device demuxer commit f56c4850e7d3903eb31499edb3ef8352905c6cc2 Author: Nathan Caldwell Date: Tue Mar 8 01:22:14 2011 -0700 aacenc: Fix a segfault in search_for_quantizers This reverts the removal of scoefs from AACEncContext. It resulted in scoefs being a NULL pointer when search_for_quantizers() is called. Signed-off-by: Michael Niedermayer commit b543e1dccf66804bab2e03d70ebb4b25b324a511 Author: Anssi Hannula Date: Thu Feb 17 17:26:34 2011 +0200 mpegts: add all stream languages into metadata This is used at least on some older DVB broadcasts for dual-mono audio tracks. Signed-off-by: Ronald S. Bultje (cherry picked from commit 6a7e074eb98c4d45898d7f2920312db6899ee650) commit aa612fbb99f6246913a789afde5a26f70c5a9159 Author: Baptiste Coudurier Date: Fri Mar 4 23:43:02 2011 +0100 In retry_transfer_wrapper, do not check url_interrupt_cb, causes problems when writing and pressing q during encoding. Instead, check url_interrupt_cb at the end. Note that when a protocol is interrupted by url_interrupt_cb, some data may be silently discarded: the protocol context is not suitable for anything anymore. Signed-off-by: Nicolas George Signed-off-by: Ronald S. Bultje (cherry picked from commit 688c22e033a48ebf84fb4b52642bbd40f11e9c4e) commit a2fc93f7005ee97cf17a07caac0f07f0537e2f59 Author: Hendrik Leppkes Date: Sun Feb 20 02:38:23 2011 +0100 Flag DVB subtitles for the hard hearing appropriately using their component_type id. This is based on the component_type definition in the DVB SI spec [1]. [1]: http://www.dvb.org/technology/standards/a038_DVB-SI_dEN300468v1.12.1.pdf Signed-off-by: Ronald S. Bultje (cherry picked from commit 789936dbbda60990220b80769ed75702775ea0b2) commit 70b5906315c2b1f85272d3c529d695371b8fda0c Author: Anssi Hannula Date: Thu Feb 17 17:26:35 2011 +0200 mpegtsenc: handle multiple language tags per stream Signed-off-by: Ronald S. Bultje (cherry picked from commit 435cebd01560691e9322bdb0aa5af5b2bc76c3f8) commit 750fbbc249f47fc775040e4b0f06176782850c0d Author: Ronald S. Bultje Date: Mon Mar 7 13:18:57 2011 -0500 reindent. (cherry picked from commit 4e84f994d3c17f6786fbd4f6463a168fbaaaf477) commit f8bc86d47e8997b9e78e26a90f3884ffe9b55f5e Author: Anton Khirnov Date: Sun Mar 6 20:08:30 2011 +0100 avio: move ff_rewind_with_probe_data from avio.h to avio_internal.h also change its prefix to ffio Signed-off-by: Ronald S. Bultje (cherry picked from commit f1ef2cd9ed22be231bb4da8d2f93d9a0c7877aa7) commit 718975aa111bc41deac0d432a7749d0aee6ef7a0 Author: Anton Khirnov Date: Sun Mar 6 18:04:49 2011 +0100 avio: deprecate url_fget_max_packet_size AVIOContext.max_packet_size should be used directly instead. Signed-off-by: Ronald S. Bultje (cherry picked from commit e8bb2e24398ec838d9e49cf115b7e132609a9fb7) commit 5e06b02005265d8c862e7c6ee3c6f1d0a5bd8c4d Author: Young Han Lee Date: Fri Feb 18 09:33:11 2011 +0900 aacenc: remove the data arrays Signed-off-by: Ronald S. Bultje (cherry picked from commit 2790d7a9ffbd51f33e5367a31ace5c44c30401a1) commit c0fd48a7021922a0c4072a6bafe00f4ae6316e02 Author: Anssi Hannula Date: Mon Feb 28 20:30:03 2011 +0200 lavf: document the use of multiple entries in language metadata tag Signed-off-by: Ronald S. Bultje (cherry picked from commit c92562467e8900fc727d03499afb571a9363c20c) commit 08d804ab6aa492fd44ce7283a87fb2b6df3e1ad8 Author: Thadeu Lima de Souza Cascardo Date: Tue Mar 1 09:46:12 2011 -0300 aac_latm_dec: use aac context and aac m4ac When decoding latm config, use the corresponding aac context and its m4ac instead of using NULL and a local variable. This fixes decoding of audio in MPEG TS from SBTVD (the Brazillian Digital TV Sytem), when there is no extradata. This is the case when using the decoder with gst-ffmpeg and a GStreamer mpegts demuxer. Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Ronald S. Bultje (cherry picked from commit 36864ac3540445c513484017aa9927e942fac24a) commit e95f3363d83ea5a4ccec66525d7ba76ed843467e Author: Justin Ruggles Date: Fri Mar 4 12:12:01 2011 -0500 ac3enc: add some assertions (cherry picked from commit 2d9a101a1f5e102d9538de827d9e4a2e8cf17c89) commit e8a0c465bcd61875758c471a74ba9d678f04eca2 Author: Justin Ruggles Date: Fri Mar 4 12:11:03 2011 -0500 ac3enc: use av_assert2() instead of assert() to make debugging easier. (cherry picked from commit 7100d63ca5edfc2e11c68201fb70d61a08a020cb) commit 539244eeb62bc52bc4991a9d0fc4e9b18934f94c Author: Justin Ruggles Date: Fri Mar 4 22:51:51 2011 -0500 cosmetics: rename ff_fmt_convert_init_ppc() to ff_fmt_convert_init_altivec(). It only has Altivec functions and is not compiled if Altivec is disabled. (cherry picked from commit d21be5f15bec15933cb6360aa0159961d987f449) commit 21527d52f631cd06b16668744fb93955e145f8c9 Author: Peter Ross Date: Sun Mar 6 22:05:04 2011 +1100 Add audio codec 0x1600 (ADTS AAC) Signed-off-by: Ronald S. Bultje (cherry picked from commit d34ca1cfe3182c1cb185c31e6b1bb64f40de0e92) commit db44ea960d9b692e9683fffb13656a47d4166ac3 Author: Anton Khirnov Date: Fri Mar 4 19:57:36 2011 +0100 avio: avio_ prefix for url_fsize Signed-off-by: Ronald S. Bultje (cherry picked from commit 76aa876e69cf78a40821e66dec0a1006e4eb23ec) commit 1447dc59de9f179a99a91ca9a9d210d918b90486 Author: Anton Khirnov Date: Sun Mar 6 19:59:29 2011 +0100 avio: deprecate url_fgetc and remove all it uses Signed-off-by: Ronald S. Bultje (cherry picked from commit e51975392d85e72801193123945a35fb5221248f) commit de3ef79250f39f04fb194e808933509dc4a7f397 Author: Anton Khirnov Date: Sun Mar 6 18:04:46 2011 +0100 avio: deprecate url_fgets It's not used anywhere and doesn't look ver useful to be public. Signed-off-by: Ronald S. Bultje (cherry picked from commit 655e45e7dfafc494044cc52f8889fc6da75eff6a) commit e4a2695856dad2333376739a2dca23da82dc2aa6 Author: Sean McGovern Date: Thu Mar 3 22:22:43 2011 -0500 h264_mp3toannexb_bsg: don't crash, but warn, if PPS/SPS not found. Should an AVC-1 in MP4 stream not contain SPS or PPS NAL units, this BSF is then unable to allocate an output buffer for the modified stream. Warn that the resulting stream may be unplayable. Fix roundup issue #2386. Signed-off-by: Ronald S. Bultje (cherry picked from commit 02dd3666c2944a3db44ba13916ba40dbdd41f9b1) commit fb8d710fa976828d99496c8a9ac1790627adb4ad Author: Martin Storsjö Date: Thu Jul 22 10:30:15 2010 +0300 Add Apple HTTP Live Streaming protocol handler Signed-off-by: Luca Barbato (cherry picked from commit f4f4e12c0d4e86c4900481b7dca94d22e733c14a) commit de0bddea29b1a615e37f21ff882007f57021a383 Author: Martin Storsjö Date: Mon Feb 28 15:39:36 2011 +0200 URLProtocol: Add URL_PROTOCOL_FLAG_NESTED_SCHEME If this flag is set, the protocol can handle URLs where the scheme is a nested scheme such as applehttp+file: - the protocol can handle any URL where the first segment of the nested scheme belongs to this protocol. Signed-off-by: Luca Barbato (cherry picked from commit 8f73c060773156cbf48e153506a38bcb6e2c4c6d) commit 0ea285dd226df9c7814211fca1fd126dbe478d0b Author: Martin Storsjö Date: Mon Feb 28 15:39:17 2011 +0200 URLProtocol: Add a flags field Signed-off-by: Luca Barbato (cherry picked from commit f3bea9915fdc87c3f5b635fcfe0250a28e2b1a88) commit 49e617f9565b6528fe707bae7ea4b62b10c771a5 Author: Mans Rullgard Date: Thu Feb 24 21:25:53 2011 +0000 yadif: add parens around macro parameters This fixes compilation with preprocessors which do not add whitespace around replaced tokens, resulting in invalid expressions like 1--1. Signed-off-by: Mans Rullgard commit ac533ac458b8c75ac68372b34d0ce7c150684585 Author: Carl Eugen Hoyos Date: Mon Mar 7 23:18:36 2011 +0100 Do not loop endlessly if id3v2 tag size is negative / too large. Fixes the sample from issue 2649. commit 2a8175ff9cb7988333b8c3a8a9fec1fa9b60b719 Author: Carl Eugen Hoyos Date: Mon Mar 7 23:15:32 2011 +0100 Change filesize to int64_t. commit f8fab7499666e4d157919b7190d916db9f94a665 Author: Carl Eugen Hoyos Date: Mon Mar 7 10:24:37 2011 +0100 Seek back to old position after reading id3v1 tag. FFmpeg did not seek back to the original position, but to "0", making reading a VBR tag impossible. (issue 2645) commit 66e5b1df360a28b083bc9ec5a76e7add5f40ce1f Author: Anton Khirnov Date: Mon Mar 7 21:50:25 2011 +0100 avio: deprecate url_feof AVIOContext.eof_reached should be used directly instead. Signed-off-by: Ronald S. Bultje commit 6a7e074eb98c4d45898d7f2920312db6899ee650 Author: Anssi Hannula Date: Thu Feb 17 17:26:34 2011 +0200 mpegts: add all stream languages into metadata This is used at least on some older DVB broadcasts for dual-mono audio tracks. Signed-off-by: Ronald S. Bultje commit 688c22e033a48ebf84fb4b52642bbd40f11e9c4e Author: Baptiste Coudurier Date: Fri Mar 4 23:43:02 2011 +0100 In retry_transfer_wrapper, do not check url_interrupt_cb, causes problems when writing and pressing q during encoding. Instead, check url_interrupt_cb at the end. Note that when a protocol is interrupted by url_interrupt_cb, some data may be silently discarded: the protocol context is not suitable for anything anymore. Signed-off-by: Nicolas George Signed-off-by: Ronald S. Bultje commit 789936dbbda60990220b80769ed75702775ea0b2 Author: Hendrik Leppkes Date: Sun Feb 20 02:38:23 2011 +0100 Flag DVB subtitles for the hard hearing appropriately using their component_type id. This is based on the component_type definition in the DVB SI spec [1]. [1]: http://www.dvb.org/technology/standards/a038_DVB-SI_dEN300468v1.12.1.pdf Signed-off-by: Ronald S. Bultje commit 435cebd01560691e9322bdb0aa5af5b2bc76c3f8 Author: Anssi Hannula Date: Thu Feb 17 17:26:35 2011 +0200 mpegtsenc: handle multiple language tags per stream Signed-off-by: Ronald S. Bultje commit 89e568feeca69b1e4b975d0b26aeafbe72fd5418 Author: Anssi Hannula Date: Mon Feb 14 19:14:53 2011 +0200 lavf: update documentation of AVOutputFormat.flags Signed-off-by: Ronald S. Bultje commit 4e84f994d3c17f6786fbd4f6463a168fbaaaf477 Author: Ronald S. Bultje Date: Mon Mar 7 13:18:57 2011 -0500 reindent. commit f1ef2cd9ed22be231bb4da8d2f93d9a0c7877aa7 Author: Anton Khirnov Date: Sun Mar 6 20:08:30 2011 +0100 avio: move ff_rewind_with_probe_data from avio.h to avio_internal.h also change its prefix to ffio Signed-off-by: Ronald S. Bultje commit e8bb2e24398ec838d9e49cf115b7e132609a9fb7 Author: Anton Khirnov Date: Sun Mar 6 18:04:49 2011 +0100 avio: deprecate url_fget_max_packet_size AVIOContext.max_packet_size should be used directly instead. Signed-off-by: Ronald S. Bultje commit 2790d7a9ffbd51f33e5367a31ace5c44c30401a1 Author: Young Han Lee Date: Fri Feb 18 09:33:11 2011 +0900 aacenc: remove the data arrays Signed-off-by: Ronald S. Bultje commit c92562467e8900fc727d03499afb571a9363c20c Author: Anssi Hannula Date: Mon Feb 28 20:30:03 2011 +0200 lavf: document the use of multiple entries in language metadata tag Signed-off-by: Ronald S. Bultje commit 36864ac3540445c513484017aa9927e942fac24a Author: Thadeu Lima de Souza Cascardo Date: Tue Mar 1 09:46:12 2011 -0300 aac_latm_dec: use aac context and aac m4ac When decoding latm config, use the corresponding aac context and its m4ac instead of using NULL and a local variable. This fixes decoding of audio in MPEG TS from SBTVD (the Brazillian Digital TV Sytem), when there is no extradata. This is the case when using the decoder with gst-ffmpeg and a GStreamer mpegts demuxer. Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Ronald S. Bultje commit 8993b5969ad1106df28f1128ed2fb2a18ba39989 Author: Michael Niedermayer Date: Mon Mar 7 17:25:38 2011 +0100 Make sure the first q press doesnt f*ck up the protocols and thus written files. Signed-off-by: Michael Niedermayer commit 90552407613d06d1c0f5a196e1d5844eeb98ce65 Author: Michael Niedermayer Date: Mon Mar 7 17:23:32 2011 +0100 Fix seting of decode_interrupt_cb() Signed-off-by: Michael Niedermayer commit 2d9a101a1f5e102d9538de827d9e4a2e8cf17c89 Author: Justin Ruggles Date: Fri Mar 4 12:12:01 2011 -0500 ac3enc: add some assertions commit 7100d63ca5edfc2e11c68201fb70d61a08a020cb Author: Justin Ruggles Date: Fri Mar 4 12:11:03 2011 -0500 ac3enc: use av_assert2() instead of assert() to make debugging easier. commit d21be5f15bec15933cb6360aa0159961d987f449 Author: Justin Ruggles Date: Fri Mar 4 22:51:51 2011 -0500 cosmetics: rename ff_fmt_convert_init_ppc() to ff_fmt_convert_init_altivec(). It only has Altivec functions and is not compiled if Altivec is disabled. commit 159683ddec69bb4faadfc53de8e1d357e1abbbad Author: Carl Eugen Hoyos Date: Fri Mar 4 22:05:16 2011 -0500 Fix compilation on powerpc with --disable-altivec. commit d34ca1cfe3182c1cb185c31e6b1bb64f40de0e92 Author: Peter Ross Date: Sun Mar 6 22:05:04 2011 +1100 Add audio codec 0x1600 (ADTS AAC) Signed-off-by: Ronald S. Bultje commit 76aa876e69cf78a40821e66dec0a1006e4eb23ec Author: Anton Khirnov Date: Fri Mar 4 19:57:36 2011 +0100 avio: avio_ prefix for url_fsize Signed-off-by: Ronald S. Bultje commit e51975392d85e72801193123945a35fb5221248f Author: Anton Khirnov Date: Sun Mar 6 19:59:29 2011 +0100 avio: deprecate url_fgetc and remove all it uses Signed-off-by: Ronald S. Bultje commit 655e45e7dfafc494044cc52f8889fc6da75eff6a Author: Anton Khirnov Date: Sun Mar 6 18:04:46 2011 +0100 avio: deprecate url_fgets It's not used anywhere and doesn't look ver useful to be public. Signed-off-by: Ronald S. Bultje commit 2af07d36fc0e9f7e10e07b6336748a73ae2e2909 Author: Peter Ross Date: Thu Mar 3 22:37:05 2011 +1100 avio: add avio_skip macro This is a substitute for the url_fskip function that was deprecated by commit 0300db8ad778a194b4a8ec98f6da3de5b41c46ee. avio_fskip is provided to improve demuxer code readability. It distinguishes the act of skipping over unknown or irrelevant bytes from the standard avio_seek operation. Signed-off-by: Ronald S. Bultje commit 02dd3666c2944a3db44ba13916ba40dbdd41f9b1 Author: Sean McGovern Date: Thu Mar 3 22:22:43 2011 -0500 h264_mp3toannexb_bsg: don't crash, but warn, if PPS/SPS not found. Should an AVC-1 in MP4 stream not contain SPS or PPS NAL units, this BSF is then unable to allocate an output buffer for the modified stream. Warn that the resulting stream may be unplayable. Fix roundup issue #2386. Signed-off-by: Ronald S. Bultje commit f4f4e12c0d4e86c4900481b7dca94d22e733c14a Author: Martin Storsjö Date: Thu Jul 22 10:30:15 2010 +0300 Add Apple HTTP Live Streaming protocol handler Signed-off-by: Luca Barbato commit 8f73c060773156cbf48e153506a38bcb6e2c4c6d Author: Martin Storsjö Date: Mon Feb 28 15:39:36 2011 +0200 URLProtocol: Add URL_PROTOCOL_FLAG_NESTED_SCHEME If this flag is set, the protocol can handle URLs where the scheme is a nested scheme such as applehttp+file: - the protocol can handle any URL where the first segment of the nested scheme belongs to this protocol. Signed-off-by: Luca Barbato commit f3bea9915fdc87c3f5b635fcfe0250a28e2b1a88 Author: Martin Storsjö Date: Mon Feb 28 15:39:17 2011 +0200 URLProtocol: Add a flags field Signed-off-by: Luca Barbato commit 4118d66cb39f96a227c2f90d325a73045afe091e Author: Michael Niedermayer Date: Sun Mar 6 02:10:26 2011 +0100 Revert "lavf: deprecate get_strz() in favor of avio_get_str" This API is simply ridiculous. We of course keep API/ABI compatibility only useage of the worse API is reverted. This reverts commit 773947ba76c575abc01ba128206c87440dad40ec. commit 391a1327bd076c25c2b2509ab7ae0081c443b94e Author: Mans Rullgard Date: Thu Feb 24 21:25:53 2011 +0000 yadif: add parens around macro parameters This fixes compilation with preprocessors which do not add whitespace around replaced tokens, resulting in invalid expressions like 1--1. Signed-off-by: Mans Rullgard commit b09e5068203bb9852734c04e37f852dd4d1d1137 Author: Reimar Döffinger Date: Sat Feb 26 12:52:01 2011 +0100 Make matroska demuxer also set timestamps for RealAudio packets. Improves seeking in ffplay with http://samples.mplayerhq.hu/Matroska/RA_missing_timestamps.mkv commit 5e7950249397bcf850ef41134525895fe83dbd67 Author: Justin Ruggles Date: Fri Mar 4 16:41:49 2011 -0500 ac3enc: add num_rematrixing_bands to AC3EncodeContext and use it instead of the hardcoded value. Currently it is always 4, but this change will allow it to be adjusted when bandwidth-related features are added such as channel coupling, enhanced channel coupling, and spectral extension. (cherry picked from commit 53e35fd340d75c40395e4446b76a72bb1962899b) commit 12dffc45026b8f0f44fceb39069509c7376f5cc8 Author: Justin Ruggles Date: Fri Mar 4 16:25:17 2011 -0500 ac3: define AC3_MAX_CPL_BANDS and use it in ac3dec.h (cherry picked from commit b35743ffb46558be3a90c44f24a7de5fa2c15d85) commit 384c9c2fa79f2f09ed4a5aa4c14ba3ffc6bdc790 Author: Anton Khirnov Date: Thu Mar 3 20:11:45 2011 +0100 avio: add avio_tell macro as a replacement for url_ftell Signed-off-by: Ronald S. Bultje (cherry picked from commit a2704c9712ad35cc22e7e0d8a79b581c07fa383b) commit 773947ba76c575abc01ba128206c87440dad40ec Author: Anton Khirnov Date: Wed Mar 2 17:48:45 2011 +0100 lavf: deprecate get_strz() in favor of avio_get_str Signed-off-by: Ronald S. Bultje (cherry picked from commit e16ead0716c2f988d1e26369a4c67b354ff86134) commit 3e1a8e1ec1897086f063667480ec1a0eafd03392 Author: Reimar Döffinger Date: Thu Mar 3 13:51:55 2011 +0100 avio: add avio_get_str() Signed-off-by: Ronald S. Bultje (cherry picked from commit 41d8555f72e3bc60cf93af2a1a4786b452fd2736) commit a960576f20534589cc911395e71f6ee89255426f Author: Ronald S. Bultje Date: Fri Mar 4 08:33:49 2011 -0500 avio: fix fourcc if any character is >=0x80. Fixes issue 2638. (cherry picked from commit fd085bc08203979c6d0e8a6ab031c7e19b57f7a1) commit 53e35fd340d75c40395e4446b76a72bb1962899b Author: Justin Ruggles Date: Fri Mar 4 16:41:49 2011 -0500 ac3enc: add num_rematrixing_bands to AC3EncodeContext and use it instead of the hardcoded value. Currently it is always 4, but this change will allow it to be adjusted when bandwidth-related features are added such as channel coupling, enhanced channel coupling, and spectral extension. commit b35743ffb46558be3a90c44f24a7de5fa2c15d85 Author: Justin Ruggles Date: Fri Mar 4 16:25:17 2011 -0500 ac3: define AC3_MAX_CPL_BANDS and use it in ac3dec.h commit 7f1b1f3d7426332e2d9bb4cd828fec7f738704ce Author: Carl Eugen Hoyos Date: Fri Mar 4 20:30:40 2011 +0100 Fix compilation on powerpc with --disable-altivec. commit a2704c9712ad35cc22e7e0d8a79b581c07fa383b Author: Anton Khirnov Date: Thu Mar 3 20:11:45 2011 +0100 avio: add avio_tell macro as a replacement for url_ftell Signed-off-by: Ronald S. Bultje commit e16ead0716c2f988d1e26369a4c67b354ff86134 Author: Anton Khirnov Date: Wed Mar 2 17:48:45 2011 +0100 lavf: deprecate get_strz() in favor of avio_get_str Signed-off-by: Ronald S. Bultje commit 41d8555f72e3bc60cf93af2a1a4786b452fd2736 Author: Reimar Döffinger Date: Thu Mar 3 13:51:55 2011 +0100 avio: add avio_get_str() Signed-off-by: Ronald S. Bultje commit fd085bc08203979c6d0e8a6ab031c7e19b57f7a1 Author: Ronald S. Bultje Date: Fri Mar 4 08:33:49 2011 -0500 avio: fix fourcc if any character is >=0x80. Fixes issue 2638. commit 08c866345cfe15cd17406e93c54a52068e41eb9e Author: Baptiste Coudurier Date: Thu Mar 3 19:33:44 2011 -0800 In retry_transfer_wrapper, do not check url_interrupt_cb, causes problems when writing and pressing q during encoding. commit ad82bf9ce0de510f758d08f8c396dcd0460df8fd Author: Michael Niedermayer Date: Fri Mar 4 04:24:16 2011 +0100 Move guess_correct_pts() under got_picture_ptr. commit 3088635a44853f32852bf53980731f3d523d8a54 Author: Michael Niedermayer Date: Thu Mar 3 14:06:58 2011 +0100 h263dec: produce a warning when excessive bitstream is discarded Signed-off-by: Michael Niedermayer commit f28e599fbc853938b1cd0ef0aa7d01b9c06b7e9c Author: Ronald S. Bultje Date: Wed Mar 2 12:15:07 2011 -0500 vp3-mt: fix deadlock when first frame is not a keyframe. (cherry picked from commit 8cf9a09d407c42299b3203bd1eb42af6109a0d7a) commit 5cdef40a789822c7d859cd756e781b91893f2c0d Author: Mans Rullgard Date: Wed Mar 2 13:08:15 2011 +0000 threads: allow thread count of zero This moves setting the thread count to a minimum of 1 to frame_thread_init(), allowing a value of zero to propagate through to the codec if frame threading is not used. This makes auto-threads work in libx264. Signed-off-by: Mans Rullgard (cherry picked from commit ff1efc524cb3c60f2f746e3b4550bb1a86c65316) commit 4778b4dd77643267639d824ea33964ee7a98439d Author: Baptiste Coudurier Date: Wed Mar 2 11:17:33 2011 +0000 vc1: fix decoding when end sequence is present Signed-off-by: Mans Rullgard (cherry picked from commit fb985071263e6b3daff1c3d987df482b0146c2a0) commit d34ffd3ce9607bd342f69ef8eab829f90c8923ae Author: Martin Storsjö Date: Thu Feb 24 10:08:07 2011 +0200 ffmpeg: Use av_pkt_dump_log2 This makes dumped packet timestamps proper for streams with timebases other than AV_TIME_BASE. Signed-off-by: Luca Barbato (cherry picked from commit 5e33e7bdac70a4b70e31f4ae6f0344060346d0b8) commit 08ad81cbffd6c2a433fae891d42d6cf332faa7e3 Author: Martin Storsjö Date: Thu Feb 24 10:08:06 2011 +0200 libavformat: Add av_pkt_dump{, _log}2, taking an AVStream parameter This removes a fixme issue, by allowing the av_pkt_dump functions to use the correct time base. Signed-off-by: Luca Barbato (cherry picked from commit 863c471638fa667e6e5c5df059b67af263e1cd40) commit 62d0a7453af12e9e7880dd08d4dafe20374625c1 Author: Martin Storsjö Date: Sun Feb 27 01:02:32 2011 +0200 aviobuf: Write new data at s->buf_end in fill_buffer In most cases, s->buf_ptr will be equal to s->buf_end when fill_buffer is called, but this may not always be the case, if we're seeking forward by reading (permitted by the short seek threshold). If fill_buffer is writing to s->buf_ptr instead of s->buf_end (when they aren't equal and s->buf_ptr is ahead of s->buffer), the data between s->buf_ptr and s->buf_end is overwritten, leading to inconsistent buffer content. This could return incorrect data if later seeking back into the area before the current s->buf_ptr. Signed-off-by: Luca Barbato (cherry picked from commit e360ada2d13af36ab7afd9ebcd2bd236d23d9b96) commit cd37308b7774db3fd52ae079844ab0ac8e31fb7d Author: Baptiste Coudurier Date: Tue Mar 1 23:54:29 2011 +0000 movenc: use correct tag for dvcpro hd Signed-off-by: Mans Rullgard (cherry picked from commit 06ed4873e6e6aed8ec7cc24285d610ef4060880e) commit 176e176288ef597852072c2c01c5b4b5520aaba1 Author: Baptiste Coudurier Date: Tue Mar 1 23:50:25 2011 +0000 dnxhd: allow encoding with Avid Nitris compatibility. Signed-off-by: Mans Rullgard (cherry picked from commit 99bbc781e9c134066887fc521db7a9d3607e3de1) commit 5bb50c71a37e9e258e0c1053d837cf328d153138 Author: Baptiste Coudurier Date: Tue Mar 1 23:36:48 2011 +0000 movenc: fix tkhd height for imx Signed-off-by: Mans Rullgard (cherry picked from commit fffdee89cc0712ed3324bae1f86e271a36c02822) commit 813cc7abafad646522fbcf24c5ecd00412236381 Author: Anton Khirnov Date: Mon Feb 28 14:57:56 2011 +0100 avio: deprecate url_fskip avio_seek should be used instead Signed-off-by: Ronald S. Bultje (cherry picked from commit 0300db8ad778a194b4a8ec98f6da3de5b41c46ee) commit 74b3f67c9c0a237843a3379391b9929e9bcfcb6e Author: Anton Khirnov Date: Mon Feb 28 14:57:55 2011 +0100 lavf: replace all uses of url_fskip with avio_seek Signed-off-by: Ronald S. Bultje (cherry picked from commit e356fc57a2e9887370caec58d8aafeafd1f336dc) commit f59d8ff8cd75796256344a5c635054427928c62d Author: Anton Khirnov Date: Mon Feb 28 14:57:54 2011 +0100 avio: avio_ prefix for url_fseek Signed-off-by: Ronald S. Bultje (cherry picked from commit 6b4aa5dac8f41aa452d0ce9a1bede9e59a303060) commit e9e9139ceec2b27afaee41ba728996f8cf518d90 Author: Alexander Strange Date: Thu Feb 17 03:44:25 2011 -0500 huffyuv: Add multithreading support Signed-off-by: Ronald S. Bultje (cherry picked from commit 76d8846c4e918749b045ea2ee7399a069af5e4a5) commit 05fa64a7c5191a8fa1d02295d84ff0b6fe842cb8 Author: Alexander Strange Date: Thu Feb 17 03:25:00 2011 -0500 pthreads: Fix bug introduced with thread_safe_callbacks For intra codecs, ff_thread_finish_setup() is called before decoding starts automatically. However, get_buffer can only be used before it's called, so adding this requirement broke frame threading for them. Fixed by moving the call until after get_buffer is finished. Signed-off-by: Ronald S. Bultje (cherry picked from commit ad9791e12b6653a465803062e2543f25916300d3) commit 1b4580d1a2a09856a47a2d4f77ac7facff79baf8 Author: Michael Niedermayer Date: Thu Mar 3 03:37:44 2011 +0100 Fix duplicate & droped frame in Californication.S02E01.HDTV.XviD-NoTV.avi commit d667be2ceaa3a415ac83c819f47e3255d00bfa94 Author: Carl Eugen Hoyos Date: Thu Mar 3 00:25:02 2011 +0100 Attribute used is correctly supported by the Intel C compiler since version 11.1. commit 8cf9a09d407c42299b3203bd1eb42af6109a0d7a Author: Ronald S. Bultje Date: Wed Mar 2 12:15:07 2011 -0500 vp3-mt: fix deadlock when first frame is not a keyframe. commit ff1efc524cb3c60f2f746e3b4550bb1a86c65316 Author: Mans Rullgard Date: Wed Mar 2 13:08:15 2011 +0000 threads: allow thread count of zero This moves setting the thread count to a minimum of 1 to frame_thread_init(), allowing a value of zero to propagate through to the codec if frame threading is not used. This makes auto-threads work in libx264. Signed-off-by: Mans Rullgard commit fb985071263e6b3daff1c3d987df482b0146c2a0 Author: Baptiste Coudurier Date: Wed Mar 2 11:17:33 2011 +0000 vc1: fix decoding when end sequence is present Signed-off-by: Mans Rullgard commit a5b13b1423ec20c40bdf44454c12289a845ef317 Author: Carl Eugen Hoyos Date: Wed Mar 2 13:38:21 2011 +0100 Use macro __INTEL_COMPILER instead of __ICC. __ICC is not supported on all platforms, this is an Intel documentation bug that is supposed to be fixed in a future release. (Intel issue 612289) commit 5e33e7bdac70a4b70e31f4ae6f0344060346d0b8 Author: Martin Storsjö Date: Thu Feb 24 10:08:07 2011 +0200 ffmpeg: Use av_pkt_dump_log2 This makes dumped packet timestamps proper for streams with timebases other than AV_TIME_BASE. Signed-off-by: Luca Barbato commit 863c471638fa667e6e5c5df059b67af263e1cd40 Author: Martin Storsjö Date: Thu Feb 24 10:08:06 2011 +0200 libavformat: Add av_pkt_dump{, _log}2, taking an AVStream parameter This removes a fixme issue, by allowing the av_pkt_dump functions to use the correct time base. Signed-off-by: Luca Barbato commit e360ada2d13af36ab7afd9ebcd2bd236d23d9b96 Author: Martin Storsjö Date: Sun Feb 27 01:02:32 2011 +0200 aviobuf: Write new data at s->buf_end in fill_buffer In most cases, s->buf_ptr will be equal to s->buf_end when fill_buffer is called, but this may not always be the case, if we're seeking forward by reading (permitted by the short seek threshold). If fill_buffer is writing to s->buf_ptr instead of s->buf_end (when they aren't equal and s->buf_ptr is ahead of s->buffer), the data between s->buf_ptr and s->buf_end is overwritten, leading to inconsistent buffer content. This could return incorrect data if later seeking back into the area before the current s->buf_ptr. Signed-off-by: Luca Barbato commit 06ed4873e6e6aed8ec7cc24285d610ef4060880e Author: Baptiste Coudurier Date: Tue Mar 1 23:54:29 2011 +0000 movenc: use correct tag for dvcpro hd Signed-off-by: Mans Rullgard commit 99bbc781e9c134066887fc521db7a9d3607e3de1 Author: Baptiste Coudurier Date: Tue Mar 1 23:50:25 2011 +0000 dnxhd: allow encoding with Avid Nitris compatibility. Signed-off-by: Mans Rullgard commit fffdee89cc0712ed3324bae1f86e271a36c02822 Author: Baptiste Coudurier Date: Tue Mar 1 23:36:48 2011 +0000 movenc: fix tkhd height for imx Signed-off-by: Mans Rullgard commit 0300db8ad778a194b4a8ec98f6da3de5b41c46ee Author: Anton Khirnov Date: Mon Feb 28 14:57:56 2011 +0100 avio: deprecate url_fskip avio_seek should be used instead Signed-off-by: Ronald S. Bultje commit e356fc57a2e9887370caec58d8aafeafd1f336dc Author: Anton Khirnov Date: Mon Feb 28 14:57:55 2011 +0100 lavf: replace all uses of url_fskip with avio_seek Signed-off-by: Ronald S. Bultje commit 6b4aa5dac8f41aa452d0ce9a1bede9e59a303060 Author: Anton Khirnov Date: Mon Feb 28 14:57:54 2011 +0100 avio: avio_ prefix for url_fseek Signed-off-by: Ronald S. Bultje commit 76d8846c4e918749b045ea2ee7399a069af5e4a5 Author: Alexander Strange Date: Thu Feb 17 03:44:25 2011 -0500 huffyuv: Add multithreading support Signed-off-by: Ronald S. Bultje commit ad9791e12b6653a465803062e2543f25916300d3 Author: Alexander Strange Date: Thu Feb 17 03:25:00 2011 -0500 pthreads: Fix bug introduced with thread_safe_callbacks For intra codecs, ff_thread_finish_setup() is called before decoding starts automatically. However, get_buffer can only be used before it's called, so adding this requirement broke frame threading for them. Fixed by moving the call until after get_buffer is finished. Signed-off-by: Ronald S. Bultje commit 42ccd2fcf834db379834d39b4012cbe18152dfe4 Author: Mans Rullgard Date: Sun Feb 27 23:34:38 2011 +0000 Use --sysroot flag for clang Although not documented, clang does support the --sysroot flag, and it does the right thing. Use this flag intead of -isysroot which only applies to header file searches, not the linker. Signed-off-by: Mans Rullgard (cherry picked from commit 00ba041cb396f88f68a1bf7907e7c98ded3760ab) commit 00ba041cb396f88f68a1bf7907e7c98ded3760ab Author: Mans Rullgard Date: Sun Feb 27 23:34:38 2011 +0000 Use --sysroot flag for clang Although not documented, clang does support the --sysroot flag, and it does the right thing. Use this flag intead of -isysroot which only applies to header file searches, not the linker. Signed-off-by: Mans Rullgard commit 65ad2c618ffa83dd589f7d02d2ea9853aa477849 Author: Baptiste Coudurier Date: Sun Feb 27 16:29:21 2011 -0800 In mov muxer, fix adpcm mono muxing, patch by Alex Converse commit 4ea02a9a71865d0e8b31b22e9bb68654c4800951 Author: Baptiste Coudurier Date: Sun Feb 27 16:19:50 2011 -0800 In mpegts demuxer, do not output known sized packet if an unbounded packet is already queued. Fix issue #2624. commit e9634db1dc7ac72b209d37ae78ab173c94632577 Author: Mans Rullgard Date: Sat Feb 26 18:05:53 2011 +0000 ARM: VP8: fix build on systems with global symbol prefix Signed-off-by: Mans Rullgard (cherry picked from commit 0b32da90f893b3e04ead18a546252e241a6a0988) commit cf9c227e58c29a46e6437ac15ae63884d573ec13 Author: Mans Rullgard Date: Sat Feb 26 18:04:53 2011 +0000 ARM: fix vp8 neon with pic enabled The assembler emits literal pools too far from the load instructions, so we must do it explicitly at a suitable location. Signed-off-by: Mans Rullgard (cherry picked from commit 8b454c352f49c2a61db37793d838b553db3da734) commit bbd289aa183556330cb91b7711fdaa4c04a0b56f Author: Reimar Döffinger Date: Sat Feb 26 11:50:35 2011 +0000 configure: document FATE_SAMPLES env var in --help text Signed-off-by: Mans Rullgard (cherry picked from commit 52b3cc6047e2b93e8a798734c65904243c1a7be3) commit 1a9fc2b93be18b4b20310cca23e062133a798426 Author: Mans Rullgard Date: Sat Feb 26 11:51:18 2011 +0000 fate: get samples location from env var if not explicitly set Use the FATE_SAMPLES environment variable if samples location is not set with the --samples configure option or on the make command line. Signed-off-by: Mans Rullgard (cherry picked from commit aa3805a486831d9c9e40cc9e897c048d60b51c1a) commit 0b32da90f893b3e04ead18a546252e241a6a0988 Author: Mans Rullgard Date: Sat Feb 26 18:05:53 2011 +0000 ARM: VP8: fix build on systems with global symbol prefix Signed-off-by: Mans Rullgard commit 8b454c352f49c2a61db37793d838b553db3da734 Author: Mans Rullgard Date: Sat Feb 26 18:04:53 2011 +0000 ARM: fix vp8 neon with pic enabled The assembler emits literal pools too far from the load instructions, so we must do it explicitly at a suitable location. Signed-off-by: Mans Rullgard commit 52b3cc6047e2b93e8a798734c65904243c1a7be3 Author: Reimar Döffinger Date: Sat Feb 26 11:50:35 2011 +0000 configure: document FATE_SAMPLES env var in --help text Signed-off-by: Mans Rullgard commit aa3805a486831d9c9e40cc9e897c048d60b51c1a Author: Mans Rullgard Date: Sat Feb 26 11:51:18 2011 +0000 fate: get samples location from env var if not explicitly set Use the FATE_SAMPLES environment variable if samples location is not set with the --samples configure option or on the make command line. Signed-off-by: Mans Rullgard commit 4e815a8b6070004fc3f4161e3735c35f69538518 Author: Ronald S. Bultje Date: Fri Feb 25 17:41:00 2011 -0500 movenc: remove uses of deprecated API. Replace put_tag() with ffio_wfourcc() and ByteIOContext with AVIOContext. (cherry picked from commit 13ff92d19706d17f876ff676591dace0b3e34794) commit aaa71a3e1df951df2f94845cd56ed1d26a588b58 Author: Maksym Veremeyenko Date: Tue Feb 15 12:44:08 2011 +0200 store pasp atom for all types of quicktime movie Signed-off-by: Luca Barbato (cherry picked from commit d184c86cd309bbd61c5d1a1dfcf60d133da4c1e3) commit eea040212cd2b581e11d0b830f086359b4363203 Author: Maksym Veremeyenko Date: Fri Feb 25 17:42:56 2011 +0200 reindent after tapt patch Signed-off-by: Luca Barbato (cherry picked from commit 77d207cbe64710b7b34865f347e608b9c0e15968) commit 3b2c4ce14024b543e92cc4f86247773f1edf9a86 Author: Maksym Veremeyenko Date: Fri Feb 25 17:41:55 2011 +0200 use tapt atom for sample aspect ratio Signed-off-by: Luca Barbato (cherry picked from commit ea1afa124cb58c7eebd4fd3706434fafb58b00c0) commit c3afa4db913668e50ac8ffc0bc66621664adc1f4 Author: Peter Ross Date: Sun Feb 13 14:37:20 2011 +1100 bink: prevent overflows within binkidct by using int-sized intermediate array Signed-off-by: Ronald S. Bultje (cherry picked from commit e211e255aa399d68239ffa42c9cc7a52eb3d55a9) commit 6a22f82cc64cc080467d52d05abf59d649ba2ac3 Author: Peter Ross Date: Sun Feb 20 13:15:38 2011 +1100 bink: decode audio track identifiers into AVStream.id Signed-off-by: Ronald S. Bultje (cherry picked from commit 588a3ffd9687cbef60cc26d5b3a247b8ecdbf75b) commit 4913af0cd35917d3173f99e1b214415673869889 Author: Peter Ross Date: Sun Feb 20 12:25:05 2011 +1100 Bink version 'b' audio decoder Signed-off-by: Ronald S. Bultje (cherry picked from commit ccfcddb3f287545a20831f266c2a2f734d6a9f31) commit 8d09fc1930aa3dddb7af8241835416c92e7c886b Author: Peter Ross Date: Sun Feb 20 12:24:48 2011 +1100 binkaudio: simplify frame_len_bits and frame_len calculation Signed-off-by: Ronald S. Bultje (cherry picked from commit 8a8c283edd0da5863eb729a31a94b70820400941) commit 408ee5a90c4accae5f2dd522c8868a7a2056fa9a Author: Peter Ross Date: Sun Feb 20 12:24:38 2011 +1100 binkaudio: remove unnecessary loop decode_init sets bands[0] == 2, so this loop always sets the band table index (k) to zero. Signed-off-by: Ronald S. Bultje (cherry picked from commit a304def1dca50d63bf2a39651f84792980db3508) commit 23d82139d2248fcc90c7bb324457629226b0a9ed Author: Peter Ross Date: Sun Feb 20 12:24:25 2011 +1100 binkaudio: perform band table scaling in decode_init Signed-off-by: Ronald S. Bultje (cherry picked from commit 582ac86d19c61ad73c2e1a2d5ed54a5fe1e20bd1) commit 777b365c8b39666856a5c4a7842f1c72f0b69d73 Author: Peter Ross Date: Sun Feb 20 12:24:09 2011 +1100 bink: set audio stream codec_tag such that binkaudio decoder can identify bitstream version Signed-off-by: Ronald S. Bultje (cherry picked from commit f0ca29eb5f476a281c8066214e3745244656d417) commit 22c679d3db3802f0de64d93603eee887b5ffb4c1 Author: Mans Rullgard Date: Fri Feb 25 14:52:23 2011 +0000 bink: use LOCAL_ALIGNED for aligned stack data Signed-off-by: Mans Rullgard (cherry picked from commit 8997bb8807336dd6d6c96364952bb71c161ac3b2) commit a63ba97384e7ef9487b887fabc52794181c861d9 Author: Kyle Date: Sat Feb 19 00:42:11 2011 +0000 dxva2: define required feature selection macros Signed-off-by: Mans Rullgard (cherry picked from commit 04973f8082c5a822112d2e42d535b7f3f59dccc0) commit f183cfeb99cd76178070a019a9bcef4342b8b1f9 Author: Dave Yeo Date: Fri Feb 25 04:19:32 2011 +0000 OS/2: lxlite should use stdout This causes lxlite to use stdout instead of vioXXX functions. This improves fate and build logs readability. Affects OS/2 only. Signed-off-by: Mans Rullgard (cherry picked from commit cc4e9d2a24a9ca79d4e912df21053426411aa14b) commit 3308ddfb368d9011618c4f3b74d6bf3c30153900 Author: Anton Khirnov Date: Thu Feb 24 07:36:05 2011 +0100 avio: deprecate put_tag it's not used internally anymore and shouldn't be public. Signed-off-by: Ronald S. Bultje (cherry picked from commit 61840b43607679e8c4a1a63f005770f69dda12fa) commit a1b797926179071841b0d01c6befd8d2e2ebe8e6 Author: Anton Khirnov Date: Thu Feb 24 07:36:04 2011 +0100 lavf: replace remaining uses of put_tag with avio_write Signed-off-by: Ronald S. Bultje (cherry picked from commit bbc413f943b53d96aa85fe272ec413c85794019f) commit eac4e4d9a59a146a6c8c1e0cf31472624b79274e Author: Anton Khirnov Date: Thu Feb 24 07:36:03 2011 +0100 avienc: replace &tag[0] with tag. Signed-off-by: Ronald S. Bultje (cherry picked from commit 99f42c27abfe916fa19ac0c18489c8bbf8525406) commit 324429309ee3090b4a08b04ab50be76751a16dbd Author: Anton Khirnov Date: Thu Feb 24 07:36:02 2011 +0100 lavf: use a new ffio_wfourcc macro instead of put_tag() where possible Signed-off-by: Ronald S. Bultje (cherry picked from commit 0abdb2931719d96dee725e555e9b46b2b2f8a6be) commit 853daff68210e4c2bf72afa2f757f89146e5d8c2 Author: Anssi Hannula Date: Fri Feb 18 19:49:44 2011 +0000 dca: use EXT_AUDIO_ID field to determine core extensions This avoids the core substream extensions scan when the EXT_AUDIO_ID field indicates no extensions or only unsupported extensions. The scan is done only if the value of EXT_AUDIO_ID is unknown or indicates a present XCh extension which we can decode. Signed-off-by: Mans Rullgard (cherry picked from commit 7e06e0ede3b798f591634b277e8dfa6507b196de) commit 1e898e7d35ccb3020da7c58d030e369cb65f3ed3 Author: Justin Ruggles Date: Wed Feb 23 13:11:13 2011 -0500 vmdaudio: output 8-bit audio as AV_SAMPLE_FMT_U8. There is no need to expand to 16-bits. Just use memcpy() to copy the raw data. Signed-off-by: Ronald S. Bultje (cherry picked from commit 1108f8998c6536bb44d6ecbe5adfa18e0c1478e8) commit f3618b014b89aa757f9206507b86056c342f6da3 Author: Justin Ruggles Date: Wed Feb 23 13:11:12 2011 -0500 vmdaudio: remove unnecessary fields from VmdAudioContext and use the corresponding AVCodecContext fields instead. Signed-off-by: Ronald S. Bultje (cherry picked from commit 2ec7862db8b782020cc220dae827c3438d108b3a) commit 5e7c422dda9bf2212f112881f402f3f1810cd82e Author: Justin Ruggles Date: Wed Feb 23 13:11:11 2011 -0500 vmdaudio: add out_bps to VmdAudioContext and use it to replace hard-coded sample size. Signed-off-by: Ronald S. Bultje (cherry picked from commit 1e86d685e0935077766c645e49b8533d41ca11cb) commit 504dff8e4ec7e282bed5bf1f31d5ede765643d3e Author: Justin Ruggles Date: Wed Feb 23 13:11:10 2011 -0500 vmdaudio: simplify vmdaudio_decode_frame() by handling block_type first, then making a single call to vmdaudio_loadsound(). This also adds output buffer size checks for AUDIO and SILENCE block types. Signed-off-by: Ronald S. Bultje (cherry picked from commit 1574eff3d23ad799d25454a449b01f94795495ea) commit 83e94d50cbc55f8185fef98aebd2781525b8e3c5 Author: Justin Ruggles Date: Wed Feb 23 13:11:09 2011 -0500 cosmetics: reindent after previous commit Signed-off-by: Ronald S. Bultje (cherry picked from commit ba9516cca845f8d3fb7ac08ef53a996c3ee0dbf5) commit fb0e3c2b9696c7adc71db872f847a4d6497b5eed Author: Justin Ruggles Date: Wed Feb 23 13:11:08 2011 -0500 vmdaudio: move all silence chunk handling to vmdaudio_loadsound(). Signed-off-by: Ronald S. Bultje (cherry picked from commit 762b386e4aafc7bbdbec367bc652cf1199e81f51) commit 6f3c837f40a672cbf9805b0d6af41fa654072dea Author: Justin Ruggles Date: Wed Feb 23 13:11:01 2011 -0500 cosmetics: remove debugging cruft Signed-off-by: Ronald S. Bultje (cherry picked from commit 8e9027d266ef39ab9f88b4bbad5cf9e425d0696c) commit 684512e16df647a8b526534cbf6c56556a651887 Author: Justin Ruggles Date: Wed Feb 23 13:11:00 2011 -0500 cosmetics: reindent after previous commit Signed-off-by: Ronald S. Bultje (cherry picked from commit 868f2f4d90e07edd9a65bd9b917bb5940643ec75) commit aa23625037322258c7583ddbd47196553a73dc1e Author: Justin Ruggles Date: Wed Feb 23 13:11:07 2011 -0500 vmdaudio: simplify buffer pointer and header size handling. Signed-off-by: Ronald S. Bultje (cherry picked from commit 2d213695fce86e740800ddcf43d8d0864d2ecea5) commit b4b5e92286bcb16d74520aab6a78e5696ebe6ef1 Author: Justin Ruggles Date: Wed Feb 23 13:11:06 2011 -0500 vmdaudio: set *data_size to zero when skipping small packets and add a warning log message. Signed-off-by: Ronald S. Bultje (cherry picked from commit 7a4fb3fd9357dfdd27431a0a8d7250dab54a9938) commit ebed7b6865761d0d903757c5121ca2dbfba055dd Author: Justin Ruggles Date: Wed Feb 23 13:11:05 2011 -0500 vmdaudio: validate block type Signed-off-by: Ronald S. Bultje (cherry picked from commit 22f893e1c9f9387f0a021f775757130fa48e0180) commit 149d36877a000ed779812552fd245049cccc1927 Author: Justin Ruggles Date: Wed Feb 23 13:11:04 2011 -0500 vmdaudio: use macros and a local variable for block type. Signed-off-by: Ronald S. Bultje (cherry picked from commit dd1af5136fe7767f2f18ac943efe994946864640) commit 2be17a71ae1be0cdd8e7f50470f863dcb596c916 Author: Justin Ruggles Date: Wed Feb 23 13:11:03 2011 -0500 vmdaudio: correct the silent chunk count in the first block. This fixes A/V sync with several samples, notably: http://samples.mplayerhq.hu/game-formats/sierra-vmd/swat_*.vmd Signed-off-by: Ronald S. Bultje (cherry picked from commit 6989cb2dae85ea455ffcc8a36a763134fb311e29) commit c11c79222e2d8d1799e768b156808cae90c8d692 Author: Justin Ruggles Date: Wed Feb 23 13:11:02 2011 -0500 vmdaudio: output audio samples for standalone silent blocks. Signed-off-by: Ronald S. Bultje (cherry picked from commit 9b73f786005f31429d7c88092edfeef6696a5f69) commit 2ac19b75c0d25f15d33a4f7905be50c7ebbd67fe Author: Justin Ruggles Date: Wed Feb 23 13:10:59 2011 -0500 vmdaudio: remove duplicated code by merging mono and stereo decoding. Signed-off-by: Ronald S. Bultje (cherry picked from commit 1328d433137c055df06f99772b243ceec2bbf36e) commit 994e445a17303abcc87b487e4abea54e505fe618 Author: Justin Ruggles Date: Wed Feb 23 13:10:58 2011 -0500 vmdaudio: fix raw_block_size calculation. The size should depend on the output sample size, not the internal bit depth. Signed-off-by: Ronald S. Bultje (cherry picked from commit a58bcb40b164b92957db73e702465808a9180126) commit 13ff92d19706d17f876ff676591dace0b3e34794 Author: Ronald S. Bultje Date: Fri Feb 25 17:41:00 2011 -0500 movenc: remove uses of deprecated API. Replace put_tag() with ffio_wfourcc() and ByteIOContext with AVIOContext. commit d184c86cd309bbd61c5d1a1dfcf60d133da4c1e3 Author: Maksym Veremeyenko Date: Tue Feb 15 12:44:08 2011 +0200 store pasp atom for all types of quicktime movie Signed-off-by: Luca Barbato commit 77d207cbe64710b7b34865f347e608b9c0e15968 Author: Maksym Veremeyenko Date: Fri Feb 25 17:42:56 2011 +0200 reindent after tapt patch Signed-off-by: Luca Barbato commit ea1afa124cb58c7eebd4fd3706434fafb58b00c0 Author: Maksym Veremeyenko Date: Fri Feb 25 17:41:55 2011 +0200 use tapt atom for sample aspect ratio Signed-off-by: Luca Barbato commit e211e255aa399d68239ffa42c9cc7a52eb3d55a9 Author: Peter Ross Date: Sun Feb 13 14:37:20 2011 +1100 bink: prevent overflows within binkidct by using int-sized intermediate array Signed-off-by: Ronald S. Bultje commit 588a3ffd9687cbef60cc26d5b3a247b8ecdbf75b Author: Peter Ross Date: Sun Feb 20 13:15:38 2011 +1100 bink: decode audio track identifiers into AVStream.id Signed-off-by: Ronald S. Bultje commit ccfcddb3f287545a20831f266c2a2f734d6a9f31 Author: Peter Ross Date: Sun Feb 20 12:25:05 2011 +1100 Bink version 'b' audio decoder Signed-off-by: Ronald S. Bultje commit 8a8c283edd0da5863eb729a31a94b70820400941 Author: Peter Ross Date: Sun Feb 20 12:24:48 2011 +1100 binkaudio: simplify frame_len_bits and frame_len calculation Signed-off-by: Ronald S. Bultje commit a304def1dca50d63bf2a39651f84792980db3508 Author: Peter Ross Date: Sun Feb 20 12:24:38 2011 +1100 binkaudio: remove unnecessary loop decode_init sets bands[0] == 2, so this loop always sets the band table index (k) to zero. Signed-off-by: Ronald S. Bultje commit 582ac86d19c61ad73c2e1a2d5ed54a5fe1e20bd1 Author: Peter Ross Date: Sun Feb 20 12:24:25 2011 +1100 binkaudio: perform band table scaling in decode_init Signed-off-by: Ronald S. Bultje commit f0ca29eb5f476a281c8066214e3745244656d417 Author: Peter Ross Date: Sun Feb 20 12:24:09 2011 +1100 bink: set audio stream codec_tag such that binkaudio decoder can identify bitstream version Signed-off-by: Ronald S. Bultje commit 8997bb8807336dd6d6c96364952bb71c161ac3b2 Author: Mans Rullgard Date: Fri Feb 25 14:52:23 2011 +0000 bink: use LOCAL_ALIGNED for aligned stack data Signed-off-by: Mans Rullgard commit 04973f8082c5a822112d2e42d535b7f3f59dccc0 Author: Kyle Date: Sat Feb 19 00:42:11 2011 +0000 dxva2: define required feature selection macros Signed-off-by: Mans Rullgard commit cc4e9d2a24a9ca79d4e912df21053426411aa14b Author: Dave Yeo Date: Fri Feb 25 04:19:32 2011 +0000 OS/2: lxlite should use stdout This causes lxlite to use stdout instead of vioXXX functions. This improves fate and build logs readability. Affects OS/2 only. Signed-off-by: Mans Rullgard commit 61840b43607679e8c4a1a63f005770f69dda12fa Author: Anton Khirnov Date: Thu Feb 24 07:36:05 2011 +0100 avio: deprecate put_tag it's not used internally anymore and shouldn't be public. Signed-off-by: Ronald S. Bultje commit bbc413f943b53d96aa85fe272ec413c85794019f Author: Anton Khirnov Date: Thu Feb 24 07:36:04 2011 +0100 lavf: replace remaining uses of put_tag with avio_write Signed-off-by: Ronald S. Bultje commit 99f42c27abfe916fa19ac0c18489c8bbf8525406 Author: Anton Khirnov Date: Thu Feb 24 07:36:03 2011 +0100 avienc: replace &tag[0] with tag. Signed-off-by: Ronald S. Bultje commit 0abdb2931719d96dee725e555e9b46b2b2f8a6be Author: Anton Khirnov Date: Thu Feb 24 07:36:02 2011 +0100 lavf: use a new ffio_wfourcc macro instead of put_tag() where possible Signed-off-by: Ronald S. Bultje commit dca85c842d9602162b7473baada524347efccd99 Author: Carl Eugen Hoyos Date: Fri Feb 25 15:39:49 2011 +0100 Mark MS-MPEG4v1 encoder as experimental. The encoder has never produced files that could be decoded with any software. commit 821424905170622e3fea4fa71b420ff20da593f1 Author: Carl Eugen Hoyos Date: Fri Feb 25 15:34:20 2011 +0100 Add libmpcodecs to the list of libavfilter subdirectories. commit 7e06e0ede3b798f591634b277e8dfa6507b196de Author: Anssi Hannula Date: Fri Feb 18 19:49:44 2011 +0000 dca: use EXT_AUDIO_ID field to determine core extensions This avoids the core substream extensions scan when the EXT_AUDIO_ID field indicates no extensions or only unsupported extensions. The scan is done only if the value of EXT_AUDIO_ID is unknown or indicates a present XCh extension which we can decode. Signed-off-by: Mans Rullgard commit a1c4b65b9170d9e7fa8a5780d6294f0411526b41 Author: Anssi Hannula Date: Mon Feb 14 19:14:53 2011 +0200 lavf: update documentation of AVOutputFormat.flags Signed-off-by: Michael Niedermayer commit 1108f8998c6536bb44d6ecbe5adfa18e0c1478e8 Author: Justin Ruggles Date: Wed Feb 23 13:11:13 2011 -0500 vmdaudio: output 8-bit audio as AV_SAMPLE_FMT_U8. There is no need to expand to 16-bits. Just use memcpy() to copy the raw data. Signed-off-by: Ronald S. Bultje commit 2ec7862db8b782020cc220dae827c3438d108b3a Author: Justin Ruggles Date: Wed Feb 23 13:11:12 2011 -0500 vmdaudio: remove unnecessary fields from VmdAudioContext and use the corresponding AVCodecContext fields instead. Signed-off-by: Ronald S. Bultje commit 1e86d685e0935077766c645e49b8533d41ca11cb Author: Justin Ruggles Date: Wed Feb 23 13:11:11 2011 -0500 vmdaudio: add out_bps to VmdAudioContext and use it to replace hard-coded sample size. Signed-off-by: Ronald S. Bultje commit 1574eff3d23ad799d25454a449b01f94795495ea Author: Justin Ruggles Date: Wed Feb 23 13:11:10 2011 -0500 vmdaudio: simplify vmdaudio_decode_frame() by handling block_type first, then making a single call to vmdaudio_loadsound(). This also adds output buffer size checks for AUDIO and SILENCE block types. Signed-off-by: Ronald S. Bultje commit ba9516cca845f8d3fb7ac08ef53a996c3ee0dbf5 Author: Justin Ruggles Date: Wed Feb 23 13:11:09 2011 -0500 cosmetics: reindent after previous commit Signed-off-by: Ronald S. Bultje commit 762b386e4aafc7bbdbec367bc652cf1199e81f51 Author: Justin Ruggles Date: Wed Feb 23 13:11:08 2011 -0500 vmdaudio: move all silence chunk handling to vmdaudio_loadsound(). Signed-off-by: Ronald S. Bultje commit 8e9027d266ef39ab9f88b4bbad5cf9e425d0696c Author: Justin Ruggles Date: Wed Feb 23 13:11:01 2011 -0500 cosmetics: remove debugging cruft Signed-off-by: Ronald S. Bultje commit 868f2f4d90e07edd9a65bd9b917bb5940643ec75 Author: Justin Ruggles Date: Wed Feb 23 13:11:00 2011 -0500 cosmetics: reindent after previous commit Signed-off-by: Ronald S. Bultje commit 2d213695fce86e740800ddcf43d8d0864d2ecea5 Author: Justin Ruggles Date: Wed Feb 23 13:11:07 2011 -0500 vmdaudio: simplify buffer pointer and header size handling. Signed-off-by: Ronald S. Bultje commit 7a4fb3fd9357dfdd27431a0a8d7250dab54a9938 Author: Justin Ruggles Date: Wed Feb 23 13:11:06 2011 -0500 vmdaudio: set *data_size to zero when skipping small packets and add a warning log message. Signed-off-by: Ronald S. Bultje commit 22f893e1c9f9387f0a021f775757130fa48e0180 Author: Justin Ruggles Date: Wed Feb 23 13:11:05 2011 -0500 vmdaudio: validate block type Signed-off-by: Ronald S. Bultje commit dd1af5136fe7767f2f18ac943efe994946864640 Author: Justin Ruggles Date: Wed Feb 23 13:11:04 2011 -0500 vmdaudio: use macros and a local variable for block type. Signed-off-by: Ronald S. Bultje commit 6989cb2dae85ea455ffcc8a36a763134fb311e29 Author: Justin Ruggles Date: Wed Feb 23 13:11:03 2011 -0500 vmdaudio: correct the silent chunk count in the first block. This fixes A/V sync with several samples, notably: http://samples.mplayerhq.hu/game-formats/sierra-vmd/swat_*.vmd Signed-off-by: Ronald S. Bultje commit 9b73f786005f31429d7c88092edfeef6696a5f69 Author: Justin Ruggles Date: Wed Feb 23 13:11:02 2011 -0500 vmdaudio: output audio samples for standalone silent blocks. Signed-off-by: Ronald S. Bultje commit 1328d433137c055df06f99772b243ceec2bbf36e Author: Justin Ruggles Date: Wed Feb 23 13:10:59 2011 -0500 vmdaudio: remove duplicated code by merging mono and stereo decoding. Signed-off-by: Ronald S. Bultje commit a58bcb40b164b92957db73e702465808a9180126 Author: Justin Ruggles Date: Wed Feb 23 13:10:58 2011 -0500 vmdaudio: fix raw_block_size calculation. The size should depend on the output sample size, not the internal bit depth. Signed-off-by: Ronald S. Bultje commit 83111506201ef30bc65bbbf6780aaecfad608f7e Author: Michael Niedermayer Date: Wed Feb 23 23:38:52 2011 +0100 Make FF_DEBUG_DCT_COEFF output coeffs via av_log() instead of just via AVFrame. This allows the values to be used without changing C code and is closer to how the other DEBUG flags work. If this causes a problem for any user of this flag, please tell me and ill split the flag in 2. commit 374eb2bab6c2e84c140771bdd9746672506a7590 Author: Anton Khirnov Date: Wed Feb 23 08:01:36 2011 +0100 lavf: postpone removal of deprecated avio functions Signed-off-by: Michael Niedermayer commit 1f5e9ede233b4acd5324af2686a9a8ffcb9a9a9d Author: Anton Khirnov Date: Wed Feb 23 08:01:35 2011 +0100 lavf: postpone removal of public metadata conversion API Signed-off-by: Michael Niedermayer commit 4c262dc140cf8f62d46aac6b7ed0290d3380a0a4 Author: longstone Date: Wed Feb 23 10:43:21 2011 -0500 avienc: fix AVI stream index for files with >10 streams Fixes issue 2563. Signed-off-by: Ronald S. Bultje (cherry picked from commit 4acc94e97a9551d11ead29735e23283d71f1d4c2) commit ebb92e076883f87cee2a3ddd4a7fe164f422f462 Author: Anton Khirnov Date: Mon Feb 21 22:45:20 2011 +0100 avio: rename url_fopen/fclose -> avio_open/close. Signed-off-by: Ronald S. Bultje (cherry picked from commit 22a3212e32b696028e21f00871f3cb48c044029d) commit c24a40349693e50aa81ef68a4a522503ca504d50 Author: Martin Storsjö Date: Sat Feb 19 19:14:11 2011 +0100 libavformat: Remove FF_NETERRNO() Map EAGAIN and EINTR from ff_neterrno to the normal AVERROR() error codes. Provide fallback definitions of other errno.h network errors, mapping them to the corresponding winsock errors. This eases catching these error codes in common code, without having to distinguish between FF_NETERRNO(EAGAIN) and AVERROR(EAGAIN). This fixes roundup issue 2614, unbreaking blocking network IO on windows. Signed-off-by: Ronald S. Bultje (cherry picked from commit 28c4741a6617a4c1d2490cb13fc70ae4c9c472da) commit 8e35f5d4fad523c1a1f0a4d9e4b74e7f1c5b990d Author: Benjamin Larsson Date: Tue Feb 8 11:05:05 2011 +0100 Add more AVC Intra FOURCCs Also change the comments a bit since the FOURCCs aren't specific to Flip4Mac and different ones are used for 720 versus 1080 lines. Signed-off-by: Ronald S. Bultje (cherry picked from commit 8f935b9271052be8f97d655081b94b68b6c23bfb) commit 4acc94e97a9551d11ead29735e23283d71f1d4c2 Author: longstone Date: Wed Feb 23 10:43:21 2011 -0500 avienc: fix AVI stream index for files with >10 streams Fixes issue 2563. Signed-off-by: Ronald S. Bultje commit 22a3212e32b696028e21f00871f3cb48c044029d Author: Anton Khirnov Date: Mon Feb 21 22:45:20 2011 +0100 avio: rename url_fopen/fclose -> avio_open/close. Signed-off-by: Ronald S. Bultje commit 28c4741a6617a4c1d2490cb13fc70ae4c9c472da Author: Martin Storsjö Date: Sat Feb 19 19:14:11 2011 +0100 libavformat: Remove FF_NETERRNO() Map EAGAIN and EINTR from ff_neterrno to the normal AVERROR() error codes. Provide fallback definitions of other errno.h network errors, mapping them to the corresponding winsock errors. This eases catching these error codes in common code, without having to distinguish between FF_NETERRNO(EAGAIN) and AVERROR(EAGAIN). This fixes roundup issue 2614, unbreaking blocking network IO on windows. Signed-off-by: Ronald S. Bultje commit 8f935b9271052be8f97d655081b94b68b6c23bfb Author: Benjamin Larsson Date: Tue Feb 8 11:05:05 2011 +0100 Add more AVC Intra FOURCCs Also change the comments a bit since the FOURCCs aren't specific to Flip4Mac and different ones are used for 720 versus 1080 lines. Signed-off-by: Ronald S. Bultje commit 4f84e728dad84a366a2d183da03b7d92cb20fb23 Author: Young Han Lee Date: Wed Feb 16 10:04:07 2011 +0900 aacdec: Reduce the size of buf_mdct. It was doubled in size for the LTP implementation. This brings it back down to its original size. (cherry picked from commit e22910b21a6c78b0159f98426b10c204f12bc15a) commit ad9b2a41b81cc895da99d0d950b12b7299556ef2 Author: Alex Converse Date: Mon Feb 21 00:01:09 2011 -0800 Remove old VCSs from version.sh (cherry picked from commit 203df50d1013ea59e558d63f3ea69ffae1249124) commit 352cb0da903509b788121aa52354580806d31390 Author: Tony Strauss Date: Mon Feb 21 23:46:54 2011 +0000 mpegtsenc: use correct PES stream_id for AAC This adds the AAC codec to the list of audio codecs that results in a PES stream_id of 0xc0 (audio stream). Signed-off-by: Mans Rullgard (cherry picked from commit 6c065f0acd5b50a9037b561c6fc370b316832543) commit 51e7c932daec1ffb6aacdc5e15f069b4dff6b313 Author: Ronald S. Bultje Date: Mon Feb 21 15:46:45 2011 -0500 spdifenc.c: fix compile because of missing include avio_internal.h. (cherry picked from commit 0f86fcabdf74f658323140111dfd4de83f7f2eee) commit 644b66cd4a2a1342a56a26af3b813e7c11df8514 Author: Mans Rullgard Date: Mon Feb 21 15:47:27 2011 +0000 vp8: ppc: fix invalid reads in altivec epel mc The 4-tap filters should only access one row/column before the reference block. Signed-off-by: Mans Rullgard (cherry picked from commit e0e46cae377347cbe1cd27c0d85568921b12c2ad) commit e407f4173a0ab89fe9ab57e228f7ec0467a24ca4 Author: Mans Rullgard Date: Mon Feb 21 19:15:38 2011 +0000 ppc: fix vc1 inverse transform, unbreak build GCC 4.3 and later are more particular about signedness matching in vector operations. The operations under if(rangered) were missing assignments and thus had no effect. Signed-off-by: Mans Rullgard (cherry picked from commit 381efba0ecedd41575f99ba9e9bd3826551079f6) commit 2df9d0008ee34f99212f8c9820bd858ff8b64642 Author: Anton Khirnov Date: Mon Feb 21 20:02:20 2011 +0100 avio: make put_nbyte internal. Signed-off-by: Ronald S. Bultje (cherry picked from commit 0ac8e2bf2bf3d636241bf2811018d9974687a63c) commit e9eb8d0bcecd656292856698f603a841a82cc9c6 Author: Anton Khirnov Date: Mon Feb 21 19:28:17 2011 +0100 avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_ -> avio_w put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje (cherry picked from commit 77eb5504d3b3e1047900382350e0bc5e0bfb16b5) commit e48fe14a54d8360336dbb22f3f787815b57dda47 Author: Ronald S. Bultje Date: Mon Feb 21 13:44:37 2011 -0500 targa: prevent integer overflow in bufsize check. (cherry picked from commit 78e2380a6d09e7a8b2a74d090abfb0a922e046f6) commit d4e321d9c2f52f77e06ca48c3ddf71f8d4219f7b Author: Anton Khirnov Date: Mon Feb 21 19:28:16 2011 +0100 avio: make get_partial_buffer internal. Signed-off-by: Ronald S. Bultje (cherry picked from commit b3db9ceef13037f2b6963a84b7abf8871a1e0f8a) commit e63a362857d9807b23e65872598d782fa53bb6af Author: Anton Khirnov Date: Mon Feb 21 16:43:01 2011 +0100 avio: avio_ prefixes for get_* functions In the name of consistency: get_byte -> avio_r8 get_ -> avio_r get_buffer -> avio_read get_partial_buffer will be made private later get_strz is left out becase I want to change it later to return something useful. Signed-off-by: Ronald S. Bultje (cherry picked from commit b7effd4e8338f6ed5bda630ad7ed0809bf458648) commit 6a786b15c34765ec00be3cd808dafbb041fd5881 Author: Ronald S. Bultje Date: Mon Feb 21 09:07:13 2011 -0500 VC1: merge idct8x8, coeff adjustments and put_pixels. Merging these functions allows merging some loops, which makes the results (particularly after SIMD optimizations) much faster. (cherry picked from commit f8bed30d8b176fa030f6737765338bb4a2bcabc9) commit 90ed2776ea7368f1b6cf07af5f29fd06efbfcd65 Author: Anton Khirnov Date: Sun Feb 20 15:03:29 2011 +0100 avio: rename av_alloc_put_byte -> avio_alloc_context for consistency Signed-off-by: Ronald S. Bultje (cherry picked from commit 8d9ac969cb4ac3e3e18f6425703af4d7aec6c513) commit 34bb0575c164dcbe945add0f314d1c1889f9d23e Author: Ronald S. Bultje Date: Sun Feb 20 17:31:33 2011 -0500 dsputil: make {add/put/put_signed}_pixels_clamped() non-static. (cherry picked from commit 484a337cd7cd8bb180c4a1bd3321881f1c874a92) commit 713f490467e0d4b64e4d2e8f5ee98034235d2010 Author: Ronald S. Bultje Date: Sun Feb 20 10:46:55 2011 -0500 VC1: inline vc1_put_block() in vc1_decode_i_blocks(). Advantage is that it allows us to combine several loops into a single one, and these can eventually be merged into the IDCT itself. Also, it allows us to remove vc1_put_block(), and makes CODEC_FLAG_GRAY faster. (cherry picked from commit bbfd2e7ab4e2ae0b934657fe51afdbbbaead52b7) commit 5effda08fe9650b28a25326660c4e21e0f283ec2 Author: Mans Rullgard Date: Sun Feb 20 17:16:42 2011 +0000 Makefile: include deps from tools directory This ensures the tools are rebuilt when necessary. Specifically, lavfi-showfiltfmts was sometimes not rebuilt causing spurious test failures. Signed-off-by: Mans Rullgard (cherry picked from commit 08df7f866663f83ba42398cea9f3eeff4681ea9a) commit 46382ae2ec4f705e574f83164f3ab58178e000e9 Author: Mans Rullgard Date: Sun Feb 20 16:47:19 2011 +0000 amrnb: use correct size when copying lsf_r array lsf_r is an array of int16_t, not float. Signed-off-by: Mans Rullgard (cherry picked from commit 1efa772e20be5869817b2370a557bb14e7ce2fff) commit f1f792117f3375478fb0043369014b575dfa5e75 Author: Mans Rullgard Date: Sun Feb 20 14:38:32 2011 +0000 x86: use raw opcode for xgetbv instruction This allows the CPU detection to work with assemblers not supporting the xgetbv mnemonic. These include clang and some BSD versions. All AVX code will be written for yasm, where the main assembler is not involved. Signed-off-by: Mans Rullgard (cherry picked from commit ef6695387522fc783105ac187c84beaa284e7cff) commit f9c61974ae93258f78b9bb811476cad2062b9b76 Author: Michael Niedermayer Date: Tue Feb 22 01:41:52 2011 +0100 Add shadow support to the drawtext filter Signed-off-by: Michael Niedermayer commit a64a2c5f98d3e2bdc75ac3f30db6d3fe84260436 Author: Michael Niedermayer Date: Tue Feb 22 01:11:35 2011 +0100 factor draw_glyphs out of drawtext filter Signed-off-by: Michael Niedermayer commit bccea08836ad3e92b43a9770e5156e569103226a Author: Michael Niedermayer Date: Tue Feb 22 00:54:48 2011 +0100 Fix and optimize yuv blend in the drawtext filter Signed-off-by: Michael Niedermayer commit 7d27902263af28c6c4875f1f815988d812e4b122 Author: Michael Niedermayer Date: Tue Feb 22 00:43:19 2011 +0100 get rid of divisions in the inner loop of the drawtext filter Signed-off-by: Michael Niedermayer commit 476aaec63729a306d1759f14c74847ca8f0b2021 Author: Michael Niedermayer Date: Tue Feb 22 00:28:54 2011 +0100 fix chroma alpha in the drawtext filter Signed-off-by: Michael Niedermayer commit edbaedf7a0c4cf2c41daf8259c617664b1c8b4f5 Author: Michael Niedermayer Date: Tue Feb 22 00:23:31 2011 +0100 Simplify chroma blend in the drawtext filter Signed-off-by: Michael Niedermayer commit bd8e750300073e4e64969e6b440b31967792d917 Author: Stefano Sabatini Date: Mon Feb 21 01:02:29 2011 +0100 Port drawtext filter by Hemanth from the libavfilter soc repo, with the following additions: * support to anti-aliased glyph rendering * support to UTF-8 text and Unicode chars rendering * support for RGB packed formats Signed-off-by: Michael Niedermayer commit e22910b21a6c78b0159f98426b10c204f12bc15a Author: Young Han Lee Date: Wed Feb 16 10:04:07 2011 +0900 aacdec: Reduce the size of buf_mdct. It was doubled in size for the LTP implementation. This brings it back down to its original size. commit 203df50d1013ea59e558d63f3ea69ffae1249124 Author: Alex Converse Date: Mon Feb 21 00:01:09 2011 -0800 Remove old VCSs from version.sh commit 6c065f0acd5b50a9037b561c6fc370b316832543 Author: Tony Strauss Date: Mon Feb 21 23:46:54 2011 +0000 mpegtsenc: use correct PES stream_id for AAC This adds the AAC codec to the list of audio codecs that results in a PES stream_id of 0xc0 (audio stream). Signed-off-by: Mans Rullgard commit 0f86fcabdf74f658323140111dfd4de83f7f2eee Author: Ronald S. Bultje Date: Mon Feb 21 15:46:45 2011 -0500 spdifenc.c: fix compile because of missing include avio_internal.h. commit e0e46cae377347cbe1cd27c0d85568921b12c2ad Author: Mans Rullgard Date: Mon Feb 21 15:47:27 2011 +0000 vp8: ppc: fix invalid reads in altivec epel mc The 4-tap filters should only access one row/column before the reference block. Signed-off-by: Mans Rullgard commit 381efba0ecedd41575f99ba9e9bd3826551079f6 Author: Mans Rullgard Date: Mon Feb 21 19:15:38 2011 +0000 ppc: fix vc1 inverse transform, unbreak build GCC 4.3 and later are more particular about signedness matching in vector operations. The operations under if(rangered) were missing assignments and thus had no effect. Signed-off-by: Mans Rullgard commit 0ac8e2bf2bf3d636241bf2811018d9974687a63c Author: Anton Khirnov Date: Mon Feb 21 20:02:20 2011 +0100 avio: make put_nbyte internal. Signed-off-by: Ronald S. Bultje commit 77eb5504d3b3e1047900382350e0bc5e0bfb16b5 Author: Anton Khirnov Date: Mon Feb 21 19:28:17 2011 +0100 avio: avio: avio_ prefixes for put_* functions In the name of consistency: put_byte -> avio_w8 put_ -> avio_w put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje commit 78e2380a6d09e7a8b2a74d090abfb0a922e046f6 Author: Ronald S. Bultje Date: Mon Feb 21 13:44:37 2011 -0500 targa: prevent integer overflow in bufsize check. commit b3db9ceef13037f2b6963a84b7abf8871a1e0f8a Author: Anton Khirnov Date: Mon Feb 21 19:28:16 2011 +0100 avio: make get_partial_buffer internal. Signed-off-by: Ronald S. Bultje commit b7effd4e8338f6ed5bda630ad7ed0809bf458648 Author: Anton Khirnov Date: Mon Feb 21 16:43:01 2011 +0100 avio: avio_ prefixes for get_* functions In the name of consistency: get_byte -> avio_r8 get_ -> avio_r get_buffer -> avio_read get_partial_buffer will be made private later get_strz is left out becase I want to change it later to return something useful. Signed-off-by: Ronald S. Bultje commit f8bed30d8b176fa030f6737765338bb4a2bcabc9 Author: Ronald S. Bultje Date: Mon Feb 21 09:07:13 2011 -0500 VC1: merge idct8x8, coeff adjustments and put_pixels. Merging these functions allows merging some loops, which makes the results (particularly after SIMD optimizations) much faster. commit 8d9ac969cb4ac3e3e18f6425703af4d7aec6c513 Author: Anton Khirnov Date: Sun Feb 20 15:03:29 2011 +0100 avio: rename av_alloc_put_byte -> avio_alloc_context for consistency Signed-off-by: Ronald S. Bultje commit 484a337cd7cd8bb180c4a1bd3321881f1c874a92 Author: Ronald S. Bultje Date: Sun Feb 20 17:31:33 2011 -0500 dsputil: make {add/put/put_signed}_pixels_clamped() non-static. commit bbfd2e7ab4e2ae0b934657fe51afdbbbaead52b7 Author: Ronald S. Bultje Date: Sun Feb 20 10:46:55 2011 -0500 VC1: inline vc1_put_block() in vc1_decode_i_blocks(). Advantage is that it allows us to combine several loops into a single one, and these can eventually be merged into the IDCT itself. Also, it allows us to remove vc1_put_block(), and makes CODEC_FLAG_GRAY faster. commit c8c0189d62f26569464c86231fa885f0b0c33f14 Author: Stefano Sabatini Date: Sun Feb 20 22:42:24 2011 +0000 lavfi: put color source in a dedicated file Move the color source code from vf_pad.c to vsrc_color.c. Signed-off-by: Mans Rullgard commit 5ad06110e01bbfdb35eaa3691b54ca4af1ac2210 Author: Stefano Sabatini Date: Sun Feb 20 22:42:17 2011 +0000 lavfi: add drawutils Add drawutils.h and drawutils.c, and use them in the pad filter. The new functions are going to be shared by other filters. Signed-off-by: Mans Rullgard commit 704865fc87fdfcf9afe0ee554d1a32881bd87f1e Author: Brandon Mintern Date: Mon Feb 21 12:02:57 2011 +0100 lavfi: add fade filter Port fade filter from libavfilter soc repo, with minor fixes by Stefano. Signed-off-by: Michael Niedermayer commit fd0b42cce0fac3e755378053fc95b4008d0144d7 Author: Stefano Sabatini Date: Sun Feb 20 23:42:24 2011 +0100 lavfi: put color source in a dedicated file Move the color source code from vf_pad.c to vsrc_color.c. Signed-off-by: Michael Niedermayer commit bcfd9e821b6083e9a98b8e5da4de0a4fbf22923b Author: Stefano Sabatini Date: Sun Feb 20 23:42:17 2011 +0100 lavfi: add drawutils Add drawutils.h and drawutils.c, and use them in the pad filter. The new functions are going to be shared by other filters. Signed-off-by: Michael Niedermayer commit bbcaaf752f09cf6475f6d28a91c4e4cdcdf03147 Author: Ronald S. Bultje Date: Sun Feb 20 08:46:22 2011 -0500 Update version and APIchanges. Update libavformat/version.h and doc/APIChanges after renaming init_put_byte() and ByteIOContext to ffio_init_context() (private) and AVIOContext, (public), and deprecating the originals. (cherry picked from commit d2bbf82e65e4a128ab1f0bf48df5d1e43c43c698) commit ae99313aa585fbf74339a2630a37402819f197c6 Author: Anton Khirnov Date: Sun Feb 20 11:04:13 2011 +0100 avio: move init_put_byte() to a new private header and rename it init_put_byte should never be used outside of lavf, since sizeof(AVIOContext) isn't part of public ABI. Signed-off-by: Ronald S. Bultje (cherry picked from commit e731b8d8729e75bfb69f5540e6446d6118dac549) commit 471fe57e1af2bb37055c93688671c9c79ef9b5cd Author: Anton Khirnov Date: Sun Feb 20 11:04:12 2011 +0100 avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje (cherry picked from commit ae628ec1fd7f54c102bf9e667a3edd404b9b9128) commit a8858ee11cf4f0ae22e0a9df57bec4ec5dd02f80 Author: Ronald S. Bultje Date: Sat Feb 19 19:07:29 2011 -0500 VC1: don't use vc1_put_block() in vc1_decode_i_blocks_adv(). Advanced profile never uses "range reduction", so vc1_put_block() quite literally just calls put_pixels_clamped() from vc1_decode_i_blocks_adv(). By inlining the function, we can prevent calling IDCT8x8 if CODEC_FLAG_GRAY is set, and we don't have to scale the coeffs in the [0,256] range, but can instead use put_signed_pixels_clamped(). (cherry picked from commit 70aa916e4630bcec14439a2d703074b6d4c890a8) commit cdeba2de821df504ca799c103e48f3e9a92241f9 Author: Mans Rullgard Date: Wed Feb 16 02:39:42 2011 +0000 x86: check for AVX support This adds configure and runtime checks for AVX support on x86 CPUs. Signed-off-by: Mans Rullgard (cherry picked from commit 87f1355f9b4fc11414d0e6a91404203c2745f89f) commit 91861ce25c7f19c38afdb0f115bf90118fc19428 Author: Marton Balint Date: Sat Feb 19 17:33:15 2011 +0100 MMS: also discover streams in extended stream properties object Allows playback of nonprimary audio streams in multiple bitrate sources, such as mmsh://wmscr1.dr.dk/e02ch03m Signed-off-by: Ronald S. Bultje (cherry picked from commit 74d6871d6244865b5863a01c3dab16a2f06a1706) commit 6a717eb4aaf6f5cd81401b33e3ea36080b010d76 Author: Ronald S. Bultje Date: Sat Feb 19 08:50:37 2011 -0500 dsputil_mmx.c: remove ff_vector128. Remove ff_vector128, it is identical to ff_pb_80. (cherry picked from commit bf6fa732459399fac215bdfa44dd39a6fb1d1e01) commit c614d32e228919155e764929fb9a4392a3f16e91 Author: Reimar Döffinger Date: Sat Feb 19 11:33:01 2011 +0100 Fix invalid reads in VC1 decoder Patch discussed and taken from https://roundup.ffmpeg.org/issue2584 (cherry picked from commit 2bbec1eda46d907605772a8b6e8263caa4bc4c82) commit 0cfcbf217f7db5156da0acfb114a98c135d9ebfd Author: David Conrad Date: Sat Feb 19 01:41:51 2011 -0800 Fix VP3 edge emulation With negative stride, the start of the edge_emu buffer should be pointing to the last line, not the end of the buffer. With positive stride, pointing to the end of the buffer was completely wrong. (cherry picked from commit a89f4ca005efa5ee82089583c7b8bc00bcee816a) commit 695f39c80bf226c0e7db542933f8fef72737f605 Author: Young Han Lee Date: Sat Feb 19 09:32:24 2011 +0900 aacdec: dsputilize the scalar multiplication in intensity stereo (cherry picked from commit 9707f84fa73c23352937fc7e4e0a85eaf3135cbc) commit d14723861b271cfb53c42006ce7fc6832461db38 Author: Jason Garrett-Glaser Date: Thu Feb 17 20:24:05 2011 -0800 VP3: fix decoding of videos with stride > 2048 Also remove qscale_table code; this didn't make sense anyways as VP3 doesn't use an MPEG-like quantizer scale. (cherry picked from commit 902685b8abf4e2089802528a32a50f3c68033fda) commit 08df7f866663f83ba42398cea9f3eeff4681ea9a Author: Mans Rullgard Date: Sun Feb 20 17:16:42 2011 +0000 Makefile: include deps from tools directory This ensures the tools are rebuilt when necessary. Specifically, lavfi-showfiltfmts was sometimes not rebuilt causing spurious test failures. Signed-off-by: Mans Rullgard commit 1efa772e20be5869817b2370a557bb14e7ce2fff Author: Mans Rullgard Date: Sun Feb 20 16:47:19 2011 +0000 amrnb: use correct size when copying lsf_r array lsf_r is an array of int16_t, not float. Signed-off-by: Mans Rullgard commit ef6695387522fc783105ac187c84beaa284e7cff Author: Mans Rullgard Date: Sun Feb 20 14:38:32 2011 +0000 x86: use raw opcode for xgetbv instruction This allows the CPU detection to work with assemblers not supporting the xgetbv mnemonic. These include clang and some BSD versions. All AVX code will be written for yasm, where the main assembler is not involved. Signed-off-by: Mans Rullgard commit d2bbf82e65e4a128ab1f0bf48df5d1e43c43c698 Author: Ronald S. Bultje Date: Sun Feb 20 08:46:22 2011 -0500 Update version and APIchanges. Update libavformat/version.h and doc/APIChanges after renaming init_put_byte() and ByteIOContext to ffio_init_context() (private) and AVIOContext, (public), and deprecating the originals. commit e731b8d8729e75bfb69f5540e6446d6118dac549 Author: Anton Khirnov Date: Sun Feb 20 11:04:13 2011 +0100 avio: move init_put_byte() to a new private header and rename it init_put_byte should never be used outside of lavf, since sizeof(AVIOContext) isn't part of public ABI. Signed-off-by: Ronald S. Bultje commit ae628ec1fd7f54c102bf9e667a3edd404b9b9128 Author: Anton Khirnov Date: Sun Feb 20 11:04:12 2011 +0100 avio: rename ByteIOContext to AVIOContext. Signed-off-by: Ronald S. Bultje commit 70aa916e4630bcec14439a2d703074b6d4c890a8 Author: Ronald S. Bultje Date: Sat Feb 19 19:07:29 2011 -0500 VC1: don't use vc1_put_block() in vc1_decode_i_blocks_adv(). Advanced profile never uses "range reduction", so vc1_put_block() quite literally just calls put_pixels_clamped() from vc1_decode_i_blocks_adv(). By inlining the function, we can prevent calling IDCT8x8 if CODEC_FLAG_GRAY is set, and we don't have to scale the coeffs in the [0,256] range, but can instead use put_signed_pixels_clamped(). commit 87f1355f9b4fc11414d0e6a91404203c2745f89f Author: Mans Rullgard Date: Wed Feb 16 02:39:42 2011 +0000 x86: check for AVX support This adds configure and runtime checks for AVX support on x86 CPUs. Signed-off-by: Mans Rullgard commit 74d6871d6244865b5863a01c3dab16a2f06a1706 Author: Marton Balint Date: Sat Feb 19 17:33:15 2011 +0100 MMS: also discover streams in extended stream properties object Allows playback of nonprimary audio streams in multiple bitrate sources, such as mmsh://wmscr1.dr.dk/e02ch03m Signed-off-by: Ronald S. Bultje commit 5c20c81bfa526b3a269db9c88b0c9007861f0917 Author: Michael Niedermayer Date: Sat Feb 19 17:30:04 2011 +0100 Fix issue2619. regression introduced in 1762d9ced70ccc46c5d3e5d64e56a48d0fbbd4f7 Signed-off-by: Michael Niedermayer commit bf6fa732459399fac215bdfa44dd39a6fb1d1e01 Author: Ronald S. Bultje Date: Sat Feb 19 08:50:37 2011 -0500 dsputil_mmx.c: remove ff_vector128. Remove ff_vector128, it is identical to ff_pb_80. commit 2bbec1eda46d907605772a8b6e8263caa4bc4c82 Author: Reimar Döffinger Date: Sat Feb 19 11:33:01 2011 +0100 Fix invalid reads in VC1 decoder Patch discussed and taken from https://roundup.ffmpeg.org/issue2584 commit a89f4ca005efa5ee82089583c7b8bc00bcee816a Author: David Conrad Date: Sat Feb 19 01:41:51 2011 -0800 Fix VP3 edge emulation With negative stride, the start of the edge_emu buffer should be pointing to the last line, not the end of the buffer. With positive stride, pointing to the end of the buffer was completely wrong. commit 9707f84fa73c23352937fc7e4e0a85eaf3135cbc Author: Young Han Lee Date: Sat Feb 19 09:32:24 2011 +0900 aacdec: dsputilize the scalar multiplication in intensity stereo commit 902685b8abf4e2089802528a32a50f3c68033fda Author: Jason Garrett-Glaser Date: Thu Feb 17 20:24:05 2011 -0800 VP3: fix decoding of videos with stride > 2048 Also remove qscale_table code; this didn't make sense anyways as VP3 doesn't use an MPEG-like quantizer scale. commit 7782cb207a09f4acf0b2a935ca81076b117660a2 Author: Jean-Daniel Dupas Date: Fri Feb 18 10:35:51 2011 +0100 targa: fix potential buffer overreads Signed-off-by: Mans Rullgard (cherry picked from commit 351423ae1f861da1c647d30c73503fde2b1f3dad) commit 56cbc5f19f55c0d7bbe43a63464734f30872ce12 Author: Ronald S. Bultje Date: Thu Feb 17 19:33:33 2011 -0500 Fix PPC build. (cherry picked from commit ed040f35f298b39f1ddd45a133c82cb5d6d79dda) commit 1d37e908cfe98eaa58a880074687c4d691f0868a Author: Jason Garrett-Glaser Date: Thu Feb 17 13:56:26 2011 -0800 VP8: init one less near_mv This one didn't actually need to be initialized. (cherry picked from commit 891b1f15a7e45a2a5f91cb4c27d11259ef8e012f) commit 545dc699f85bbd13b97afa3ca82088fdfa945bc6 Author: Jason Garrett-Glaser Date: Wed Feb 16 10:20:54 2011 -0800 Force inlining of avutil common routines On some versions of gcc, these weren't always getting inlined due to hitting the inline cap limit in some files. This is generally bad, as most of these functions are smaller inlined than not. (cherry picked from commit eb3755a5aa65da685d81399cfae4bd35e4a178b6) commit 8e624c1cee4f56bc0003fc8ed37b9f74ee854dd0 Author: Jason Garrett-Glaser Date: Wed Feb 16 09:49:50 2011 -0800 VP8: split out declarations to new header (cherry picked from commit bcf4568f183055331415ba230e82af6d59faac1c) commit 625e9309da4af0f7f067846ca7aa66c0b4a95c5b Author: Jason Garrett-Glaser Date: Wed Feb 16 09:39:00 2011 -0800 VP8: faster MV clipping (cherry picked from commit 7634771e70575b2a5abaeb420c5b3c2f9948c693) commit 9a1ced321bb900acc68cae07f4141d5f257cadd5 Author: Ronald S. Bultje Date: Thu Feb 17 14:45:03 2011 -0500 dsputil: move VC1-specific stuff into VC1DSPContext. (cherry picked from commit 12802ec0601c3bd7b9c7a2503518e28fd5e7d744) commit 6c0d9369d881b143628fdc24b105a4a2c60d67c2 Author: Ronald S. Bultje Date: Thu Feb 17 12:14:12 2011 -0500 VC1: simplify a calculation in a loop. (cherry picked from commit 0b16cdc3fa1d73056649abf43288be0a7624fdcc) commit 2739dc5d858a18c4d10f043af0e31a8a57ca147f Author: Ronald S. Bultje Date: Wed Feb 16 14:18:21 2011 -0500 VC1: transpose IDCT 8x8 coeffs while reading. (cherry picked from commit 1da6ea39542424ddb691dc6cf08d611a4c6db247) commit 003c32e72cb675b271d5434858899970000f369a Author: Martin Storsjö Date: Wed Feb 16 16:37:40 2011 +0200 ffserver: Try matching the RTSP url without a trailing slash If the client sends PLAY/PAUSE requests with the same url as specified in Content-Base, these requests may have urls with trailing slashes. (cherry picked from commit c2ca851b234e169b50730ef357aeade8047491eb) commit b2f893acc8826e290f401ee27bcb370293b7ef88 Author: Janne Grunau Date: Thu Feb 17 21:49:08 2011 +0100 Add SHA1s to APIChanges for av_dump_format, av_parse_time and av_find_info_tag Signed-off-by: Janne Grunau (cherry picked from commit c3dbfa1afd7d989e3bba4c6bfc492a52c012e9b3) commit 0ef52334ec252217d6a526a50b66ac3f3f46cd7f Author: Anton Khirnov Date: Wed Feb 16 09:52:39 2011 +0100 lavf, lavu: bump minor versions and add an APIChanges entry for av_ prefixes Signed-off-by: Janne Grunau (cherry picked from commit 09d171b98879f58be1a766d5f277e131b18e98a1) commit 1b98107c8d49005b84f5d656af85c1fccbd1f238 Author: Anton Khirnov Date: Wed Feb 16 09:52:38 2011 +0100 Move find_info_tag to lavu and add av_ prefix to it Signed-off-by: Janne Grunau (cherry picked from commit ab0287fcbdebc8ff416214535d7ee8424406990e) commit 9c9912b995bed00ae2a4717b9d680e30f388117c Author: Young Han Lee Date: Thu Feb 17 16:45:54 2011 +0900 mdct: remove unnecessary multiplication 3*n4 was already calculated in n3. (cherry picked from commit 979395bbbb9381b522b44c3448c24aef9c819ffc) commit 6159bd0d670f88dc87f515f859100c53b7d81a89 Author: Justin Ruggles Date: Wed Feb 16 00:30:24 2011 +0000 ac3enc: fix bug in stereo rematrixing decision. The rematrixing strategy reuse flags are not reset between frames, so they need to be initialized for all blocks, not just block 0. Signed-off-by: Mans Rullgard (cherry picked from commit 5b54d4b376fbd2c291b8a6dba7d425e28f654bcf) commit ee60e04c2c07b907bf72d1092c43b972c9c5e725 Author: Anton Khirnov Date: Wed Feb 16 08:52:37 2011 +0000 Replace remaining uses of parse_date with av_parse_time. Signed-off-by: Mans Rullgard (cherry picked from commit 9fcae9735e3b97366dcee9ca3c2f6cf4faf6756f) commit 40c3fe2c0873feed2a345032205560c4a816271f Author: Stefano Sabatini Date: Wed Feb 16 08:52:36 2011 +0000 Deprecate parse_date() in favor of av_parse_time(). The new av_parse_time() is created in libavutil/parseutils.h, all the internal functions used by parse_date are moved to libavutil/parseutils.c and made static. Signed-off-by: Mans Rullgard (cherry picked from commit f6c7375a175ac649558aefab14f3895b2cb469aa) commit 0ebf475494837edd07fa6f58c540364795f9551c Author: Anton Khirnov Date: Wed Feb 16 08:52:35 2011 +0000 lavf: add av_ prefix to dump_format() Signed-off-by: Mans Rullgard (cherry picked from commit 610219a598095f938705f200dfe3946455ef871a) commit 09e22efc7e0d98a90e99c9c2047a203c89d9dcd9 Author: Martin Storsjö Date: Wed Feb 16 14:35:47 2011 +0200 rtsp: udp_read_packet returning 0 doesn't mean success If udp_read_packet returns 0, rtsp_st isn't set and we shouldn't treat it as a successfully received packet (which is counted and possibly triggers a RTCP receiver report). This fixes issue 2612. (cherry picked from commit 2c35a6bde95a382e2d48570255deb67a7633fa46) commit 34c340d49f2e6ca5190f16ced82da32561a7bef2 Author: Nicolas George Date: Wed Feb 16 14:53:08 2011 +0100 ffserver: set the sample aspect ratio Hi. It seems that ffserver sets sample_aspect_ratio to an invalid value and lavf rejects it. I am not sure what I am doing here, but the attached patch actually solves something: using the following config: CustomLog - NoDaemon RTSPPort 5454 Format rtp File "/tmp/test1-rtsp.mpg" it allows a somewhat old ffplay (unaffected by the content-base issue I spoke of in another thread) to play the stream. Without it, ffserver logs this and closes the stream: Wed Feb 16 14:52:14 2011 [rtp @ 0x1399de0]Aspect ratio mismatch between encoder and muxer layer Regards, -- Nicolas George From 1b89c3c2164335060e87567b27deb0d354e0a814 Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Wed, 16 Feb 2011 14:44:31 +0100 Subject: [PATCH] ffserver: set the sample aspect ratio. Signed-off-by: Nicolas George (cherry picked from commit 6741f7c9be4913e084ad067571f3f29853ec5d5a) commit 728d56e84f7257e75a0f3824ebb8e53c2444b09b Author: James Zern Date: Fri Feb 11 16:02:45 2011 -0800 documentation: add encoders chapter Signed-off-by: Janne Grunau (cherry picked from commit 0fa904c9d845d4a47372e619067e21991bb39b06) commit 5d329e2eb713dbf41b15362f8cdd7b5ea3ea9d0a Author: Stefano Sabatini Date: Sun Feb 13 22:50:47 2011 +0100 In graph2dot, print more specific audio information for audio links. Signed-off-by: Janne Grunau (cherry picked from commit 009026efb1e3b3a5f05fd9934019a6300b25f364) commit 2613c81182f69aa662f6fff5d36fec4df1a42cd5 Author: Anssi Hannula Date: Mon Feb 14 19:19:30 2011 +0200 spdifenc: set flag AVFMT_NOTIMESTAMPS There are no timestamps in IEC 61937. Signed-off-by: Janne Grunau (cherry picked from commit 6c60fcf89afc84c9dc863669d78e611d7c72fe41) commit 02d08035711b1e430c84b38172637f8ec40158e5 Author: Michael Niedermayer Date: Fri Feb 18 19:39:56 2011 +0100 Reduce picture size for yadif. Signed-off-by: Michael Niedermayer commit bad82d3d7d98c1cf0d6790cc2e1d6b2ea60fcadd Author: Michael Niedermayer Date: Fri Feb 18 19:10:33 2011 +0100 Change yadif to not use out of picture lines. Fixes issue2272. Signed-off-by: Michael Niedermayer commit 351423ae1f861da1c647d30c73503fde2b1f3dad Author: Jean-Daniel Dupas Date: Fri Feb 18 10:35:51 2011 +0100 targa: fix potential buffer overreads Signed-off-by: Mans Rullgard commit ed040f35f298b39f1ddd45a133c82cb5d6d79dda Author: Ronald S. Bultje Date: Thu Feb 17 19:33:33 2011 -0500 Fix PPC build. commit 891b1f15a7e45a2a5f91cb4c27d11259ef8e012f Author: Jason Garrett-Glaser Date: Thu Feb 17 13:56:26 2011 -0800 VP8: init one less near_mv This one didn't actually need to be initialized. commit eb3755a5aa65da685d81399cfae4bd35e4a178b6 Author: Jason Garrett-Glaser Date: Wed Feb 16 10:20:54 2011 -0800 Force inlining of avutil common routines On some versions of gcc, these weren't always getting inlined due to hitting the inline cap limit in some files. This is generally bad, as most of these functions are smaller inlined than not. commit bcf4568f183055331415ba230e82af6d59faac1c Author: Jason Garrett-Glaser Date: Wed Feb 16 09:49:50 2011 -0800 VP8: split out declarations to new header commit 7634771e70575b2a5abaeb420c5b3c2f9948c693 Author: Jason Garrett-Glaser Date: Wed Feb 16 09:39:00 2011 -0800 VP8: faster MV clipping commit 12802ec0601c3bd7b9c7a2503518e28fd5e7d744 Author: Ronald S. Bultje Date: Thu Feb 17 14:45:03 2011 -0500 dsputil: move VC1-specific stuff into VC1DSPContext. commit 0b16cdc3fa1d73056649abf43288be0a7624fdcc Author: Ronald S. Bultje Date: Thu Feb 17 12:14:12 2011 -0500 VC1: simplify a calculation in a loop. commit 1da6ea39542424ddb691dc6cf08d611a4c6db247 Author: Ronald S. Bultje Date: Wed Feb 16 14:18:21 2011 -0500 VC1: transpose IDCT 8x8 coeffs while reading. commit c2ca851b234e169b50730ef357aeade8047491eb Author: Martin Storsjö Date: Wed Feb 16 16:37:40 2011 +0200 ffserver: Try matching the RTSP url without a trailing slash If the client sends PLAY/PAUSE requests with the same url as specified in Content-Base, these requests may have urls with trailing slashes. commit c3dbfa1afd7d989e3bba4c6bfc492a52c012e9b3 Author: Janne Grunau Date: Thu Feb 17 21:49:08 2011 +0100 Add SHA1s to APIChanges for av_dump_format, av_parse_time and av_find_info_tag Signed-off-by: Janne Grunau commit 09d171b98879f58be1a766d5f277e131b18e98a1 Author: Anton Khirnov Date: Wed Feb 16 09:52:39 2011 +0100 lavf, lavu: bump minor versions and add an APIChanges entry for av_ prefixes Signed-off-by: Janne Grunau commit ab0287fcbdebc8ff416214535d7ee8424406990e Author: Anton Khirnov Date: Wed Feb 16 09:52:38 2011 +0100 Move find_info_tag to lavu and add av_ prefix to it Signed-off-by: Janne Grunau commit 979395bbbb9381b522b44c3448c24aef9c819ffc Author: Young Han Lee Date: Thu Feb 17 16:45:54 2011 +0900 mdct: remove unnecessary multiplication 3*n4 was already calculated in n3. commit 5b54d4b376fbd2c291b8a6dba7d425e28f654bcf Author: Justin Ruggles Date: Wed Feb 16 00:30:24 2011 +0000 ac3enc: fix bug in stereo rematrixing decision. The rematrixing strategy reuse flags are not reset between frames, so they need to be initialized for all blocks, not just block 0. Signed-off-by: Mans Rullgard commit 9fcae9735e3b97366dcee9ca3c2f6cf4faf6756f Author: Anton Khirnov Date: Wed Feb 16 08:52:37 2011 +0000 Replace remaining uses of parse_date with av_parse_time. Signed-off-by: Mans Rullgard commit f6c7375a175ac649558aefab14f3895b2cb469aa Author: Stefano Sabatini Date: Wed Feb 16 08:52:36 2011 +0000 Deprecate parse_date() in favor of av_parse_time(). The new av_parse_time() is created in libavutil/parseutils.h, all the internal functions used by parse_date are moved to libavutil/parseutils.c and made static. Signed-off-by: Mans Rullgard commit 610219a598095f938705f200dfe3946455ef871a Author: Anton Khirnov Date: Wed Feb 16 08:52:35 2011 +0000 lavf: add av_ prefix to dump_format() Signed-off-by: Mans Rullgard commit 2c35a6bde95a382e2d48570255deb67a7633fa46 Author: Martin Storsjö Date: Wed Feb 16 14:35:47 2011 +0200 rtsp: udp_read_packet returning 0 doesn't mean success If udp_read_packet returns 0, rtsp_st isn't set and we shouldn't treat it as a successfully received packet (which is counted and possibly triggers a RTCP receiver report). This fixes issue 2612. commit 6741f7c9be4913e084ad067571f3f29853ec5d5a Author: Nicolas George Date: Wed Feb 16 14:53:08 2011 +0100 ffserver: set the sample aspect ratio Hi. It seems that ffserver sets sample_aspect_ratio to an invalid value and lavf rejects it. I am not sure what I am doing here, but the attached patch actually solves something: using the following config: CustomLog - NoDaemon RTSPPort 5454 Format rtp File "/tmp/test1-rtsp.mpg" it allows a somewhat old ffplay (unaffected by the content-base issue I spoke of in another thread) to play the stream. Without it, ffserver logs this and closes the stream: Wed Feb 16 14:52:14 2011 [rtp @ 0x1399de0]Aspect ratio mismatch between encoder and muxer layer Regards, -- Nicolas George From 1b89c3c2164335060e87567b27deb0d354e0a814 Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Wed, 16 Feb 2011 14:44:31 +0100 Subject: [PATCH] ffserver: set the sample aspect ratio. Signed-off-by: Nicolas George commit 0fa904c9d845d4a47372e619067e21991bb39b06 Author: James Zern Date: Fri Feb 11 16:02:45 2011 -0800 documentation: add encoders chapter Signed-off-by: Janne Grunau commit 009026efb1e3b3a5f05fd9934019a6300b25f364 Author: Stefano Sabatini Date: Sun Feb 13 22:50:47 2011 +0100 In graph2dot, print more specific audio information for audio links. Signed-off-by: Janne Grunau commit 6c60fcf89afc84c9dc863669d78e611d7c72fe41 Author: Anssi Hannula Date: Mon Feb 14 19:19:30 2011 +0200 spdifenc: set flag AVFMT_NOTIMESTAMPS There are no timestamps in IEC 61937. Signed-off-by: Janne Grunau commit 50a82c2c754ff9df7b918d2bad90e46d5a00063a Author: Michael Niedermayer Date: Wed Feb 16 02:09:46 2011 +0100 vbv_delay AVOption for ABI compatibility Signed-off-by: Michael Niedermayer Signed-off-by: Janne Grunau commit 2e3c56a29f241c207123e0195a6e1ce549559947 Author: Carl Eugen Hoyos Date: Sat Feb 12 15:29:10 2011 +0100 Set maximum lowres value for the MJPEG decoder to 3. While 4 works for some samples, 3 is the correct value since 8x8 DCT is used by (m)jpeg. Signed-off-by: Janne Grunau commit 20a2a3da8f59979e5f256c8a0356a6c224277d18 Author: Justin Ruggles Date: Wed Feb 16 14:04:04 2011 -0500 ac3dsp: Change punpckhqdq to movhlps in ac3_max_msb_abs_int16(). Signed-off-by: Ronald S. Bultje (cherry picked from commit 1f004fc512babe8215e2aa31fa4770aa27812cab) commit c4461aa83c2947c1f8a454dacb12b91b780191e1 Author: Maksym Veremeyenko Date: Wed Feb 16 09:52:44 2011 +0200 fix nsvdec.c compilation if DEBUG macro defined Signed-off-by: Ronald S. Bultje (cherry picked from commit 41cdc1ff1e86f1bfb935e1bde53ccc9c645ff71e) commit 33af787d8a892b51b7386a051f0cc0174c7e34ea Author: Balint Marton Date: Wed Feb 16 00:17:13 2011 +0000 Fix av_find_best_stream when using a program The current implementation has a bug, it is returning the stream index in the found program, and not the stream index in the list of all streams. The attached patch fixes this issue. Signed-off-by: Mans Rullgard (cherry picked from commit 22ec6b738f1608e4b959fb655cf37c3343ec7e9f) commit 20bc55ce5c01662a50bd9081914244b714294e84 Author: Stefano Sabatini Date: Mon Feb 14 10:59:25 2011 +0100 Document audio_resample_close(). Signed-off-by: Janne Grunau Signed-off-by: Michael Niedermayer commit 438198e7952f61b81f7bbe318e706cc0517b00f7 Author: Reimar Döffinger Date: Sat Jan 29 13:53:14 2011 +0100 Document that av_write_header sets stream time_base to a value of it chosing. Signed-off-by: Janne Grunau Signed-off-by: Michael Niedermayer commit fabb93e3974fc56429bfe68cfdd1c706788c29ec Author: Janne Grunau Date: Sun Feb 13 17:18:07 2011 +0100 spdifenc: update 482d98f69b2eb7a7b0b5054101a43db384e9432b to the latest patch "spdifenc: IEC 61937 encapsulation of DTS-HD for HDMI" (cherry picked from commit ec25f83bd98e10c023e6c7b07da1dcfc4d80cefc) commit 660ab0e64d0c3eaa3d3927e3ad00b537ec1b633d Author: Justin Ruggles Date: Tue Feb 15 18:46:56 2011 +0000 ac3enc: change default floor code to 7. This is to match the value in every (E-)AC-3 file from commercial sources. It has a negligible effect on audio quality. Signed-off-by: Mans Rullgard (cherry picked from commit 50d7140441b61809ad4ba4ea7b4ad8fe77bc6888) commit a41aebf1535da0cb2b2e64e060d50cad73e0b1fa Author: Max Shakhmetov Date: Tue Feb 15 17:49:27 2011 +0100 os_support: fix poll() implementation Our poll implementation does not iterate over the pollfd array properly while setting the revents. Signed-off-by: Luca Barbato (cherry picked from commit 9ac2085dbf1821b7995fe360038c1bf0f3940032) commit 7ffe76e540297ad4df2896064f83cb1adbd81fd9 Author: Reinhard Tartler Date: Mon Feb 7 14:37:08 2011 +0100 Merge libavcore into libavutil Done to keep ABI compatible. Otherwise this is just silly commit 1f004fc512babe8215e2aa31fa4770aa27812cab Author: Justin Ruggles Date: Wed Feb 16 14:04:04 2011 -0500 ac3dsp: Change punpckhqdq to movhlps in ac3_max_msb_abs_int16(). Signed-off-by: Ronald S. Bultje commit 41cdc1ff1e86f1bfb935e1bde53ccc9c645ff71e Author: Maksym Veremeyenko Date: Wed Feb 16 09:52:44 2011 +0200 fix nsvdec.c compilation if DEBUG macro defined Signed-off-by: Ronald S. Bultje commit 22ec6b738f1608e4b959fb655cf37c3343ec7e9f Author: Balint Marton Date: Wed Feb 16 00:17:13 2011 +0000 Fix av_find_best_stream when using a program The current implementation has a bug, it is returning the stream index in the found program, and not the stream index in the list of all streams. The attached patch fixes this issue. Signed-off-by: Mans Rullgard commit 938b62538a719785bce0f1d49d3065937b29e3aa Author: Stefano Sabatini Date: Mon Feb 14 10:59:25 2011 +0100 Document audio_resample_close(). Signed-off-by: Janne Grunau commit 54955283655f918db4e9c8ec5a254f06a10646a6 Author: Stefano Sabatini Date: Mon Feb 14 10:59:14 2011 +0100 Apply minor cosmetics fixes to the av_audio_resample_init() doxy. Signed-off-by: Michael Niedermayer Signed-off-by: Janne Grunau commit 5d820db2f9c396373f2293e6b41944093a4766d5 Author: Reimar Döffinger Date: Sat Jan 29 13:53:14 2011 +0100 Document that av_write_header sets stream time_base to a value of it chosing. Signed-off-by: Janne Grunau commit ec25f83bd98e10c023e6c7b07da1dcfc4d80cefc Author: Janne Grunau Date: Sun Feb 13 17:18:07 2011 +0100 spdifenc: update 482d98f69b2eb7a7b0b5054101a43db384e9432b to the latest patch "spdifenc: IEC 61937 encapsulation of DTS-HD for HDMI" commit fad8143f5b9689e0e2dafe46500d944cfa58a911 Author: Michael Niedermayer Date: Wed Feb 16 02:09:46 2011 +0100 vbv_delay AVOption for ABI compatibility Signed-off-by: Michael Niedermayer commit 2f6c6a346234c4b7004f21c54de80f113cfb224a Author: Mans Rullgard Date: Tue Feb 15 14:18:49 2011 +0000 APIchanges: update for 55bad0c: vbv_delay Signed-off-by: Mans Rullgard (cherry picked from commit 8ed4cc65a19b5a6cc7ae6ed5072be2d3836dbeb2) Signed-off-by: Michael Niedermayer commit b6d0700058aeb6ef2c4655d6738c51ed2eb80e56 Author: Christophe Massiot Date: Thu Feb 10 16:38:03 2011 +0100 Pass VBV delay to the calling application via ctx VBV delay is useful for T-STD compliance in some TS muxers. It is certainly possible to retrieve it by parsing the output of FFmpeg, but getting it from the context makes it simpler and less error-prone. Signed-off-by: Mans Rullgard Signed-off-by: Michael Niedermayer commit 50d7140441b61809ad4ba4ea7b4ad8fe77bc6888 Author: Justin Ruggles Date: Tue Feb 15 18:46:56 2011 +0000 ac3enc: change default floor code to 7. This is to match the value in every (E-)AC-3 file from commercial sources. It has a negligible effect on audio quality. Signed-off-by: Mans Rullgard commit 9ac2085dbf1821b7995fe360038c1bf0f3940032 Author: Max Shakhmetov Date: Tue Feb 15 17:49:27 2011 +0100 os_support: fix poll() implementation Our poll implementation does not iterate over the pollfd array properly while setting the revents. Signed-off-by: Luca Barbato commit c4c9fb4690a6df0ca37e78206fe528d9cc102c85 Author: Peter Ross Date: Tue Feb 15 11:59:45 2011 +0000 binkaudio: remove unused copy of AVCodecContext* Signed-off-by: Mans Rullgard (cherry picked from commit 71f88b1f3843fdb676d6f72181da0c8c460341d8) commit 136901567c44a653485b5e97caff4fee09424b18 Author: Peter Ross Date: Tue Feb 15 11:58:51 2011 +0000 binkaudio: fix channel count check Perform validity check on AVFormatContext.channels instead of uninitialised field. This fixes issue 2001. Signed-off-by: Mans Rullgard (cherry picked from commit 9806fbd5351fa84f99fa5b18fe06859acb514f34) commit 73b3b52285db58844161a91616548b3bf9c86220 Author: Maksym Veremeyenko Date: Tue Feb 15 13:51:45 2011 +0200 fix nsvdec.c compilation if DEBUG defined Signed-off-by: Ronald S. Bultje (cherry picked from commit d06497f316ed819ea0ca0fad2535342ec42c79a5) commit ece6cca14a403810a075996d1abdffb6917bafd0 Author: Young Han Lee Date: Mon Feb 14 18:09:43 2011 +0900 aacdec: Implement LTP support. Ported from gsoc svn. (cherry picked from commit ead15f1dc196ad164d105e31c8c9025f8a4ee4e7) commit d3c4829a0d5db65e900c7321fb2cf8d86f03f43b Author: Anssi Hannula Date: Mon Feb 14 17:50:08 2011 +0000 APIchanges: update for 12c14cd Signed-off-by: Mans Rullgard (cherry picked from commit 77c330a046d668373cbd9542f3e1d4746916b02f) commit 5c878d4b1ce14e360a94f91aa92c3bc087958b30 Author: Mans Rullgard Date: Mon Feb 14 23:14:25 2011 +0000 mpegtsenc: whitespace cosmetics Signed-off-by: Mans Rullgard (cherry picked from commit 2dd1ee4bfe85f41b771bf8fe1c2cfa2d833b5de3) commit 932a45a5944661ca68626894c228ca16a46fd2dc Author: Anssi Hannula Date: Mon Feb 14 18:43:41 2011 +0000 mpegtsenc: set audio_type according to st->disposition Signed-off-by: Mans Rullgard (cherry picked from commit 3f2d3a1904c1ccdfdc3bd03a6dd6567986f681d9) commit e2db6b590f8462556643964f7d78d71203c80dbb Author: Anssi Hannula Date: Mon Feb 14 18:55:04 2011 +0000 mpegts: set st->disposition according to ISO 639 language descriptor Signed-off-by: Mans Rullgard (cherry picked from commit 60e7306643054e93dfc1962f89b24554bb76e18a) commit 3c9fcab5548c6abe9126415afe3c96082eac9d82 Author: Mans Rullgard Date: Mon Feb 14 23:17:18 2011 +0000 apichanges: update for 24a83bd: add AV_DISPOSITION_CLEAN_EFFECTS flag Signed-off-by: Mans Rullgard (cherry picked from commit 935ee1b9bba3d2fa1bf0d48eef278956307478cb) commit 2ea7e1f011438ee180c6260c74fe3894327a21f2 Author: Anssi Hannula Date: Mon Feb 14 18:43:38 2011 +0000 lavf: add AV_DISPOSITION_CLEAN_EFFECTS flag Signed-off-by: Mans Rullgard (cherry picked from commit 24a83bd10a1ed56cadd2c475b839887752f23183) commit 737eb5976f6a37703923ce3c3d5e6ca8eeabb43a Author: Reinhard Tartler Date: Mon Feb 7 14:37:08 2011 +0100 Merge libavcore into libavutil It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler commit 8ed4cc65a19b5a6cc7ae6ed5072be2d3836dbeb2 Author: Mans Rullgard Date: Tue Feb 15 14:18:49 2011 +0000 APIchanges: update for 55bad0c: vbv_delay Signed-off-by: Mans Rullgard commit 55bad0c602c75a2c7e4dbfa466edacb0bad6a6eb Author: Christophe Massiot Date: Thu Feb 10 16:38:03 2011 +0100 Pass VBV delay to the calling application via ctx VBV delay is useful for T-STD compliance in some TS muxers. It is certainly possible to retrieve it by parsing the output of FFmpeg, but getting it from the context makes it simpler and less error-prone. Signed-off-by: Mans Rullgard commit 71f88b1f3843fdb676d6f72181da0c8c460341d8 Author: Peter Ross Date: Tue Feb 15 11:59:45 2011 +0000 binkaudio: remove unused copy of AVCodecContext* Signed-off-by: Mans Rullgard commit 9