[mythtv-firehose] mythtv branch master updated by jyavenard. v0.27-pre2-669-g7eb307a

Git Repo Owner noreply at mythtv.org
Thu Feb 14 23:59:31 UTC 2013


The branch, master has been updated on the
mythtv repository by gitolite user jyavenard.
       via  7eb307a0f32fedca47846e75682cafb49ea31ee8 (commit)
       via  a9efe26ff6327ad6a0b4bf0678135b9f5138d852 (commit)
       via  1c1076385f01619f0d0933f9f4fb8f5d1e80435b (commit)
       via  ff7dbfa33ba8df66acf2e800a50c69dabf184584 (commit)
       via  216e740fd0eec3ac1f6b70b784fe9a25cd6e64b2 (commit)
       via  fc07d912ce48b5fbe13e8fbcd3875a29729377ae (commit)
       via  323b125627de0b9d483c92c4407748a0bce88f0a (commit)
       via  be3dccd3ff418aa6c7b4c23be708e90ef6623e4c (commit)
       via  0a20d86f6e65ac2b39aae1e1af41f11a022b8b59 (commit)
       via  615e2987b85d3011ab7b93deae8326d85d31d673 (commit)
       via  1a4874c3be245b981812530e44855b7a4f8d27aa (commit)
       via  de691d1b6d4ae2dd28fa225111775b6e387cda51 (commit)
       via  7d267bb1dc4f13e7a531d998d26902fe30baf77b (commit)
       via  e4ab6d8849f2cb57d0d9c2264e7c16b5179cbc23 (commit)
       via  f3662f7c1dcee1a61cd29fafc9927d7fa0c22a1b (commit)
       via  c8596ba7f0e1220d13900947c09e9892cdb948ac (commit)
       via  e2ed900dbab605ad22bcf602383d68f5e3c630f0 (commit)
       via  fb9232768100bba015b3c17562511c56b2b6ab1d (commit)
       via  4e20527cfb948a58b5266db38b4d59bb5e249798 (commit)
       via  6ed6594aa63fb6f0e154371f12d10884e792c6bb (commit)
       via  4dbbde45d965a357739b9ace936bf164abcb37c0 (commit)
       via  a51d259b625cc78b7ee21f7280191069067187cb (commit)
       via  202dd762bda9c9be524c47d4196735dff43b4d0b (commit)
       via  0b87cf4a6929e4020ec82873a8ee91af58f162a4 (commit)
       via  37c7bd4e87ca39b97ea726dba8d3d6fa677b0d18 (commit)
       via  e9ddebb30f9aa6202e9516a5666f934634b45276 (commit)
       via  3b88211e863dc47e3b480ca2c8bfdaa726acc697 (commit)
       via  dc4caf42ddd7dbf870991c07f468fa8ef09cef06 (commit)
       via  e622631d8fcb2eb2229035816d695c5a307fa66a (commit)
       via  99c1659cd77a5f39280ff3109160fa1e37019fda (commit)
       via  97bbe6cea7c780b3303a34296a28bb352e036df9 (commit)
       via  5ca1cc9e0ce480f176a1aba228fbca79f21f579d (commit)
       via  a7010e810caa1c4de4bfae80dd3447e5067418c1 (commit)
       via  0be5be372626bf94bce1b9618b315c1fecdc1a98 (commit)
       via  6f1a06b52b5c3d2dd5708390fbb36c90641aa120 (commit)
       via  260fdeacfacfb4df3ca55a99c0299ba279830906 (commit)
       via  30260b42372e0064b374ce38b6fab2c8c742f8b7 (commit)
       via  8815c5c07f5330a158c09181bc7ab7d2609d485e (commit)
       via  2c981d9a62f8cf164b1bf22667fe2466d443e3e1 (commit)
       via  8aed89de23ead06782c45162cedbe117c1bb3f64 (commit)
       via  a3b11cd2ccbc6d23cfb9d10683c7364ff4207fd7 (commit)
       via  a5909dc2f9671362118f5710401755c7a11ac219 (commit)
       via  bf90dadf1b403e1edcca1f6add636b3596cb8e2b (commit)
       via  7632e18a3e2bb6fe428db28d160e258d32f9afca (commit)
       via  24da8fd829855e8485c1dad036a074ebe7b77487 (commit)
       via  c2f158ebb94a20fa466c745fdfd2ed2a3b305d41 (commit)
       via  751ddc639d9b6d5e06a9eafe963c04b75b1b66ab (commit)
       via  79e9bed3c0fcb08b7c199518c41e5705d205fff9 (commit)
       via  b44caea312b8cde0f31cfd2ec8856e93e0f709f2 (commit)
       via  e09e2cdf36268e041a9766466659ca15eab169dc (commit)
       via  0ce6447e38c97bc6c4b3aee7086d5812a7810bbf (commit)
       via  187515a4c97b349feee3103b17a78cb62969cd3f (commit)
       via  fa8c337b025419f50aa6cbe5a5a3c3729746c19b (commit)
       via  8bc46482e088d725e90ca685f1f84e7da9ee36a8 (commit)
       via  02eb9912e6dd794437ae1026d0e64a6a92b5db79 (commit)
       via  f8481d1ea053eb6e6a07eaa871382f8f7331ac4d (commit)
       via  edeb7593bd214a6775ddab2295c5d01fd7174763 (commit)
       via  8e4f8ede7610241e1ed35400b120525ca9f7feca (commit)
       via  49b0212a5711c7efbf262ebf462ca090476e650f (commit)
       via  b3a1a042d8259cf67f716a67070aee891007aac2 (commit)
       via  018672d6c738c4af7557c80714e70303579691b9 (commit)
       via  e87489915d36aefb4a768fa93ff0d773838f27de (commit)
       via  1e47fba99d211eeead5bdf3a1878ff2db696b381 (commit)
       via  327b2086631c9eb39fa183795aa7a91bc41d3bf3 (commit)
       via  1e05a7fa88e4540a78a49b279cda020bd00fd551 (commit)
      from  a05b4d48da71f1e65f01cde7693d539644635d5e (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 7eb307a0f32fedca47846e75682cafb49ea31ee8
Author:    Carl Eugen Hoyos <cehoyos at ag.or.at> at Thu, 14 Feb 2013 15:23:51 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:53 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=7eb307a0f32fedca47846e75682cafb49ea31ee8

Write the fiel atom to mov files independently of the used video coded.
The QuickTime specification does not contain any hint that the atom
must not be written in some cases and both the QuickTime and the
AVID decoders do not fail if the atom is present.

This change allows to signal (visually) interlaced streams with
a codec different from uncompressed video.

As a side-effect, this fixes ticket #2202
(cherry picked from commit 7d0e3b197c817b307d599a23704a44763ed0bbdd)

Conflicts:
	tests/ref/fate/vsynth1-avui
	tests/ref/fate/vsynth1-dnxhd-1080i
	tests/ref/fate/vsynth1-mpeg4
	tests/ref/fate/vsynth2-avui
	tests/ref/fate/vsynth2-dnxhd-1080i
	tests/ref/fate/vsynth2-mpeg4
	tests/ref/lavf/mov
	tests/ref/seek/lavf_mov

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



commit a9efe26ff6327ad6a0b4bf0678135b9f5138d852
Author:    Carl Eugen Hoyos <cehoyos at ag.or.at> at Thu, 14 Feb 2013 14:39:21 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:53 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=a9efe26ff6327ad6a0b4bf0678135b9f5138d852

sws: dont write out of array on bigendian
Fixes Ticket2229

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



commit 1c1076385f01619f0d0933f9f4fb8f5d1e80435b
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 13 Feb 2013 22:36:07 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:53 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=1c1076385f01619f0d0933f9f4fb8f5d1e80435b

h264: Reset last_pocs in case of reference or frame number inconsistencies
This prevents faulty increasing of has_b_frames
Should fix Ticket 2062

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



commit ff7dbfa33ba8df66acf2e800a50c69dabf184584
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 11 Nov 2012 02:47:38 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:52 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=ff7dbfa33ba8df66acf2e800a50c69dabf184584

h264_refs: Print default in case we are missing a reference.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit a39d36146a40cb52b3560fd02c73eccf72603b8f)
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 216e740fd0eec3ac1f6b70b784fe9a25cd6e64b2
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 7 Feb 2013 01:24:35 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:52 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=216e740fd0eec3ac1f6b70b784fe9a25cd6e64b2

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



commit fc07d912ce48b5fbe13e8fbcd3875a29729377ae
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 20 Jan 2013 15:03:13 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:52 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=fc07d912ce48b5fbe13e8fbcd3875a29729377ae

h264: Only apply error concealment if theres a frame
Without any correctly decoded slices, there can be no frame.

Fixes out of array reads

Found-by: Rafaël Carré
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 60af6c3138dc501a647bc69b374d5d33d5d86ab5)

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



commit 323b125627de0b9d483c92c4407748a0bce88f0a
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 27 Jan 2013 20:37:27 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:52 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=323b125627de0b9d483c92c4407748a0bce88f0a

aacdec: check channel count
Prevent out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 96f452ac647dae33c53c242ef3266b65a9beafb6)

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



commit be3dccd3ff418aa6c7b4c23be708e90ef6623e4c
Author:    Michael Niedermayer <michaelni at gmx.at> at Fri, 25 Jan 2013 06:11:59 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:52 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=be3dccd3ff418aa6c7b4c23be708e90ef6623e4c

vqavideo: check chunk sizes before reading chunks
Fixes out of array writes

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit ab6c9332bfa1e20127a16392a0b85a4aa4840889)

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



commit 0a20d86f6e65ac2b39aae1e1af41f11a022b8b59
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 24 Jan 2013 00:27:10 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:51 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=0a20d86f6e65ac2b39aae1e1af41f11a022b8b59

sanm: Check decoded_size.
This prevents a buffer overflow in rle_decode()

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 7357ca900efcf829de4cce4cec6ddc286526d417)

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



commit 615e2987b85d3011ab7b93deae8326d85d31d673
Author:    Michael Niedermayer <michaelni at gmx.at> at Fri, 18 Jan 2013 01:28:44 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:51 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=615e2987b85d3011ab7b93deae8326d85d31d673

avcodec_decode_audio: do not trust the channel layout, use the channel count.
Fixes memory corruption

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit d270c3202539e8364c46410e15f7570800e33343)

Conflicts:

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



commit 1a4874c3be245b981812530e44855b7a4f8d27aa
Author:    Michael Niedermayer <michaelni at gmx.at> at Fri, 11 Jan 2013 04:44:20 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:51 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=1a4874c3be245b981812530e44855b7a4f8d27aa

error_concealment: Check that the picture is not in a half setup state.
Fixes state becoming inconsistent
Fixes a null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 23318a57358358e7a4dc551e830e4503f0638cfe)

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



commit de691d1b6d4ae2dd28fa225111775b6e387cda51
Author:    Michael Niedermayer <michaelni at gmx.at> at Fri, 9 Nov 2012 13:26:20 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:51 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=de691d1b6d4ae2dd28fa225111775b6e387cda51

atrac3dec: Check coding mode against channels.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 13451f5520ce6b0afde861b2285dda659f8d4fb4)

Conflicts:

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



commit 7d267bb1dc4f13e7a531d998d26902fe30baf77b
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 12 Dec 2012 12:28:45 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:51 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=7d267bb1dc4f13e7a531d998d26902fe30baf77b

alsdec: check block length
Fix writing over the end

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 0ceca269b66ec12a23bf0907bd2c220513cdbf16)

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



commit e4ab6d8849f2cb57d0d9c2264e7c16b5179cbc23
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 12 Dec 2012 17:14:32 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:50 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=e4ab6d8849f2cb57d0d9c2264e7c16b5179cbc23

adpcm: fix off by 1 error and out of array access in DK4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit f18c873ab5ee3c78d00fdcc2582b39c133faecb4)

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



commit f3662f7c1dcee1a61cd29fafc9927d7fa0c22a1b
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 29 Jan 2013 19:22:33 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:50 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=f3662f7c1dcee1a61cd29fafc9927d7fa0c22a1b

huffyuvdec: Skip len==0 cases
Fixes vlc decoding for hypothetical files that would contain such cases.

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

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



commit c8596ba7f0e1220d13900947c09e9892cdb948ac
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 29 Jan 2013 18:29:41 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:49 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=c8596ba7f0e1220d13900947c09e9892cdb948ac

huffyuvdec: Check init_vlc() return codes.
Prevents out of array writes

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit f67a0d115254461649470452058fa3c28c0df294)

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



commit e2ed900dbab605ad22bcf602383d68f5e3c630f0
Author:    Xi Wang <xi.wang at gmail.com> at Tue, 22 Jan 2013 21:40:05 -0500
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:49 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=e2ed900dbab605ad22bcf602383d68f5e3c630f0

rtmp: fix buffer overflows in ff_amf_tag_contents()
A negative `size' will bypass FFMIN().  In the subsequent memcpy() call,
`size' will be considered as a large positive value, leading to a buffer
overflow.

Change the type of `size' to unsigned int to avoid buffer overflow, and
simplify overflow checks accordingly.

Signed-off-by: Xi Wang <xi.wang at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 4e692374f7962ea358c329de38c380103f8991b6)

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



commit fb9232768100bba015b3c17562511c56b2b6ab1d
Author:    Xi Wang <xi.wang at gmail.com> at Tue, 22 Jan 2013 17:49:29 -0500
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:49 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=fb9232768100bba015b3c17562511c56b2b6ab1d

rtmp: fix multiple broken overflow checks
Sanity checks like `data + size >= data_end || data + size < data' are
broken, because `data + size < data' assumes pointer overflow, which is
undefined behavior in C.  Many compilers such as gcc/clang optimize such
checks away.

Use `size < 0 || size >= data_end - data' instead.

Signed-off-by: Xi Wang <xi.wang at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 902cfe2f74d777a7dc20ac68f2393b9f84b790c1)

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



commit 4e20527cfb948a58b5266db38b4d59bb5e249798
Author:    Xi Wang <xi.wang at gmail.com> at Tue, 22 Jan 2013 20:58:07 -0500
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:49 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=4e20527cfb948a58b5266db38b4d59bb5e249798

rtpenc: fix overflow checking in avc_mp4_find_startcode()
The check `start + res < start' is broken since pointer overflow is
undefined behavior in C.  Many compilers such as gcc/clang optimize
away this check.

Use `res > end - start' instead.  Also change `res' to unsigned int
to avoid signed left-shift overflow.

Signed-off-by: Xi Wang <xi.wang at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 2f014567cfd63e58156f60666f1a61ba147276ab)

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



commit 6ed6594aa63fb6f0e154371f12d10884e792c6bb
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 22 Jan 2013 21:30:20 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:49 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=6ed6594aa63fb6f0e154371f12d10884e792c6bb

sanm: check image dimensions before using them
Avoids integer overflows and out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 49b729d3af8464de431362e6c5b3027102bc2f88)

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



commit 4dbbde45d965a357739b9ace936bf164abcb37c0
Author:    Matthieu Bouron <matthieu.bouron at gmail.com> at Mon, 4 Feb 2013 22:06:11 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:49 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=4dbbde45d965a357739b9ace936bf164abcb37c0

lavf/mov: skip version and flags attributes in mov_read_chan function
Fixes ticket #1764.

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



commit a51d259b625cc78b7ee21f7280191069067187cb
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 6 Feb 2013 01:25:52 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:48 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=a51d259b625cc78b7ee21f7280191069067187cb

ffmpeg: dont allow -flags to override -pass
Fixes Ticket2154

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



commit 202dd762bda9c9be524c47d4196735dff43b4d0b
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 5 Feb 2013 22:57:35 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:48 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=202dd762bda9c9be524c47d4196735dff43b4d0b

dvenc: dont fail hard if the timecode is invalid
Instead just dont store the timecode
Fixes Ticket2187

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



commit 0b87cf4a6929e4020ec82873a8ee91af58f162a4
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 5 Feb 2013 21:54:02 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:48 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=0b87cf4a6929e4020ec82873a8ee91af58f162a4

movtextenc: fix pointer messup and out of array accesses
Fixes Ticket2213

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



commit 37c7bd4e87ca39b97ea726dba8d3d6fa677b0d18
Author:    Carl Eugen Hoyos <cehoyos at ag.or.at> at Fri, 1 Feb 2013 23:27:15 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:48 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=37c7bd4e87ca39b97ea726dba8d3d6fa677b0d18

Do not change codec in flv streams if the user has forced a codec.
Fixes ticket #2218.
(cherry picked from commit 6a50e8a190bc1329fd3e76e8497bb7f870b6e69b)

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



commit e9ddebb30f9aa6202e9516a5666f934634b45276
Author:    Carl Eugen Hoyos <cehoyos at ag.or.at> at Fri, 1 Feb 2013 17:54:48 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:48 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=e9ddebb30f9aa6202e9516a5666f934634b45276

doc/muxers.texi: Fix mp3 picture attachment documentation. (cherry picked from commit 99eedfc40086972987aa27df8b1259c8bf15b20c)
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 3b88211e863dc47e3b480ca2c8bfdaa726acc697
Author:    Peter Ross <pross at xvid.org> at Sun, 6 Jan 2013 14:15:24 +1100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:48 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=3b88211e863dc47e3b480ca2c8bfdaa726acc697

wtvdec: demux thumbnail picture to AVStream.attached_pic
Fixes ticket #2133.

(cherry picked from commit 508836932fcbc3c109fcc4df7a2f2b0bf21bbece)

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



commit dc4caf42ddd7dbf870991c07f468fa8ef09cef06
Author:    Carl Eugen Hoyos <cehoyos at ag.or.at> at Thu, 24 Jan 2013 02:30:40 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:47 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=dc4caf42ddd7dbf870991c07f468fa8ef09cef06

matroskaenc: add codec_tag lists back.
This reverts 312645e :
"Do not set codec_tag property for matroska muxers."

Also adds dummy codec_tag lists with codecs
supported in mkv but not in wav / avi.

Fixes ticket #2169.
(cherry picked from commit df39c3ce385c02cbd8046298578ea7454c0a0f81)

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



commit e622631d8fcb2eb2229035816d695c5a307fa66a
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 21 Jan 2013 23:27:18 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:47 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=e622631d8fcb2eb2229035816d695c5a307fa66a

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



commit 99c1659cd77a5f39280ff3109160fa1e37019fda
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 20 Jan 2013 19:50:33 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:47 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=99c1659cd77a5f39280ff3109160fa1e37019fda

h264: fix use of uninitialized variable
Fixed CID968588

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

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



commit 97bbe6cea7c780b3303a34296a28bb352e036df9
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 20 Jan 2013 20:01:39 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:47 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=97bbe6cea7c780b3303a34296a28bb352e036df9

h264: print mismatching opcode details in check_opcodes()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit dcbe15813ed09cf491e75a21cce0e751f5bc2b34)

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



commit 5ca1cc9e0ce480f176a1aba228fbca79f21f579d
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 20 Jan 2013 20:02:35 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:47 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=5ca1cc9e0ce480f176a1aba228fbca79f21f579d

h264/ff_generate_sliding_window_mmcos: fix use of uninitialized variable
Fixes CID968587
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 3fba3e79a3e46d7611817f9051b33885eb1ff962)

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



commit a7010e810caa1c4de4bfae80dd3447e5067418c1
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 21 Jan 2013 23:00:20 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:46 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=a7010e810caa1c4de4bfae80dd3447e5067418c1

avf_showwaves: fix null pointer dereference
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit e4eebc2da9da886e1bdf87d29e9a4c5b55111036)

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



commit 0be5be372626bf94bce1b9618b315c1fecdc1a98
Author:    Anton Khirnov <anton at khirnov.net> at Mon, 14 Jan 2013 20:07:53 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:46 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=0be5be372626bf94bce1b9618b315c1fecdc1a98

h264: fix ff_generate_sliding_window_mmcos() prototype.
It's been returning an error value since
bad446e251405dc250c3cbee199072e083a1e4b9

Also check for the errors it returns.
(cherry picked from commit ea382767ad2191acbe97e90624059723e15f0e4b)

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



commit 6f1a06b52b5c3d2dd5708390fbb36c90641aa120
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 14 Jan 2013 00:07:51 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:46 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=6f1a06b52b5c3d2dd5708390fbb36c90641aa120

rtmpproto: Fix assignments in if()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit a601eb9543ecab09aa69a6673e553318daf7ea57)

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



commit 260fdeacfacfb4df3ca55a99c0299ba279830906
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 14 Jan 2013 00:07:02 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:46 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=260fdeacfacfb4df3ca55a99c0299ba279830906

vsrc_testsrc: Fix assignments in if()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6f88d2d786b87cbfec5ea16d1cb570ad30c80399)

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



commit 30260b42372e0064b374ce38b6fab2c8c742f8b7
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 14 Jan 2013 00:06:44 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:46 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=30260b42372e0064b374ce38b6fab2c8c742f8b7

tiff: Fix assignments in if()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 659546b42d6550e67fcdbb4937cd1982c60448aa)

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



commit 8815c5c07f5330a158c09181bc7ab7d2609d485e
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 14 Jan 2013 00:05:42 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:45 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=8815c5c07f5330a158c09181bc7ab7d2609d485e

ra144enc: Fix assignments in if()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit e2704381e5f13f54506f69b7a05a05dc27ce1d7d)

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



commit 2c981d9a62f8cf164b1bf22667fe2466d443e3e1
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 14 Jan 2013 00:05:30 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:45 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=2c981d9a62f8cf164b1bf22667fe2466d443e3e1

nellymoserenc: Fix assignments in if()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 795d2dc23b16a678d60a681e906aa87c14478597)

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



commit 8aed89de23ead06782c45162cedbe117c1bb3f64
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 14 Jan 2013 00:04:59 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:45 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=8aed89de23ead06782c45162cedbe117c1bb3f64

libvorbisenc: Fix assignments in if()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit bdd71abe5f34ca37612e17d912060f4dc9b94796)

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



commit a3b11cd2ccbc6d23cfb9d10683c7364ff4207fd7
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 14 Jan 2013 00:04:41 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:45 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=a3b11cd2ccbc6d23cfb9d10683c7364ff4207fd7

libvo-aacenc: Fix assignments in if()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 0ccb31dcad5a1543fbb284d66b0410b91ebd171d)

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



commit a5909dc2f9671362118f5710401755c7a11ac219
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 14 Jan 2013 00:04:25 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:44 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=a5909dc2f9671362118f5710401755c7a11ac219

libspeexenc: Fix assignments in if()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 3b8d66d5317d91288751869206b3acbb84dc44c7)

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



commit bf90dadf1b403e1edcca1f6add636b3596cb8e2b
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 14 Jan 2013 00:04:13 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:44 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=bf90dadf1b403e1edcca1f6add636b3596cb8e2b

libopencore-amr: Fix assignments in if()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit d6180aa29741334cf69f691b27ffceb33f49d36a)

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



commit 7632e18a3e2bb6fe428db28d160e258d32f9afca
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 14 Jan 2013 00:03:38 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:44 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=7632e18a3e2bb6fe428db28d160e258d32f9afca

libmp3lame: Fix assignments in if()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 871b6ec01d27a74702b7cf1d61446709de037948)

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



commit 24da8fd829855e8485c1dad036a074ebe7b77487
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 14 Jan 2013 00:03:23 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:44 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=24da8fd829855e8485c1dad036a074ebe7b77487

libfdk-aacenc: Fix assignments in if()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 9302ad1ac89d5443505cf0418f9d62786513032e)

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



commit c2f158ebb94a20fa466c745fdfd2ed2a3b305d41
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 14 Jan 2013 00:03:09 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:44 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=c2f158ebb94a20fa466c745fdfd2ed2a3b305d41

libfaac: Fix assignments in if()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 68a25c64cda16e12ef3a051ff8661c71ef574683)

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



commit 751ddc639d9b6d5e06a9eafe963c04b75b1b66ab
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 14 Jan 2013 00:02:50 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:43 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=751ddc639d9b6d5e06a9eafe963c04b75b1b66ab

aacenc: Fix assignments in if()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 98fed59427cec17ce55ac137e7e250cff7db81cf)

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



commit 79e9bed3c0fcb08b7c199518c41e5705d205fff9
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 20 Jan 2013 22:27:57 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:43 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=79e9bed3c0fcb08b7c199518c41e5705d205fff9

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



commit b44caea312b8cde0f31cfd2ec8856e93e0f709f2
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 20 Jan 2013 04:14:09 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:43 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=b44caea312b8cde0f31cfd2ec8856e93e0f709f2

mpeg1enc: Disable threads for resolutions too large for multi-threading
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 0c6b0409af070a3bfb02b55fde8ba18219edc76b)

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



commit e09e2cdf36268e041a9766466659ca15eab169dc
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 7 Jan 2013 15:47:21 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:43 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=e09e2cdf36268e041a9766466659ca15eab169dc

mpeg12enc: check dimension validity
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 7fb87bc5f24b1be13269109506c05e4c54695b5e)

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



commit 0ce6447e38c97bc6c4b3aee7086d5812a7810bbf
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 7 Jan 2013 15:31:58 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:43 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=0ce6447e38c97bc6c4b3aee7086d5812a7810bbf

mpeg12enc: Correctly mask dimensions
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit bcc4ef1a415c2ae646fdc4a8e22ebe0205f270e6)

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



commit 187515a4c97b349feee3103b17a78cb62969cd3f
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 7 Jan 2013 15:31:00 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:43 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=187515a4c97b349feee3103b17a78cb62969cd3f

mpeg12: Support decoding dimensions that are a multiple of 4096
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 878e5bd6f555ad6167abacb30d66e47aabcdd745)

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



commit fa8c337b025419f50aa6cbe5a5a3c3729746c19b
Author:    Ronald S. Bultje <rsbultje at gmail.com> at Tue, 15 Jan 2013 08:38:54 -0800
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:42 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=fa8c337b025419f50aa6cbe5a5a3c3729746c19b

h264: add 3 pixels below for subpixel filter wait position.
If the motion vector is at a subpixel position, we need 3 pixels below
the motion vector's wholepel position available, not 2, since the MC
filter is a sixtap filter for the hpel position, and then a bilin filter
for the qpel position.

This patch fixes highly irreproducible (0.1%) fate failures in frame 2
and 4 of h264-conformance-cama2_vtc_b (e.g. first P-frame, first field,
last line of MB x=40,y=2 and second field and last lines of MBs x=39-40,
y=3). These used pre-loopfilter instead of post-loopfilter data because
the await_progress() waited for one line too little in that field, and
the motion vector of these particular MBs happened to align exactly to a
position where that demonstrates the bug.

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

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



commit 8bc46482e088d725e90ca685f1f84e7da9ee36a8
Author:    Ronald S. Bultje <rsbultje at gmail.com> at Sun, 13 Jan 2013 21:46:44 -0800
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:42 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=8bc46482e088d725e90ca685f1f84e7da9ee36a8

h264: don't clobber mmco opcode tables for non-first slice headers.
Clobbering these tables will temporarily clobber the template used
as a basis for other threads to start decoding from. If the other
decoding thread updates from the template right at that moment,
subsequent threads will get invalid (or, usually, none at all) mmco
tables. This leads to invalid reference lists and subsequent decode
failures.

Therefore, instead, decode the mmco tables only for the first slice in
a field or frame. For other slices, decode the bits and ensure they
are identical to the mmco tables in the first slice, but don't ever
clobber the context state. This prevents other threads from using a
clobbered/invalid template as starting point for decoding, and thus
fixes decoding in these cases.

This fixes occasional (~1%) failures of h264-conformance-mr1_bt_a with
frame-multithreading enabled.

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

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



commit 02eb9912e6dd794437ae1026d0e64a6a92b5db79
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 13 Jan 2013 18:39:06 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:42 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=02eb9912e6dd794437ae1026d0e64a6a92b5db79

swr: fix handling of timestamps that cause multiple drops or silence injections
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit d676598f879ba01ddb62f9abe8e17b2e94cb91cd)
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit f8481d1ea053eb6e6a07eaa871382f8f7331ac4d
Author:    Carl Eugen Hoyos <cehoyos at ag.or.at> at Thu, 17 Jan 2013 17:19:08 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:42 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=f8481d1ea053eb6e6a07eaa871382f8f7331ac4d

Only skip MLP header in mpeg files if the codec actually is MLP.
Fixes PCM audio in Kansas Pheasant Hunt 2000 mpg file.
Reported-by: Mashiat Sarker Shakkhar
(cherry picked from commit ad406f7e402977cb7dbc78ccb63e21c137f6699e)

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



commit edeb7593bd214a6775ddab2295c5d01fd7174763
Author:    Carl Eugen Hoyos <cehoyos at ag.or.at> at Thu, 17 Jan 2013 02:11:12 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:41 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=edeb7593bd214a6775ddab2295c5d01fd7174763

Fix detection of struct v4l2_frmsize_discrete.
It was always detected successfully.
(cherry picked from commit c345100efc9baae0ea7c9fcc376725cae5d3df6e)

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



commit 8e4f8ede7610241e1ed35400b120525ca9f7feca
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 6 Jan 2013 19:15:16 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:41 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=8e4f8ede7610241e1ed35400b120525ca9f7feca

ff_get_audio_frame_size: try to fix wma in wav
Fixes Ticket1905, Ticket2114

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



commit 49b0212a5711c7efbf262ebf462ca090476e650f
Author:    Nicolas George <nicolas.george at normalesup.org> at Tue, 1 Jan 2013 01:23:19 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:41 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=49b0212a5711c7efbf262ebf462ca090476e650f

ffmpeg: mark attachment streams finished.
Fix trac ticket #2083.
(cherry picked from commit 69a1667b064b11a2df4b4bdc136955f76d17f558)

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



commit b3a1a042d8259cf67f716a67070aee891007aac2
Author:    Piotr Bandurski <ami_stuff at o2.pl> at Sun, 6 Jan 2013 01:56:23 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:41 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=b3a1a042d8259cf67f716a67070aee891007aac2

tiffdec: Use the correct height field.
Fixes Ticket913

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



commit 018672d6c738c4af7557c80714e70303579691b9
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 2 Jan 2013 01:15:58 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:41 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=018672d6c738c4af7557c80714e70303579691b9

lavf: Fix codec id forcing with probed codecs
Fixes Ticket2088

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



commit e87489915d36aefb4a768fa93ff0d773838f27de
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 2 Jan 2013 01:15:06 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:41 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=e87489915d36aefb4a768fa93ff0d773838f27de

lavf: move force_codec_ids() up
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 3a6b6f425ee3f552eaaf6bde7480be5cb38aba1d)
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 1e47fba99d211eeead5bdf3a1878ff2db696b381
Author:    Clément Bœsch <ubitux at gmail.com> at Sun, 30 Dec 2012 06:53:48 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:40 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=1e47fba99d211eeead5bdf3a1878ff2db696b381

lavc/ass_split: check for NULL pointer in ff_ass_split_override_codes().
This is consistent with the other ff_ass_split_* functions.

It also fixes a crash when trying to split a dialog with text=NULL
(which seems to happen when the text of the dialog is empty); basically,
this commit fixes crashes when trying to encode an empty text subtitle
dialog (see subrip and mov_text encoders).

Fixes Ticket2048.
(cherry picked from commit c83002a4f8042ccfa0688a9a18e8fa0369c1fda8)

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



commit 327b2086631c9eb39fa183795aa7a91bc41d3bf3
Author:    Hendrik Leppkes <h.leppkes at gmail.com> at Sun, 15 Jul 2012 10:58:27 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:40 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=327b2086631c9eb39fa183795aa7a91bc41d3bf3

mov: fix parsing of the chap atom.
This was broken in 0d96ec19ebc1577b27a889136364a906e1c627b1 under the
assumption that there is only one tref leaf atom.

Fixes Ticket #2081.
(cherry picked from commit 765158dd82a2e985f4eb0b201a8256964403f623)

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



commit 1e05a7fa88e4540a78a49b279cda020bd00fd551
Author:    Clément Bœsch <ubitux at gmail.com> at Tue, 1 Jan 2013 16:41:37 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Fri, 15 Feb 2013 10:57:40 +1100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=1e05a7fa88e4540a78a49b279cda020bd00fd551

lavc/movtextdec: keep the min size instead of max to fix overread.
Fixes Ticket #2087.
(cherry picked from commit 7d66bc7920240cc0e8df6c44b2d2cdbe4b228fbe)

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



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

Summary of changes:
 mythtv/external/FFmpeg/Doxyfile                    |    2 +-
 mythtv/external/FFmpeg/RELEASE                     |    2 +-
 mythtv/external/FFmpeg/VERSION                     |    2 +-
 mythtv/external/FFmpeg/configure                   |    2 +-
 mythtv/external/FFmpeg/doc/muxers.texi             |    7 +-
 mythtv/external/FFmpeg/ffmpeg_opt.c                |    3 +
 mythtv/external/FFmpeg/libavcodec/aacdec.c         |    5 +
 mythtv/external/FFmpeg/libavcodec/aacenc.c         |    2 +-
 mythtv/external/FFmpeg/libavcodec/adpcm.c          |    2 +-
 mythtv/external/FFmpeg/libavcodec/alsdec.c         |   10 +-
 mythtv/external/FFmpeg/libavcodec/ass_split.c      |    2 +-
 mythtv/external/FFmpeg/libavcodec/atrac3.c         |    5 +
 .../external/FFmpeg/libavcodec/error_resilience.c  |    6 +
 mythtv/external/FFmpeg/libavcodec/h264.c           |   28 +++-
 mythtv/external/FFmpeg/libavcodec/h264.h           |    5 +-
 mythtv/external/FFmpeg/libavcodec/h264_refs.c      |  158 ++++++++++++++------
 mythtv/external/FFmpeg/libavcodec/huffyuv.c        |   24 ++-
 mythtv/external/FFmpeg/libavcodec/libfaac.c        |    2 +-
 mythtv/external/FFmpeg/libavcodec/libfdk-aacenc.c  |    2 +-
 mythtv/external/FFmpeg/libavcodec/libmp3lame.c     |    2 +-
 .../external/FFmpeg/libavcodec/libopencore-amr.c   |    2 +-
 mythtv/external/FFmpeg/libavcodec/libspeexenc.c    |    2 +-
 mythtv/external/FFmpeg/libavcodec/libvo-aacenc.c   |    2 +-
 mythtv/external/FFmpeg/libavcodec/libvorbisenc.c   |    2 +-
 mythtv/external/FFmpeg/libavcodec/movtextdec.c     |    2 +-
 mythtv/external/FFmpeg/libavcodec/movtextenc.c     |    8 +-
 mythtv/external/FFmpeg/libavcodec/mpeg12.c         |    7 +-
 mythtv/external/FFmpeg/libavcodec/mpeg12enc.c      |   20 +++-
 mythtv/external/FFmpeg/libavcodec/nellymoserenc.c  |    2 +-
 mythtv/external/FFmpeg/libavcodec/ra144enc.c       |    2 +-
 mythtv/external/FFmpeg/libavcodec/sanm.c           |   13 ++-
 mythtv/external/FFmpeg/libavcodec/tiff.c           |    4 +-
 mythtv/external/FFmpeg/libavcodec/utils.c          |    2 +-
 mythtv/external/FFmpeg/libavcodec/vqavideo.c       |   10 ++
 mythtv/external/FFmpeg/libavfilter/avf_showwaves.c |    1 +
 mythtv/external/FFmpeg/libavfilter/vsrc_testsrc.c  |    2 +-
 mythtv/external/FFmpeg/libavformat/dvenc.c         |    4 +-
 mythtv/external/FFmpeg/libavformat/flvdec.c        |    4 +-
 mythtv/external/FFmpeg/libavformat/matroska.c      |    3 +
 mythtv/external/FFmpeg/libavformat/matroskaenc.c   |   34 ++++
 mythtv/external/FFmpeg/libavformat/mov.c           |   17 ++-
 mythtv/external/FFmpeg/libavformat/movenc.c        |    7 +-
 mythtv/external/FFmpeg/libavformat/mpeg.c          |    2 +-
 mythtv/external/FFmpeg/libavformat/rtmppkt.c       |   21 ++--
 mythtv/external/FFmpeg/libavformat/rtmpproto.c     |    2 +-
 mythtv/external/FFmpeg/libavformat/rtpenc_h264.c   |    4 +-
 mythtv/external/FFmpeg/libavformat/utils.c         |   38 +++--
 mythtv/external/FFmpeg/libavformat/wtvdec.c        |   12 +-
 mythtv/external/FFmpeg/libswresample/swresample.c  |    2 +-
 .../external/FFmpeg/libswscale/swscale_unscaled.c  |    3 +
 50 files changed, 358 insertions(+), 147 deletions(-)

-- 



More information about the mythtv-firehose mailing list