[mythtv-commits] mythtv branch fixes/0.27 updated by jyavenard. v0.27.3-58-geeda1f8

Git Repo Owner noreply at mythtv.org
Wed Jul 9 00:49:44 UTC 2014


The branch, fixes/0.27 has been updated on the
mythtv repository by gitolite user jyavenard.
       via  eeda1f8f573a9747acead568bfb716df2f32afcd (commit)
       via  f4195b2eb88296523351813c29933e81e6bd851f (commit)
       via  fb9128b0512bb2473aefc1a6e87440a55f415171 (commit)
       via  c45e4920ad25d2ebb0ac11f972558106966afee7 (commit)
       via  31aef53626a4914c9465dca22ce75e76299b508f (commit)
       via  87b0230ef50c6f3ae5819d404a0206b65c41ea5c (commit)
       via  2d88dbd22be3caa08306f999eaf544e880aa48c8 (commit)
       via  8d807213309e6b6d8cbe8c79a4c96905ce3fa970 (commit)
       via  cbb74c1c439450f887c4ca1b971b5c58d2810594 (commit)
       via  48cb345c03a669d13f54465cca4a74922cc70322 (commit)
       via  26ba790bb4905c0890fa9155c6ba686fc17dc079 (commit)
       via  e26bec8a48d27316114689cba7903436e9405ba3 (commit)
       via  6deeb7675355fa430154c67d63a369da9c3cb8cb (commit)
       via  9a89652241d88426161a6f610e3545f352424b5e (commit)
       via  8034a717f08a5b3bcb36e62ad4f59f52aae7fbc5 (commit)
       via  f9b07037530bba797bafe9b7756585ae5c457eec (commit)
       via  c3109ab2898946c5c8a69156d0c58851e49fe212 (commit)
       via  6da1833cc60a2fb6a90245207b979f8a1d227b33 (commit)
       via  a4016354b4261c2dcb678c6abbec33681beb1419 (commit)
       via  8db69da71a80e3c69f0086244ced8c1e534a7d94 (commit)
       via  c38807fda2c3dd533eff23c65237afdd94b6b747 (commit)
       via  34f75574dd644f691442b088c3a9b047da1d1cb6 (commit)
       via  b1560f20677924316fc9efe8eb36176b7ffe6504 (commit)
       via  86048f1203b4e8065a9f3ef264c296f6887cd0d3 (commit)
       via  127b0ddb7e3438d7760dbf9517aa08d266e6b9fc (commit)
       via  b0e5dad86840ecd6e488f9efe50d421b4d72a2a1 (commit)
       via  4064035e00c39ebd24bf17e0f3fb04d5fb0f9537 (commit)
       via  e8ada5f69661224c984ec7c0c1d5e64ab0c0f910 (commit)
       via  eb75408e66b6396f65c4288095133082b550d914 (commit)
       via  19546857e9d66e9e3728ff2bd6bb20c99f8db93b (commit)
       via  023a2b219d75ae75d8e64a5de0bff2e1e914bb62 (commit)
       via  dd1a76d33a54a6cd63c803827120ccbe128402be (commit)
       via  532219c8ec50b2828e4395537f06b29d3a5533e2 (commit)
       via  054c75104fea99e9c88f23c2acc186d89e0ebd96 (commit)
       via  398e045e4250172ed8ac36052e556bbe5a861226 (commit)
       via  e506ac106b0b14af32adee1e3fd8f512d4ac9968 (commit)
       via  887273a16052def543beb2f2f55f0e44d890fb88 (commit)
       via  5a52808474b7f63c073bdbb4193d606c7b0cf697 (commit)
       via  c99f73ba1a3e1d51c18148a5c29a7eac73a11853 (commit)
       via  828d7ef03b3c735cd22b86d9752a2cc71929a751 (commit)
       via  5869ae06f47a9fed73e7340bcdc5435cb16a4960 (commit)
       via  2faa9a0ab84ff1947e633296d93149812099a649 (commit)
       via  93c91ddcf079b3dd50a29fb514678b197e312763 (commit)
       via  1aa2f99a4e86e590bc1b39a29fc7734189c5a839 (commit)
       via  ef0a049d3506afa254a698e0f041e002def3af7e (commit)
       via  ec938e9390e9cef806d69e44de29ad2cf6982543 (commit)
       via  6d743290d8ec2c399741404ad2e2d9482c32263f (commit)
       via  2a3e0b91ffd450a8895c4fe1861a6b4df9bbd869 (commit)
       via  28d615e58890edecdc4bddbe7a82f563805b3081 (commit)
       via  8d5cf2a69c2c988960efd346069ced53fdb9ec58 (commit)
       via  2b88a8a952249a7fc85e4cf6b6d6a79858546bc2 (commit)
       via  4d7b305afc071addb06b566ac1d9fbadd431c741 (commit)
      from  fba8e800c98356bd06ee03087b6b421f94610490 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit eeda1f8f573a9747acead568bfb716df2f32afcd
Author:    Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 25 Jun 2014 11:31:43 +1000
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 10:23:50 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=eeda1f8f573a9747acead568bfb716df2f32afcd

Fix PiP when using OpenGL output
Viewport must be of the output window, not of the main video currently playing

(cherry picked from commit bbcecc404e5fad4972eca627374dcafbc8011c94)



commit f4195b2eb88296523351813c29933e81e6bd851f
Author:    Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:19:07 +1000
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:19:07 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=f4195b2eb88296523351813c29933e81e6bd851f

bump FFmpeg to 1.2.7



commit fb9128b0512bb2473aefc1a6e87440a55f415171
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 23 Jun 2014 18:32:54 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:33 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=fb9128b0512bb2473aefc1a6e87440a55f415171

Update for FFmpeg 1.2.7
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit c45e4920ad25d2ebb0ac11f972558106966afee7
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 15 Jun 2014 00:49:02 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:33 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=c45e4920ad25d2ebb0ac11f972558106966afee7

avformat/mpc: attempt to allocate a packet that is not smaller than the data inside it
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 86a9370e2b91d67375e66a06d6eb573b5a017775)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 31aef53626a4914c9465dca22ce75e76299b508f
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 8 Jun 2014 14:30:30 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:33 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=31aef53626a4914c9465dca22ce75e76299b508f

avcodec/alsdec: Clear MPEG4AudioConfig so that no use of uninitialized memory is possible
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6e6bd5481cf42a9765c492c77754d4633092cece)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 87b0230ef50c6f3ae5819d404a0206b65c41ea5c
Author:    Michael Niedermayer <michaelni at gmx.at> at Sat, 7 Jun 2014 12:03:31 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:33 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=87b0230ef50c6f3ae5819d404a0206b65c41ea5c

avformat/flvenc: Do not allow creating h263/mpeg4 in flv without unofficial format extensions being enabled.
Found-by: Jean-Baptiste Kempf <jb at videolan.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 74760883fcb4443d105814ed246b3cf51d7e9dca)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 2d88dbd22be3caa08306f999eaf544e880aa48c8
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 25 May 2014 05:19:09 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:32 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=2d88dbd22be3caa08306f999eaf544e880aa48c8

avcodec/mss4: Fix () in MKVAL() macro
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit cf7ff0146c76b93c32edf5230a28b9590acf5105)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 8d807213309e6b6d8cbe8c79a4c96905ce3fa970
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 25 May 2014 05:18:47 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:32 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=8d807213309e6b6d8cbe8c79a4c96905ce3fa970

avcodec/mss34dsp: fix () in SOP* macros
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6e720c5c815e510188a0bda654662383f2c48050)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit cbb74c1c439450f887c4ca1b971b5c58d2810594
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 25 May 2014 05:17:51 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:32 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=cbb74c1c439450f887c4ca1b971b5c58d2810594

avcodec/mlpdec: fix () in MSB_MASK() macro
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit fa160af08b6f42f17e93124aef86e3f6eec70d51)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 48cb345c03a669d13f54465cca4a74922cc70322
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 25 May 2014 03:27:56 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:32 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=48cb345c03a669d13f54465cca4a74922cc70322

avcodec/golomb-test: fix () in EXTEND() macro
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 97e6b5ee3a16fee7d130f19f4dcee030f14d91cf)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 26ba790bb4905c0890fa9155c6ba686fc17dc079
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 25 May 2014 03:19:47 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:31 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=26ba790bb4905c0890fa9155c6ba686fc17dc079

avcodec/aac: fix () in IS_CODEBOOK_UNSIGNED macro
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit fa915d4193e13187773c500b80c7df6baeb22c3b)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit e26bec8a48d27316114689cba7903436e9405ba3
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 21 May 2014 03:02:06 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:31 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=e26bec8a48d27316114689cba7903436e9405ba3

avcodec/libvorbisenc: dont add the duration to AV_NOPTS_VALUE
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 19e66c7232d96e4ae8f05b52da2b84dfaa4e4da3)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 6deeb7675355fa430154c67d63a369da9c3cb8cb
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 20 May 2014 05:23:52 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:31 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=6deeb7675355fa430154c67d63a369da9c3cb8cb

avutil/cpu: force mmx on selection of higher x86 SIMD features
Fixes various runtime failures with manually set flags that represent no
existing CPU

Fixes Ticket3653

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6310eb8010b7a3b3016e297132380cbd4e3d2d10)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 9a89652241d88426161a6f610e3545f352424b5e
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 19 May 2014 06:19:23 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:31 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=9a89652241d88426161a6f610e3545f352424b5e

avcodec/diracdec: move mc buffer allocation to per frame
Fixes out of array accesses for non default buffers with large strides

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 4a30f08505a4e85718896ff233c97be41a9754ca)
(cherry picked from commit 9c9fc79d9237d28e33161cb2e75082d8ad232b2e)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 8034a717f08a5b3bcb36e62ad4f59f52aae7fbc5
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 28 Apr 2014 04:01:50 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:31 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=8034a717f08a5b3bcb36e62ad4f59f52aae7fbc5

avfilter/graphdump: Fix pointer to local outside scope
Fixes CID1194435
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 18af0ce62da322176f7bd283b85314d2f41bee2c)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit f9b07037530bba797bafe9b7756585ae5c457eec
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 27 Apr 2014 05:32:56 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:30 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=f9b07037530bba797bafe9b7756585ae5c457eec

avcodec/mjpegdec: Fix undefined shift
Fixes CID1194388

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit b4329605289e25bb071ec1c1182bf25fc83b09aa)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit c3109ab2898946c5c8a69156d0c58851e49fe212
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 27 Apr 2014 03:45:12 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:30 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=c3109ab2898946c5c8a69156d0c58851e49fe212

ffmpeg_filter: fix pointer to local outside scope
Fixes CID1206652
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 09b16619d33ddf93005060d0782f28a1c1cbb7f6)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 6da1833cc60a2fb6a90245207b979f8a1d227b33
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 24 Apr 2014 01:25:46 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:30 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=6da1833cc60a2fb6a90245207b979f8a1d227b33

swresample: fix AV_CH_LAYOUT_STEREO_DOWNMIX input
Fixes Ticket 3542

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 291d464161a5bf3b566bc147f83e4242b0c18d74)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit a4016354b4261c2dcb678c6abbec33681beb1419
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 23 Apr 2014 21:47:48 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:30 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=a4016354b4261c2dcb678c6abbec33681beb1419

avformat/h263dec: Fix h263 probe
The code was missing 1 bit in the src format

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit fc145e576a443bfc89efdf35b91fd3c9ca0d8388)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 8db69da71a80e3c69f0086244ced8c1e534a7d94
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 23 Apr 2014 06:04:50 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:30 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=8db69da71a80e3c69f0086244ced8c1e534a7d94

avformat/mux: Check for and remove invalid packet durations
Fixes assertion failure
Fixes Ticket3575

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit dc6a17cf74a90e41d70ea1753cdb70c0a5b2ced8)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit c38807fda2c3dd533eff23c65237afdd94b6b747
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 23 Jun 2014 14:45:47 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:29 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=c38807fda2c3dd533eff23c65237afdd94b6b747

avutil/lzo: add asserts to be double sure against overflows
These asserts cannot fail since d6af26c55c1ea30f85a7d9edbc373f53be1743ee

Based-on: ccda51b14c0fcae2fad73a24872dce75a7964996
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit cf2b7c01f81c1fb3283a1390c0ca9a2f81f4f4a8)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 34f75574dd644f691442b088c3a9b047da1d1cb6
Author:    Michael Niedermayer <michaelni at gmx.at> at Fri, 20 Jun 2014 03:15:28 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:29 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=34f75574dd644f691442b088c3a9b047da1d1cb6

avutil/lzo: Fix integer overflow
Embargoed-till: 2014-06-27 requested by researcher, but embargo broken by libav today (git and mailing list)

Fixes: LMS-2014-06-16-4
Found-by: "Don A. Bailey" <donb at securitymouse.com>
See: ccda51b14c0fcae2fad73a24872dce75a7964996
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit d6af26c55c1ea30f85a7d9edbc373f53be1743ee)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit b1560f20677924316fc9efe8eb36176b7ffe6504
Author:    Xi Wang <xi.wang at gmail.com> at Fri, 15 Mar 2013 06:59:22 -0400
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:29 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=b1560f20677924316fc9efe8eb36176b7ffe6504

lzo: fix overflow checking in copy_backptr()
The check `src > dst' in the form `&c->out[-back] > c->out' invokes
pointer overflow, which is undefined behavior in C.

Remove the check.  Also replace `&c->out[-back] < c->out_start' with
a safe form `c->out - c->out_start < back' to avoid overflow.

CC: libav-stable at libav.org

Signed-off-by: Xi Wang <xi.wang at gmail.com>
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
(cherry picked from commit ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 86048f1203b4e8065a9f3ef264c296f6887cd0d3
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 21 Apr 2014 11:33:17 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:29 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=86048f1203b4e8065a9f3ef264c296f6887cd0d3

avfilter/filtfmts: Support dynamically allocated in/outputs
Fixes crash
Fixes Ticket3468

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 59c7615d58b5b7ea9caff2c8c774677973eb4f1c)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 127b0ddb7e3438d7760dbf9517aa08d266e6b9fc
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 16 Apr 2014 02:06:37 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:29 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=127b0ddb7e3438d7760dbf9517aa08d266e6b9fc

iavcodec/vc1dec: Fix missing {}
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit cb53beb81a5b9192c79de401f1e1e13fadddc429)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit b0e5dad86840ecd6e488f9efe50d421b4d72a2a1
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 16 Apr 2014 02:06:37 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:28 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=b0e5dad86840ecd6e488f9efe50d421b4d72a2a1

avfilter/vf_deshake: fix loss of precission with odd resolutions
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 73734282e0e4df92269984ee1671424e39249481)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 4064035e00c39ebd24bf17e0f3fb04d5fb0f9537
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 16 Apr 2014 02:55:13 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:28 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=4064035e00c39ebd24bf17e0f3fb04d5fb0f9537

avcodec/g723_1: add assert to help static code analyzers
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 1457f3fd90e17745791354fbb87899fc4803085a)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit e8ada5f69661224c984ec7c0c1d5e64ab0c0f910
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 16 Apr 2014 02:06:37 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:28 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=e8ada5f69661224c984ec7c0c1d5e64ab0c0f910

avcodec/diracdec: fix undefined behavior with shifts
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit b8598f6ce61ccda3f2ff0c730b009fb650e42986)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit eb75408e66b6396f65c4288095133082b550d914
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 16 Apr 2014 02:06:37 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:28 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=eb75408e66b6396f65c4288095133082b550d914

avformat/mpegts: Remove redundant check
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit ff6fa0b4b980fc5b9f7653d7b159ae02c3d95210)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 19546857e9d66e9e3728ff2bd6bb20c99f8db93b
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 16 Apr 2014 02:06:37 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:27 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=19546857e9d66e9e3728ff2bd6bb20c99f8db93b

avcodec/mjpegen: Fix declared argument size
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 256f530603ef3838a712a4fcd737b46b7bce455e)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 023a2b219d75ae75d8e64a5de0bff2e1e914bb62
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 16 Apr 2014 01:55:08 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:27 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=023a2b219d75ae75d8e64a5de0bff2e1e914bb62

swscale/swscale: fix srcStride/srcSlice typo
Fixes part of Ticket3466
Found by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 14fa7fc6a81d5e59e05243cdc92108eab1b138ac)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit dd1a76d33a54a6cd63c803827120ccbe128402be
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 14 Apr 2014 17:29:27 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:27 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=dd1a76d33a54a6cd63c803827120ccbe128402be

avcodec/x86/idct_sse2_xvid: fix non C99 inline function
Found-by: Matt Oliver <protogonoi at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 46d5625f44185271862337d61cd246fd569c42a4)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 532219c8ec50b2828e4395537f06b29d3a5533e2
Author:    Anthoine Bourgeois <anthoine.bourgeois at gmail.com> at Wed, 9 Apr 2014 12:18:32 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:27 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=532219c8ec50b2828e4395537f06b29d3a5533e2

avcodec/dirac_arith: Fix build with PIC and stack-check options
Fixes Ticket3540

The function dirac_get_arith_bit in libavcodec/dirac_arith.h can't be
built with PIC and check-stack because the asm code needs 6 registers
and PIC and check-stack options take 1 each and x86 is quite limited
in this area.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit d8ab7f31dd819f7b3e0d460a2fa4261aaae87b98)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 054c75104fea99e9c88f23c2acc186d89e0ebd96
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 8 Apr 2014 18:12:12 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:27 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=054c75104fea99e9c88f23c2acc186d89e0ebd96

swscale/x86/swscale_template: loose hardcoded dstw_offset
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit f6759d9ad4a8b71e6f212ca4f1e7da9fa56d3298)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 398e045e4250172ed8ac36052e556bbe5a861226
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 8 Apr 2014 00:29:26 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:26 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=398e045e4250172ed8ac36052e556bbe5a861226

swresample/resample: use av_malloc_array() where appropriate
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 5027f39712fdce25b9008e72d52e5abfeefd5fe6)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit e506ac106b0b14af32adee1e3fd8f512d4ac9968
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 8 Apr 2014 00:29:06 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:26 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=e506ac106b0b14af32adee1e3fd8f512d4ac9968

swresample/dither: use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit a5290cb1ac047851563da7aca06569e3ada55f79)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 887273a16052def543beb2f2f55f0e44d890fb88
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 8 Apr 2014 00:19:07 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:26 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=887273a16052def543beb2f2f55f0e44d890fb88

swresample/resample: Limit filter length
Related to CID1197063

The limit choosen is arbitrary and much larger than what makes sense.
It avoids the need for checking arithmetic operations with the length for overflow

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit f9158b01d0f3effb58e87fb07db0382bc1e47de5)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 5a52808474b7f63c073bdbb4193d606c7b0cf697
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 6 Apr 2014 04:01:24 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:26 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=5a52808474b7f63c073bdbb4193d606c7b0cf697

avcodec/msrle: check return code for success before use
The check is possibly redundant, but better to check for errors
that dont occur than to skip the check and crash

Fixes CID1197060

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 754f84663e8b3a88fa2e953b195d59230393fb8d)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit c99f73ba1a3e1d51c18148a5c29a7eac73a11853
Author:    Michael Niedermayer <michaelni at gmx.at> at Sat, 5 Apr 2014 21:34:03 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:26 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=c99f73ba1a3e1d51c18148a5c29a7eac73a11853

avcodec/wma: use av_freep(), do not leave stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit d167faafe9dfa0b82bebb267c3c4e5fa5286bd67)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 828d7ef03b3c735cd22b86d9752a2cc71929a751
Author:    Lukasz Marek <lukasz.m.luki at gmail.com> at Fri, 4 Apr 2014 19:28:45 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:25 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=828d7ef03b3c735cd22b86d9752a2cc71929a751

lavu/opt: validate range before dereference
This change make error handling simplier.
av_opt_freep_ranges may be called when some ranges are NULL,
for example after memory allocation fail.

Signed-off-by: Lukasz Marek <lukasz.m.luki at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 3aac5fcfa9d3748659d78ab2a66d0ccce22cfd4f)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 5869ae06f47a9fed73e7340bcdc5435cb16a4960
Author:    Michael Niedermayer <michaelni at gmx.at> at Fri, 28 Mar 2014 00:03:38 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:25 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=5869ae06f47a9fed73e7340bcdc5435cb16a4960

avcodec/libx264: move where x264opts is applied down so it isnt overridden by avctx & defaults
fixes x264opts opengop=1

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 64b79141bdfdffaa9fda69eecce140473d0a9a18)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 2faa9a0ab84ff1947e633296d93149812099a649
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 26 Mar 2014 18:09:23 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:25 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=2faa9a0ab84ff1947e633296d93149812099a649

avcodec/h264_mp4toannexb_bsf: prepend global headers before any in stream parameter sets
Fixes h264_mp4toannexb_bsf_failure.mkv

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 289b149cecb381522cc9ccdf382825330169c655)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 93c91ddcf079b3dd50a29fb514678b197e312763
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 25 Mar 2014 00:15:52 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:25 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=93c91ddcf079b3dd50a29fb514678b197e312763

avcodec/x86/mpegvideoenc_template: fix integer overflow
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 1aa2f99a4e86e590bc1b39a29fc7734189c5a839
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 24 Mar 2014 05:01:32 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:24 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=1aa2f99a4e86e590bc1b39a29fc7734189c5a839

swscale/swscale: fix integer overflow
Should fix fate failure with clang ftrapv

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit c9c0451224fd7bc38b4e135e99f114f80c1ae67f)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit ef0a049d3506afa254a698e0f041e002def3af7e
Author:    Carl Eugen Hoyos <cehoyos at ag.or.at> at Sat, 21 Jun 2014 19:35:06 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:24 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=ef0a049d3506afa254a698e0f041e002def3af7e

Show duration for large asf files as written in the file header.
Fixes ticket #3428.
(cherry picked from commit e3fd263f0b73e4425192d6dd1ab18027ecaa35db)

Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit ec938e9390e9cef806d69e44de29ad2cf6982543
Author:    Carl Eugen Hoyos <cehoyos at ag.or.at> at Fri, 20 Jun 2014 01:58:14 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:24 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=ec938e9390e9cef806d69e44de29ad2cf6982543

Revert two backports to release/1.2 that broke fate.
Revert "ff_id3v2_read: add option to limit ID3 magic number search"
Revert "ff_id3v2_free_extra_meta: set the pointer pointing to extra_meta to NULL"

This reverts commit 7f8aa37bc3666d060b3eb2baa02fcea3597a22fd.
This reverts commit 5219e20d58e15305e188ba60a75bfc37a1f82341.

Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 6d743290d8ec2c399741404ad2e2d9482c32263f
Author:    Martin Storsjö <martin at martin.st> at Fri, 6 Jun 2014 12:03:09 +0300
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:24 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=6d743290d8ec2c399741404ad2e2d9482c32263f

adpcm: Write the proper predictor in trellis mode in IMA QT
The actual predictor value, set by the trellis code, never
was written back into the variable that was written into
the block header. This was accidentally removed in b304244b.

This significantly improves the audio quality of the trellis
case, which was plain broken since b304244b.

Encoding IMA QT with trellis still actually gives a slightly
worse quality than without trellis, since the trellis encoder
doesn't use the exact same way of rounding as in
adpcm_ima_qt_compress_sample and adpcm_ima_qt_expand_nibble.

Fixes part of Ticket3701

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit fa8f060b75bf9074792a0f9ff4ed002652ef62b8)

Conflicts:
	tests/ref/acodec/adpcm-ima_qt-trellis
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 2a3e0b91ffd450a8895c4fe1861a6b4df9bbd869
Author:    Martin Storsjö <martin at martin.st> at Thu, 5 Jun 2014 11:56:10 +0300
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:24 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=2a3e0b91ffd450a8895c4fe1861a6b4df9bbd869

adpcm: Fix trellis encoding of IMA QT
This was broken in 095be4fb - samples+ch (for the previous
non-planar case) equals &samples_p[ch][0]. The confusion
probably stemmed from the IMA WAV case where it originally
was &samples[avctx->channels + ch], which was correctly
changed into &samples_p[ch][1].

Fixes part of Ticket3701

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit a32765c4252eb106a2ade543026ef6f59e699bfa)
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 28d615e58890edecdc4bddbe7a82f563805b3081
Author:    Carl Eugen Hoyos <cehoyos at ag.or.at> at Thu, 29 May 2014 08:41:15 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:23 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=28d615e58890edecdc4bddbe7a82f563805b3081

avcodec/utvideodec: Increase vlc len
Fixes a regression since fb3e380 similar to ticket #2661,
reported by fluffrabbit at aol dot com.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 673716c54b39eba9579a38ad222130e3f9549167)

Conflicts:
	libavcodec/utvideodec.c
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 8d5cf2a69c2c988960efd346069ced53fdb9ec58
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 4 Jun 2014 05:04:13 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:17:23 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=8d5cf2a69c2c988960efd346069ced53fdb9ec58

avformat/avidec: allow rounding errors between scale/rate and timebase
Fixes Ticket3670

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 571ab8344a9a2864d22d01af41283cee9328b927)

Conflicts:
	libavformat/avidec.c
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 2b88a8a952249a7fc85e4cf6b6d6a79858546bc2
Author:    Lawrence Rust <lvr at softsystem.co.uk> at Fri, 7 Mar 2014 19:31:42 +0000
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:14:41 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=2b88a8a952249a7fc85e4cf6b6d6a79858546bc2

Fix 0b9470c Fix fileringbuffer locking...
Commit 0b9470c (Fix fileringbuffer locking up on read()) modified
FileRingBuffer::safe_read to use fstat() to check the file size
before reading.  The new code compares (internalreadpos + tot)
with the reported size.  This is mostly correct except when
MythPlayer::SwitchProgram detects the transition across a livetv
programme boundary.  In this case internalreadpos holds the read
position for the old file until the decoder calls FileChanged().

This patch includes readAdjust (set by SetAdjustFilesize()) to
correctly determine the current read position in the file.

Signed-off-by: Lawrence Rust <lvr at softsystem.co.uk>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>
(cherry picked from commit 363361a9e26322d9e6a87e17effc50add8653533)



commit 4d7b305afc071addb06b566ac1d9fbadd431c741
Author:    Lawrence Rust <lvr at softsystem.co.uk> at Wed, 4 Jul 2012 16:39:13 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Wed, 9 Jul 2014 09:09:40 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=4d7b305afc071addb06b566ac1d9fbadd431c741

Player: Don't call DoneDisplayingFrame for PiP until next frame is ready
When displaying 'pictute in picture' (PiP), VideoOutput::ShowPIP
composites the PiP windows onto the main video frame.  To do so, it uses
the player's GetCurrentFrame method to obtain the most recently displayed
PiP frame.  However, MythPlayer::DisplayNormalFrames immediately releases
the last frame displayed back to the decoding queue.  Consequently when
GetCurrentFrame calls GetLastShownFrame to obtain that frame it may have been
overwritten by the decoder thread.

This patch defers calling DoneDisplayingFrame if the player is a PiP
player so that future calls to GetLastShownFrame return an intact frame.

Fixes #10878

Signed-off-by: Lawrence Rust <lvr at softsystem.co.uk>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>
(cherry picked from commit 49df62f1a76f0e617208e261a09f5f8a634b3ce9)

Conflicts:
	mythtv/libs/libmythtv/mythplayer.cpp



-----------------------------------------------------------------------

Summary of changes:
 mythtv/external/FFmpeg/README.sync                 |    3 +-
 mythtv/external/FFmpeg/RELEASE                     |    2 +-
 mythtv/external/FFmpeg/VERSION                     |    2 +-
 mythtv/external/FFmpeg/doc/Doxyfile                |    2 +-
 mythtv/external/FFmpeg/ffmpeg_filter.c             |    9 ++-
 mythtv/external/FFmpeg/libavcodec/aac.h            |    2 +-
 mythtv/external/FFmpeg/libavcodec/adpcmenc.c       |    3 +-
 mythtv/external/FFmpeg/libavcodec/alsdec.c         |    2 +-
 mythtv/external/FFmpeg/libavcodec/dirac_arith.h    |    3 +-
 mythtv/external/FFmpeg/libavcodec/diracdec.c       |   49 ++++++++++---
 mythtv/external/FFmpeg/libavcodec/g723_1.c         |    3 +-
 mythtv/external/FFmpeg/libavcodec/golomb-test.c    |    2 +-
 .../FFmpeg/libavcodec/h264_mp4toannexb_bsf.c       |    2 +-
 mythtv/external/FFmpeg/libavcodec/libvorbisenc.c   |    3 +-
 mythtv/external/FFmpeg/libavcodec/libx264.c        |   26 +++---
 mythtv/external/FFmpeg/libavcodec/mjpegdec.c       |    2 +-
 mythtv/external/FFmpeg/libavcodec/mjpegenc.c       |    2 +-
 mythtv/external/FFmpeg/libavcodec/mjpegenc.h       |    2 +-
 mythtv/external/FFmpeg/libavcodec/mlpdec.c         |    2 +-
 mythtv/external/FFmpeg/libavcodec/msrle.c          |    3 +
 mythtv/external/FFmpeg/libavcodec/mss34dsp.c       |    4 +-
 mythtv/external/FFmpeg/libavcodec/mss4.c           |    2 +-
 mythtv/external/FFmpeg/libavcodec/utvideodec.c     |    2 +-
 mythtv/external/FFmpeg/libavcodec/vc1dec.c         |    3 +-
 mythtv/external/FFmpeg/libavcodec/wma.c            |    6 +-
 .../FFmpeg/libavcodec/x86/idct_sse2_xvid.c         |    2 +-
 .../FFmpeg/libavcodec/x86/mpegvideoenc_template.c  |    2 +-
 mythtv/external/FFmpeg/libavfilter/filtfmts.c      |   10 +-
 mythtv/external/FFmpeg/libavfilter/graphdump.c     |    3 +-
 mythtv/external/FFmpeg/libavfilter/vf_deshake.c    |    4 +-
 mythtv/external/FFmpeg/libavformat/aiffdec.c       |    2 +-
 mythtv/external/FFmpeg/libavformat/asfdec.c        |    5 +-
 mythtv/external/FFmpeg/libavformat/avidec.c        |    2 +-
 mythtv/external/FFmpeg/libavformat/flvenc.c        |   12 +++
 mythtv/external/FFmpeg/libavformat/h263dec.c       |    2 +-
 mythtv/external/FFmpeg/libavformat/id3v2.c         |   17 +----
 mythtv/external/FFmpeg/libavformat/id3v2.h         |    4 +-
 mythtv/external/FFmpeg/libavformat/mpc.c           |    2 +-
 mythtv/external/FFmpeg/libavformat/mpegts.c        |    2 +-
 mythtv/external/FFmpeg/libavformat/mux.c           |    6 ++
 mythtv/external/FFmpeg/libavformat/omadec.c        |    2 +-
 mythtv/external/FFmpeg/libavformat/utils.c         |    2 +-
 mythtv/external/FFmpeg/libavutil/cpu.c             |   18 +++++
 mythtv/external/FFmpeg/libavutil/lzo.c             |   13 +++-
 mythtv/external/FFmpeg/libavutil/opt.c             |    6 +-
 mythtv/external/FFmpeg/libswresample/dither.c      |    2 +-
 mythtv/external/FFmpeg/libswresample/rematrix.c    |    5 +
 mythtv/external/FFmpeg/libswresample/resample.c    |    7 ++-
 mythtv/external/FFmpeg/libswscale/swscale.c        |    7 +-
 .../FFmpeg/libswscale/x86/swscale_template.c       |   78 +++++++++----------
 mythtv/external/FFmpeg/tests/ref/fate/vc1_sa10143  |   28 ++++----
 mythtv/libs/libmythtv/fileringbuffer.cpp           |    5 +-
 mythtv/libs/libmythtv/mythplayer.cpp               |    8 ++-
 mythtv/libs/libmythtv/openglvideo.cpp              |    2 +-
 mythtv/libs/libmythtv/videoout_opengl.cpp          |    6 +-
 55 files changed, 244 insertions(+), 161 deletions(-)

-- 



More information about the mythtv-commits mailing list