[mythtv-commits] mythtv branch master updated by jyavenard. v0.28-pre-1319-g7d6471d

Git Repo Owner noreply at mythtv.org
Sat May 3 17:37:57 UTC 2014


The branch, master has been updated on the
mythtv repository by gitolite user jyavenard.
       via  7d6471dfee3817292f99bbc15ba2665cb97359c6 (commit)
       via  ad8af0f889b68c8e9e5b9d624bb172a3af3161d9 (commit)
       via  83d1020792ecc76471d14e1f69a445660a699c59 (commit)
       via  f4ccc8ea62354ff75b6c0e284e3b1807ab297d5e (commit)
       via  fd19164c3de21c0f5e703aaea370952973d68d8d (commit)
       via  98e968605cb9e24341ceb3bc37a8a1c16b819a67 (commit)
       via  370c43db187e92c5b1157c182742e0269c43a2cf (commit)
       via  1925fdb099933cee712d4a1744085fc2751cfed7 (commit)
       via  397780498add914655890ae56172dcb28fedbcbc (commit)
       via  c18a92cebacc817f2c75860d9e136d1afdf57b73 (commit)
       via  2b031ac4e9b577606c58c0bda903e567ae07a53e (commit)
       via  b7d87a25388b3557462dd97a72e6520882692e78 (commit)
       via  656725a2ceea87fd1686d46932432e613672fc81 (commit)
       via  c3f5b908b5d88f79a4b8c0fd0cce30a3e1751d8b (commit)
       via  e79a30120eedfd8b4e3bc87c49160b6bbdcb7432 (commit)
       via  d06f553942012a38d00610c53559d348464a7197 (commit)
       via  3c66484180191e8975401bc48a273b61f35f58b6 (commit)
       via  883399c9cdcb8e601c1e59dd56b94b7eb0a78821 (commit)
       via  a7eff6a4d3e418243f507aeccc92ac15bea5f37b (commit)
       via  adc3b15f93a7576415cf60049e3d69d01806c5db (commit)
       via  b981e7d867988c31ec57c9bf7175dfa01484552a (commit)
       via  6ab1d86b1b901fcdc98df22911f31cb1a92ad781 (commit)
       via  b3422ad91612ce8bf4edf75c8c9daf55b423b5d7 (commit)
       via  ac15df61722e1bb81a45d38a7467785e03aadd85 (commit)
       via  32864888a5563f6c270aaa6d50952b4169c5ac04 (commit)
       via  85e04c0d4e1ef8de2e9df8e745d8bcc24bf12fe3 (commit)
       via  daea26ddcc79a5b0431959bba2cff052fdcb6692 (commit)
       via  101663fde130054e3cb0589cf19670a8eaec10aa (commit)
       via  d198e2fb7cad4f3d5c20a3a269c1afecec46c802 (commit)
       via  fddbcae5144442c982048b3c885a88f554afa92e (commit)
       via  06be68196157ac0aa587bc24deeb3b28b8d00e42 (commit)
       via  399b01b059dfef732b9f10dbad590f08bd2ebf41 (commit)
       via  f8bce3e02de4d96e12058cde9ffa16497455d2df (commit)
       via  b589124b7d3dd10b4908b5d0dcf2661dd816b65e (commit)
       via  611c8bc99e169750f276261f92d0482ad5a4975d (commit)
       via  f2af70bdce9df924643f2ba3cdb6a8dfbd476f84 (commit)
       via  d8d3ee13f2e9959927560acc90ab0c087d928314 (commit)
       via  4b2c1359623b21f30a16b25b7b70bab2236ca8c2 (commit)
       via  3e86000cedc1dd05d203675dff69b9410843042f (commit)
       via  887ab23187c4c188f2af59b35877d46d469ac911 (commit)
       via  6b849521fccf08c627838d2be295c9ccd3389708 (commit)
       via  a6833f8be0470e5a5ac204eec0b3158dc8b33c68 (commit)
       via  38401450e585abd13cdebb1b53fa85a88b8dcdfc (commit)
       via  43b89b29eaca7d0bec9f638a7be44da20a17072d (commit)
       via  1f0751be669d69a2774fa5e1474374a0f0407c82 (commit)
       via  f28eee34810ab80cbcdedd81ccaf8af8212cc433 (commit)
       via  d00f2723f0cdca00c51ebbdeb14f608862b1fa0f (commit)
       via  33b06a753198d9e789c3ab340e012e6632a63965 (commit)
       via  2517b4fd8a8606b3fcb8877ddf47065236c2f8d0 (commit)
       via  f1f73a87fdd7e3372d9140f67d5b4a213fdbc9d3 (commit)
       via  014cc60319508b3b715df8c42ed4d2f2a760aed5 (commit)
       via  a9e3c06f3df57fa0230c097fd3367b8a601631d2 (commit)
       via  b706757361d76ca9250749f1adcd33f6f9a71510 (commit)
       via  6b2c5e5c5e3b8d277ca585b310ea3033cf92a9b6 (commit)
       via  6daed9b875a1ee7f3ff56c2a2d7446f40b2c616d (commit)
       via  f707b5960f0e08712e3a98f439bbd07ab422f9af (commit)
       via  c750d2f921e28f4671dac1b7654790864fcd6c0f (commit)
       via  a01a4fac78761e4c3aaaa4a8a04af01b18475871 (commit)
       via  e5477f8528d61dcd1d62986b237b2072f2697b32 (commit)
       via  45f51b6d4271fdf3a9a3afa8c49f9fb311b214ec (commit)
       via  097421ed0914ad76349883efe39391ccfdc41371 (commit)
       via  0034b2d05af0afa61ad6c85e68642d4019b2cf17 (commit)
       via  0ed0f49dd3ad1670ef6e59a8d58542e03e0d5317 (commit)
       via  00ae0e6e05675d3490fc50145c7e7b6092750a27 (commit)
       via  c70b7eb39ff171ad6f59c1d30b4e099762ec6f4a (commit)
       via  84479a2ce4421c5b776759303faa32f51b9cc8cd (commit)
       via  ce87fa4b6056c5c330b8f96c3c10c636b3ed1d83 (commit)
       via  ff635792c901b7da7ccea11fdd7daa3c6d345e85 (commit)
       via  ee8ce10606f0e2e8aa121064c88083816c82e65a (commit)
       via  c35c05b6fe37d4f234f3f409177697607fb3119e (commit)
       via  9049670344c5e3a58b99f86583752bb78e71e09c (commit)
       via  a87d9b1f02853e76c45355fba471bfe69fb1673c (commit)
       via  96aaba426a8a049a209d0508302bebeb57974743 (commit)
       via  5109627c80b611bcdff2028bd178536ff48ea72b (commit)
       via  bd53eae7777b89c3878475d7c7e2a9a82517ce48 (commit)
       via  a842c2a5618b62f276c4fce772f75fdbf8d0342d (commit)
       via  3f253030970a042197fe5b75be599b5761c2a112 (commit)
       via  a7494bce4edfcf2ebd1bfbfc9b3ea793ee2d56b4 (commit)
       via  9fef5c3240e51da7bfd5ff9a43880e0dc6c8eebd (commit)
       via  f8dca0e11e7eb8c010a230d30c8a5466229f68ed (commit)
       via  f8280fa1c92cef500a017330ba594bb9a5434bd6 (commit)
       via  0f44e9bed93c5148047cdd400f31825c090430d5 (commit)
       via  0b54ccfb013b056b94d01e09fbad20b3b057fac2 (commit)
       via  b70e256c91031215c285d89cf1361146a28452fb (commit)
       via  82f36992858df238f7fbf650e37bf505c2504667 (commit)
       via  66d3364027e974df35b1f87133b05b3498efa164 (commit)
       via  11a1b10f579d7be17eddd92d89b328c41d300fc1 (commit)
       via  723f2eb4e4d580cb22b5902bae2a0e9a57c69f7e (commit)
       via  6537b6455bb306fc2346c3399a3dc3c6868f7312 (commit)
       via  608eee9e9e8ada246890e6f7cbd281dddca2b72e (commit)
       via  6ebd580248f7b320423440f4f67b84c5151a8334 (commit)
       via  2e8aea958762bca1758eb6079157051256088400 (commit)
       via  f8301e5ceb615dd2ffbaf2caf1b906e6a53547e4 (commit)
       via  238c5e4aa8c9639c436ded8eea1f3de4af828d01 (commit)
       via  bdb60e9fd4d0f6b2c21d454a6193fda0f51fc0af (commit)
       via  22fd9d1101d6f3c96ea1df6d3a3fbc9e7ad1edac (commit)
       via  0dc46053ae65c749b37ca50222fbc526a9b1512f (commit)
       via  620e80d14372154fa7a97a91f6b9835c183ceb4e (commit)
       via  3c18257f277c5d283be4f34f6f1f3214b4f8e760 (commit)
       via  6d28ae889d59034605b00801b56ac0247309f65c (commit)
       via  0e65cd6c382da22fb82198463a3a03bb70d2d882 (commit)
       via  bcd73fbe5ebc894b1c61f65dd02187e0aa1b29be (commit)
       via  cb48bc218fa124fa9922b0232b528d5ccf877c98 (commit)
       via  6bd2e98feddea0dc7a09faec65e2fc37ee110ac5 (commit)
       via  f0309201857a25ca0d6e5726b52f7b8697a3c42e (commit)
       via  0f2100e0affdb1c2a5595d84450f69fbcb947add (commit)
       via  4961dbc208f389b2e8a5edeb6fcef7f3be3fa4b7 (commit)
       via  6a4d28c38784f42251a3d2c25b050507bfc4a2d2 (commit)
       via  ca57c62a56c0d0fe41af715064f3cf0830888cc0 (commit)
       via  baa29fac60d950754fd6dba7b6eb105f654f8cf2 (commit)
       via  c62efdecec17aadcd1685a2eaa89eafeda16187c (commit)
       via  da21885d60894500cda38297a3ccd56761b578a2 (commit)
       via  2b2f4f0b52c4e7691cd4cf2e6e9e1169c690a0ae (commit)
       via  e0a1fa55d0bc8b03ede580607af5f02f6b7d5d3a (commit)
       via  5cef4f3b4a38795d831e4f64c8dc0fc2f83ed828 (commit)
       via  ad847f48abcf6393fa46d231318dec616ac69656 (commit)
       via  37d10704453235d0c72000e0071136ed18d77946 (commit)
       via  9b2cf9454834b1666fd9b0fddc4ace4f444e6a79 (commit)
       via  944976ecefb815c07087bb7417d9c3f7837bdcff (commit)
       via  3048a67557fac159369a19d924409c47ccd05cdd (commit)
       via  df467d9d9faed678a650d2274a37b22d86731a0e (commit)
       via  65418775d175cf6674fea673b7657c00c4744621 (commit)
       via  4de9d5e31a4e8d6ab305487bada0d23bec110e8e (commit)
       via  1ceaa71bc86a9e6a613945f33ed3b24822935b59 (commit)
       via  62fb550931da37ef4c960e1da700452fadf30a2a (commit)
       via  5680bfc6e9763d4c8f0b288cb52622dec1331282 (commit)
       via  bfca46d5606a8f74f75e402d8c6d8c579a77452d (commit)
       via  c8eb0e5d0b3c1fc639eaea4e6995b27c5bcb31ed (commit)
       via  2eb974ab6e8edbc4a40ead585a4cbc744a6dbe52 (commit)
       via  1d861698d069d9bb8a17ebb60b9a46086f209c23 (commit)
       via  ecd61156dc3cd60e8bf5c590dde10d1a9f7482da (commit)
       via  0b959343266b20a749f0921832b2299b26039199 (commit)
       via  eddce5a5c739bdbaff73e0c273b7969a59dda128 (commit)
       via  f432f2a3ec9baf44e869ca35ae4a2e35f505a220 (commit)
       via  cef4e4985bfe5a03453f6b6bd3ea59bdf5606b6e (commit)
       via  a3a83bfa465e3e41c9473a36ec330f6da08a2728 (commit)
       via  a21b2b99b8c358a980010f14635ce9db8903f2ee (commit)
       via  9941ac7b1402d36a2ab428100e855887026623d6 (commit)
       via  ac004a8316294de028782c65b7a8a4747df90804 (commit)
       via  f0b2dd4b17495f59a6c015900f49ec9996bc327b (commit)
       via  85d3cb53816517b4b5521a33dce11fb766f60777 (commit)
       via  326e84f705d1aa4680d9cfe241cc91307214cacb (commit)
       via  6092750c8fad6c1911b15315ca57acb8b782f976 (commit)
       via  457d0bed9643bf2ee7d40aa2cd71325599a9ebd5 (commit)
       via  a36d535dd0f1dd3dc33970553f1d720432d0cdb9 (commit)
       via  c91049cb0eaa5d818d5e785589f080b231eade33 (commit)
       via  e6039b0cc385044350790fc52ab532d5db6642b7 (commit)
       via  12ebee2701cd10985db7bada1fcad173e6c40195 (commit)
       via  1eb7043458bc1adffdc50edb04f859b3e509f9a9 (commit)
       via  b2386cc9525976aa077819a7280417b04983a302 (commit)
       via  5df28d9d629fb471baac51d548794abfb4d56190 (commit)
       via  e261696ca24bf3b32c4459ea7533a3d69fb0d848 (commit)
       via  5584dfb9d4c695aab28b6a6135c3f084acd41f7c (commit)
       via  ff0b99bcdca00ebf0f7a0ca145579ce63a979eb8 (commit)
       via  f4dc5b0a3183f76b547e77bc2a787d702f5c39be (commit)
       via  32386a2dcf4afabbf9396e594039a0120710f4d0 (commit)
       via  fc0a951395c24e23257349487ac16d717b5fe8f1 (commit)
       via  2ccaa446862fae4bc3c8ec0b8b80329f0f367cc1 (commit)
       via  09301b2cce5e7296dedc0bc1c98d6166812d0fe1 (commit)
       via  f580ca58bae497a685ee5b9ecbdf7f0d8efbddd4 (commit)
       via  4f15bbba7d5f0e3bdb16a7288e098f81107114a4 (commit)
       via  05547791e05b46735d7e6ae955beb9c70b1e928f (commit)
       via  a3239de97d92243353ee6ce395a567f5f0d71646 (commit)
       via  50f7d113d81eaa058c452956f55f18876191e015 (commit)
       via  61674c257702b2520fb07efe63340c96f75eb1cf (commit)
       via  1705bee6846655dd146deabe3682b152a5919fe2 (commit)
       via  11816fd44b3267c94d788eb9a69b473e4d6fde13 (commit)
       via  058308c67bdf6765789fb46ff19325c7d3267e43 (commit)
       via  9e5560fe55c6427a4add4b26a35162a6de5a7d78 (commit)
       via  502d2f3d155367615f6848cf2e25759d30ffd435 (commit)
       via  82c803f5cf4881f86329e04486b9c2547a374289 (commit)
       via  81371d10fe5936d7d02e10f5957c1a3ead21d00f (commit)
       via  4fd9ee08e6461c0d607b7ded94aaebaa78a3f287 (commit)
       via  3108e109c33db5725b852a7ac57e74bff62b9e0c (commit)
       via  7a7cd8515606ce43db2b984b316fe789aca2c80f (commit)
       via  16ae3e77e10a9c8dfe5ed3ab038164d967b39aca (commit)
       via  6f40cfc85fe3d889befa665e255a9418cb375437 (commit)
       via  a18e820c443bc05af7f43419745dbc15ae72eb57 (commit)
       via  97ef6ad14038067660d8ebd1608020a5403c2eb7 (commit)
       via  b1ff9560e7d31926134085e6eec7626224f40a5d (commit)
       via  d0bdff674a30a82df1ecfc3fb1bdf1cb193a7866 (commit)
       via  819e8b3052deb1e6a01e14047b01391fa29525c2 (commit)
      from  a5b996c06dd73b378b39bbc772183c4abf53e4d7 (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 7d6471dfee3817292f99bbc15ba2665cb97359c6
Author:    Rainer Hochecker <fernetmenta at online.de> at Wed, 24 Jul 2013 19:50:42 +0300
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:33:30 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=7d6471dfee3817292f99bbc15ba2665cb97359c6

vdpau: Fix VC-1 interlaced mode
VDPAU expects the bitstream value (0, 2 or 3).
libavcodec uses an enum (0, 1 or 2).

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
Signed-off-by: Diego Biurrun <diego at biurrun.de>
(cherry picked from commit 582963a8156522582e55466be4a59974a8d909a5)
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit ad8af0f889b68c8e9e5b9d624bb172a3af3161d9
Author:    Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:11:03 +1000
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:11:03 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=ad8af0f889b68c8e9e5b9d624bb172a3af3161d9

Update to FFmpeg 1.2.6 release



commit 83d1020792ecc76471d14e1f69a445660a699c59
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 30 Apr 2014 06:21:58 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:36 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=83d1020792ecc76471d14e1f69a445660a699c59

sws: dont use the optimized 410->420 unscaled conversion when height%4
Fixes Ticket3594
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 421b21ca8a02a346ba03cea3bb2ecc33f791fc30)
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit f4ccc8ea62354ff75b6c0e284e3b1807ab297d5e
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 30 Apr 2014 04:12:29 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:35 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=f4ccc8ea62354ff75b6c0e284e3b1807ab297d5e

avcodec/vorbisdec: try to workaround libvorbisenc bug
Fixes Ticket3590

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

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



commit fd19164c3de21c0f5e703aaea370952973d68d8d
Author:    Stefano Sabatini <stefasab at gmail.com> at Tue, 22 Apr 2014 13:01:14 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:35 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=fd19164c3de21c0f5e703aaea370952973d68d8d

ffprobe: fix scaling of vali in value_string() in case -prefix is selected
Fix trac ticket #3523.
(cherry picked from commit 1ba59b1cbeafe7cd28db04f772abd89eb7e4ce1e)

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



commit 98e968605cb9e24341ceb3bc37a8a1c16b819a67
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 22 Apr 2014 04:00:32 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:35 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=98e968605cb9e24341ceb3bc37a8a1c16b819a67

avformat/avidec: Speed up keyframe detection code
Fixes Ticket3531

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

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



commit 370c43db187e92c5b1157c182742e0269c43a2cf
Author:    Peter Ross <pross at xvid.org> at Fri, 18 Apr 2014 14:49:40 +1000
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:35 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=370c43db187e92c5b1157c182742e0269c43a2cf

ff_id3v2_read: add option to limit ID3 magic number search
Several chunked formats (AIFF, IFF,DSF) store ID3 metadata within an 'ID3 '
chunk tag. If such chunks are stored sequentially, it is possible for the
ID3v2 parser to confuse the chunk tag for the ID3 magic number. e.g.

[1st chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...]
[2nd chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...]

Fixes ticket #3530.

Signed-off-by: Peter Ross <pross at xvid.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 5331773cc33ba26b9e26ace643d926219e46a17b)

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



commit 1925fdb099933cee712d4a1744085fc2751cfed7
Author:    Peter Ross <pross at xvid.org> at Sat, 19 Apr 2014 12:12:00 +1000
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:35 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=1925fdb099933cee712d4a1744085fc2751cfed7

ff_id3v2_free_extra_meta: set the pointer pointing to extra_meta to NULL
Fixes ticket #3530.

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



commit 397780498add914655890ae56172dcb28fedbcbc
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 19 Jan 2014 18:35:33 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:34 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=397780498add914655890ae56172dcb28fedbcbc

avformat/matroskadec: support SVQ3 as generated by mkvtoolnix-6.6.0
Fixes part of Ticket3256

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

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



commit c18a92cebacc817f2c75860d9e136d1afdf57b73
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 19 Jan 2014 20:59:28 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:34 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=c18a92cebacc817f2c75860d9e136d1afdf57b73

avformat/matroskaenc: wrap V_QUICKTIME codec private in something that looks like its part of quicktime stsd
This is needed for matroska spec compliance
Fixes playback of SVQ3 in matroska with vlc
Fixes Ticket 3256

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



commit 2b031ac4e9b577606c58c0bda903e567ae07a53e
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 12 Feb 2014 06:32:51 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:34 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=2b031ac4e9b577606c58c0bda903e567ae07a53e

avformat/mov: fix keyframe flags for sample from chromium Issue 340865
Fixes ticket #3362.

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



commit b7d87a25388b3557462dd97a72e6520882692e78
Author:    Hendrik Leppkes <h.leppkes at gmail.com> at Mon, 4 Nov 2013 16:22:27 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:34 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=b7d87a25388b3557462dd97a72e6520882692e78

avformat/mov: only force parsing for video tracks if stss is empty
Fixes playback of some AAC streams, which are otherwise mangled by the
parser, and stss is typically only valid for video anyway.

Fixes a regression since e41ea866.

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



commit 656725a2ceea87fd1686d46932432e613672fc81
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 18 Mar 2014 18:06:17 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:33 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=656725a2ceea87fd1686d46932432e613672fc81

avcodec/h263dec: Fix use of uninitialized memory from the bitstream buffer
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit c3f5b908b5d88f79a4b8c0fd0cce30a3e1751d8b
Author:    Michael Niedermayer <michaelni at gmx.at> at Sat, 15 Mar 2014 22:52:22 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:33 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=c3f5b908b5d88f79a4b8c0fd0cce30a3e1751d8b

swscale/x86/swscale: fix missing xmm clobbers in yuv2yuvX_sse3()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6c47a4e972485e5f0c812159373f703c6f1d089f)

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



commit e79a30120eedfd8b4e3bc87c49160b6bbdcb7432
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 13 Mar 2014 17:32:15 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:33 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=e79a30120eedfd8b4e3bc87c49160b6bbdcb7432

avutil/timestamp: Warn about missing __STDC_FORMAT_MACROS for C++ use
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 8b02dfd37cb3bc9521fc6e1f5b5f13c80d144cd2)

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



commit d06f553942012a38d00610c53559d348464a7197
Author:    Peter Ross <pross at xvid.org> at Fri, 14 Mar 2014 20:02:04 +1100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:33 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=d06f553942012a38d00610c53559d348464a7197

avcodec/adpcm: squelch 'mismatch in coded sample count' warning for AV_CODEC_ID_ADPCM_EA_R2/3
These ADPCM codecs include a per-frame flag that enables a raw 16-bit mode. Therefore
the the number of samples returned by get_nb_samples() is only ever approximate.

Fixes ticket #3460.

Signed-off-by: Peter Ross <pross at xvid.org>
Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 7380201451a2edfb240cd356579c4c39a87cf5bd)
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 3c66484180191e8975401bc48a273b61f35f58b6
Author:    Peter Ross <pross at xvid.org> at Sat, 15 Mar 2014 11:16:19 +1100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:32 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=3c66484180191e8975401bc48a273b61f35f58b6

avcodec/adpcm: ADPCM_IMA_DK3 packets are padded to 16-bit packet boundary
Fixes ticket #3461.

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



commit 883399c9cdcb8e601c1e59dd56b94b7eb0a78821
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 17 Mar 2014 02:25:20 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:32 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=883399c9cdcb8e601c1e59dd56b94b7eb0a78821

avcodec/h264: be more tolerant on what pixel format changes trigger reinits
Fixes Ticket3260

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

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



commit a7eff6a4d3e418243f507aeccc92ac15bea5f37b
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 12 Mar 2014 01:50:41 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:32 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=a7eff6a4d3e418243f507aeccc92ac15bea5f37b

avformat/flvdec: discard inconsistent timestamps
Fixes Ticket3425

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

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



commit adc3b15f93a7576415cf60049e3d69d01806c5db
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 11 Mar 2014 20:45:29 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:32 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=adc3b15f93a7576415cf60049e3d69d01806c5db

avcodec/vorbisdec: use the stored previous window type only when the actual previous is not known
Fixes Ticket3432

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



commit b981e7d867988c31ec57c9bf7175dfa01484552a
Author:    Luca Barbato <lu_zero at gentoo.org> at Sat, 27 Jul 2013 15:48:41 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:32 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=b981e7d867988c31ec57c9bf7175dfa01484552a

avidec: Let the inner dv demuxer take care of discarding
Fixes ticket #1796.
(cherry picked from commit c8f0b20b4a6bb6691928789d83e4b02896969848)

Conflicts:
	libavformat/avidec.c

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



commit 6ab1d86b1b901fcdc98df22911f31cb1a92ad781
Author:    Timothy Gu <timothygu99 at gmail.com> at Sun, 23 Feb 2014 16:39:18 -0800
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:31 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=6ab1d86b1b901fcdc98df22911f31cb1a92ad781

configure: use pkg-config to detect libbluray
The current configure fails when static libbluray is compiled with libxml2
support.

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit baa650cc7946a9eb1cf5a083f61a581a97122f03)
Signed-off-by: Timothy Gu <timothygu99 at gmail.com>

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



commit b3422ad91612ce8bf4edf75c8c9daf55b423b5d7
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 5 Mar 2014 03:55:25 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:31 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=b3422ad91612ce8bf4edf75c8c9daf55b423b5d7

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



commit ac15df61722e1bb81a45d38a7467785e03aadd85
Author:    Michael Niedermayer <michaelni at gmx.at> at Sat, 1 Mar 2014 02:40:19 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:31 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=ac15df61722e1bb81a45d38a7467785e03aadd85

avcodec/utvideoenc: fix slice_bits size
Fixes assertion failure

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

Conflicts:

	libavcodec/utvideoenc.c
(cherry picked from commit 57522ca79cc38c279123596d3288ddbf56fa8903)

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



commit 32864888a5563f6c270aaa6d50952b4169c5ac04
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 18 Feb 2014 02:53:14 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:31 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=32864888a5563f6c270aaa6d50952b4169c5ac04

avcodec/snow: split block clipping checks
Fixes out of array read
Fixes: d4476f68ca1c1c57afbc45806f581963-asan_heap-oob_2266b27_8607_cov_4044577381_snow_chroma_bug.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 61d59703c91869f4e5cdacd8d6be52f8b89d4ba4)

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



commit 85e04c0d4e1ef8de2e9df8e745d8bcc24bf12fe3
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 17 Feb 2014 20:49:42 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:30 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=85e04c0d4e1ef8de2e9df8e745d8bcc24bf12fe3

avcodec/ansi: fix integer overflow
Fixes out of array read
Fixes: 5f9698e86d92f19bb08d54ff0d57027f-signal_sigsegv_b30756_3795_cov_2693691257_ansi256.ans
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit d42ec8433c687fcbccefa51a7716d81920218e4f)

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



commit daea26ddcc79a5b0431959bba2cff052fdcb6692
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 16 Feb 2014 23:08:52 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:30 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=daea26ddcc79a5b0431959bba2cff052fdcb6692

avcodec/msrle: use av_image_get_linesize() to calculate the linesize
Fixes out of array access
Fixes: 14a74a0a2dc67ede543f0e35d834fbbe-asan_heap-oob_49572c_556_cov_215466444_44_001_engine_room.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit c919e1ca2ecfc47d796382973ba0e48b8f6f92a2)

Conflicts:

	libavcodec/msrle.c
(cherry picked from commit bc1c8ec5e65098fd2ccd8456f667151dfc9cda42)

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



commit 101663fde130054e3cb0589cf19670a8eaec10aa
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 13 Feb 2014 13:59:51 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:30 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=101663fde130054e3cb0589cf19670a8eaec10aa

avformat/mpegtsenc: Check data array size in mpegts_write_pmt()
Prevents out of array writes

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

Conflicts:

	libavformat/mpegtsenc.c
(cherry picked from commit e87de3f50b765134588d0b048c32ed4b8acc16fb)

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



commit d198e2fb7cad4f3d5c20a3a269c1afecec46c802
Author:    Michael Niedermayer <michaelni at gmx.at> at Fri, 7 Feb 2014 15:07:23 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:30 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=d198e2fb7cad4f3d5c20a3a269c1afecec46c802

avcodec/wmalosslessdec: fix mclms_coeffs* array size
Fixes corruption of context
Fixes: 8835659dde6a4f7dcdf341de6a45c6c8-signal_sigsegv_1dce67b_4564_cov_2504444599_classical_22_16_1_14000_v3c_0_extend_0_29.wma
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit ec9578d54d09b64bf112c2bf7a34b1ef3b93dbd3)

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



commit fddbcae5144442c982048b3c885a88f554afa92e
Author:    Justin Ruggles <justin.ruggles at gmail.com> at Thu, 30 Jan 2014 14:08:38 -0500
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:30 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=fddbcae5144442c982048b3c885a88f554afa92e

samplefmt: avoid integer overflow in av_samples_get_buffer_size()
CC:libav-stable at libav.org
(cherry picked from commit 0e830094ad0dc251613a0aa3234d9c5c397e02e6)

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



commit 06be68196157ac0aa587bc24deeb3b28b8d00e42
Author:    Michael Niedermayer <michaelni at gmx.at> at Sat, 1 Feb 2014 19:04:37 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:29 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=06be68196157ac0aa587bc24deeb3b28b8d00e42

avcodec/vc1: reset fcm/field_mode in non advanced header parsing
Fixes NULL pointer dereference
Fixes: signal_sigsegv_1ab8bf4_2847_cov_4254117347_SA10091.vc1
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit b51e9354772de446e8196dabf9aad1567b22f74d)

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



commit 399b01b059dfef732b9f10dbad590f08bd2ebf41
Author:    Michael Niedermayer <michaelni at gmx.at> at Fri, 31 Jan 2014 19:16:02 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:29 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=399b01b059dfef732b9f10dbad590f08bd2ebf41

avcodec/takdec: always check bits_per_raw_sample
Fixes out of array access
Fixes: asan_heap-oob_19c7a94_6470_cov_1453611734_luckynight-partial.tak
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit f58eab151214d2d35ff0973f2b3e51c5eb372da4)

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



commit f8bce3e02de4d96e12058cde9ffa16497455d2df
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 20 Jan 2014 18:08:18 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:29 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=f8bce3e02de4d96e12058cde9ffa16497455d2df

avcodec/vmnc: Check that rectangles are within the picture
Prevents out of array accesses with CODEC_FLAG_EMU_EDGE

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

Conflicts:

	libavcodec/vmnc.c

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

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



commit b589124b7d3dd10b4908b5d0dcf2661dd816b65e
Author:    Michael Niedermayer <michaelni at gmx.at> at Fri, 17 Jan 2014 20:09:48 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:29 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=b589124b7d3dd10b4908b5d0dcf2661dd816b65e

dnxhdenc: fix mb_rc size
Fixes out of array access with RC_VARIANCE set to 0

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

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



commit 611c8bc99e169750f276261f92d0482ad5a4975d
Author:    Anton Khirnov <anton at khirnov.net> at Thu, 27 Feb 2014 21:36:33 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:28 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=611c8bc99e169750f276261f92d0482ad5a4975d

pthread_frame: flush all threads on flush, not just the first one
avcodec_flush_buffers() must release all internally held references
according to its documentation, for which all the threads need to be
flushed.

Bug-Id: vlc/9665
(cherry picked from commit d1f9563d502037239185c11578cc614bdf0c5870)

Conflicts:
	libavcodec/pthread_frame.c

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



commit f2af70bdce9df924643f2ba3cdb6a8dfbd476f84
Author:    Martin Storsjö <martin at martin.st> at Thu, 23 Jan 2014 14:07:46 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:28 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=f2af70bdce9df924643f2ba3cdb6a8dfbd476f84

rtpdec_asf: Copy the need_parsing field from the chained demuxer
This fixes playback of mp3 streams in rtp/asf. This used to work
until 950482bf, but mostly by coincidence.

Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit 2aec9e228cb317cca8cda9e03986c8482ea54404)

Fixes ticket #3223
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit d8d3ee13f2e9959927560acc90ab0c087d928314
Author:    Reimar Döffinger <Reimar.Doeffinger at gmx.de> at Sat, 16 Mar 2013 13:36:20 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:28 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=d8d3ee13f2e9959927560acc90ab0c087d928314

Fix compilation on ARM with android gcc 4.7
With the current code it fails due to running out
of registers.
So code the store offsets manually into the assembler
instead.
Passes "make fate-dts".

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
(cherry picked from commit 8067f55edf3719182aed6e5b57b7863889f80218)

Fixes ticket #2756.
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 4b2c1359623b21f30a16b25b7b70bab2236ca8c2
Author:    Carl Eugen Hoyos <cehoyos at ag.or.at> at Mon, 20 Jan 2014 22:37:18 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:28 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=4b2c1359623b21f30a16b25b7b70bab2236ca8c2

Allow decoding of slightly broken Nikon avi files.
Fixes ticket #3330.
(cherry picked from commit f9c2d4d17e3b18becb046d71811f9e8aa5946cf9)

Conflicts:
	libavformat/avidec.c

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



commit 3e86000cedc1dd05d203675dff69b9410843042f
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 19 Jan 2014 16:44:58 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:27 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=3e86000cedc1dd05d203675dff69b9410843042f

avcodec/mjpegdec: Dont skip picture allocation if theres no picture allocated
Fixes Ticket 3245
(cherry picked from commit ad8d063f230c05f8b5efbd05cc5a9f51a2549dcf)

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



commit 887ab23187c4c188f2af59b35877d46d469ac911
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 19 Jan 2014 04:02:11 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:27 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=887ab23187c4c188f2af59b35877d46d469ac911

avcodec/mjpegdec: Dont treat the lack of a startcode differently from end of the bitstream
Fixes Ticket3303

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

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



commit 6b849521fccf08c627838d2be295c9ccd3389708
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 19 Jan 2014 06:20:46 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:27 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=6b849521fccf08c627838d2be295c9ccd3389708

avcodec/aacdec: Dont fail if channels arent known yet
Fixes Ticket3312

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

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



commit a6833f8be0470e5a5ac204eec0b3158dc8b33c68
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 19 Jan 2014 04:56:13 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:27 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=a6833f8be0470e5a5ac204eec0b3158dc8b33c68

avcodec/mjpegdec: only run EOI emulation code when there was a scan
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 361e27a3d8096baacc45d2551a1ebfcbfdaa6a67)
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 38401450e585abd13cdebb1b53fa85a88b8dcdfc
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 19 Jan 2014 04:55:01 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:26 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=38401450e585abd13cdebb1b53fa85a88b8dcdfc

avcodec/mjpegdec: update cur_scan also for non-LS jpeg
This should make no difference but the variable will be used in a subsequent commit

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

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



commit 43b89b29eaca7d0bec9f638a7be44da20a17072d
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 16 Jan 2014 02:53:32 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:26 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=43b89b29eaca7d0bec9f638a7be44da20a17072d

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



commit 1f0751be669d69a2774fa5e1474374a0f0407c82
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 16 Jan 2014 02:52:53 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:26 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=1f0751be669d69a2774fa5e1474374a0f0407c82

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



commit f28eee34810ab80cbcdedd81ccaf8af8212cc433
Author:    Michael Niedermayer <michaelni at gmx.at> at Sat, 4 May 2013 16:49:47 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:26 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=f28eee34810ab80cbcdedd81ccaf8af8212cc433

wmaprodec: Fix null pointer dereference in decode_frame()
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit c7a7605656633e52ade8a5d32a7c2497b37faef8)

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



commit d00f2723f0cdca00c51ebbdeb14f608862b1fa0f
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 6 May 2013 01:37:34 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:25 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=d00f2723f0cdca00c51ebbdeb14f608862b1fa0f

h264: check mb_width/height
Fixes inconsistency that leads to out of array accesses with threads

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

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



commit 33b06a753198d9e789c3ab340e012e6632a63965
Author:    Michael Niedermayer <michaelni at gmx.at> at Sat, 4 May 2013 20:21:47 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:25 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=33b06a753198d9e789c3ab340e012e6632a63965

h264: Always decode MMCOs into temprary array
When decoding succeeded the array is copied into the permanent one.
This prevents inconsistencies
Fixes assertion failure

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

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



commit 2517b4fd8a8606b3fcb8877ddf47065236c2f8d0
Author:    Michael Niedermayer <michaelni at gmx.at> at Sat, 30 Mar 2013 19:10:04 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:25 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=2517b4fd8a8606b3fcb8877ddf47065236c2f8d0

h264: move the default_ref_list_done check down after its inputs have been written
Fixes out of array read

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

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



commit f1f73a87fdd7e3372d9140f67d5b4a213fdbc9d3
Author:    Michael Niedermayer <michaelni at gmx.at> at Sat, 30 Mar 2013 16:04:07 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:25 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=f1f73a87fdd7e3372d9140f67d5b4a213fdbc9d3

h264: Move slice_table clean out of frame_start
Fixes inconsistency ultimately leading to an out of array read

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

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



commit 014cc60319508b3b715df8c42ed4d2f2a760aed5
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 28 Mar 2013 21:09:01 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:25 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=014cc60319508b3b715df8c42ed4d2f2a760aed5

h264_refs: Check for attempts to assign pictures to short & long.
Fixes null pointer dereference

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

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



commit a9e3c06f3df57fa0230c097fd3367b8a601631d2
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 28 Mar 2013 03:16:01 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:24 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=a9e3c06f3df57fa0230c097fd3367b8a601631d2

h264_cavlc: fix assertion failure due to reading too long vlc
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 10ece44d0948b44b062d09319052d09d14f7bfdb)

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



commit b706757361d76ca9250749f1adcd33f6f9a71510
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 2 Jan 2014 17:46:21 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:24 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=b706757361d76ca9250749f1adcd33f6f9a71510

avcodec/aacps: fix number of bands used with ipd/opd
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f861d16355f_1664_File1_fixed.aac
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6433b393ba2b1b410ff18e386f84781a760549f5)

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



commit 6b2c5e5c5e3b8d277ca585b310ea3033cf92a9b6
Author:    Michael Niedermayer <michaelni at gmx.at> at Fri, 29 Mar 2013 20:58:42 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:24 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=6b2c5e5c5e3b8d277ca585b310ea3033cf92a9b6

aacps: correct opdipd code to match spec
This fixes out of array reads

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

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



commit 6daed9b875a1ee7f3ff56c2a2d7446f40b2c616d
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 2 May 2013 02:16:41 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:24 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=6daed9b875a1ee7f3ff56c2a2d7446f40b2c616d

avcodec/ansi: Fix right/bottom end checks
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6021615bbe393381f23b34a7cd0dcfd1a42687ba)

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



commit f707b5960f0e08712e3a98f439bbd07ab422f9af
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 2 May 2013 02:15:03 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:23 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=f707b5960f0e08712e3a98f439bbd07ab422f9af

avcodec/ansi: Check x/y
This prevents 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 e91fd754c63de7fd3cb7fdea8974166db362e387)

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



commit c750d2f921e28f4671dac1b7654790864fcd6c0f
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 22 May 2013 17:39:22 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:23 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=c750d2f921e28f4671dac1b7654790864fcd6c0f

shorten: fix "off by padding" bug
Fixes array overread

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

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



commit a01a4fac78761e4c3aaaa4a8a04af01b18475871
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 13 May 2013 18:09:04 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:23 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=a01a4fac78761e4c3aaaa4a8a04af01b18475871

avcodec/lcldec: Check that dimensions are a multiple of the subsample factors
Other dimensions would not work correctly currently,
also ask for a sample for files that fail this check.

This fixes an integer overflow leading to 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 1e00bbb10cbde3da03a1e744265ce6def9ae4c56)

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



commit e5477f8528d61dcd1d62986b237b2072f2697b32
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 7 May 2013 22:26:22 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:23 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=e5477f8528d61dcd1d62986b237b2072f2697b32

avformat/vqf: check number of channels before use.
Fixes division by zero

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

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



commit 45f51b6d4271fdf3a9a3afa8c49f9fb311b214ec
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 7 May 2013 20:33:33 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:22 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=45f51b6d4271fdf3a9a3afa8c49f9fb311b214ec

dxa: check vectors of 2x2 motion blocks
Fixes out of array reads

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

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



commit 097421ed0914ad76349883efe39391ccfdc41371
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 7 May 2013 20:18:41 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:22 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=097421ed0914ad76349883efe39391ccfdc41371

dxa: check vectors of 4x4 motion blocks
Fixes out of array reads

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

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



commit 0034b2d05af0afa61ad6c85e68642d4019b2cf17
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 7 May 2013 19:57:10 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:22 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=0034b2d05af0afa61ad6c85e68642d4019b2cf17

shorten: allocate space for padding
Fixes array overread

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

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



commit 0ed0f49dd3ad1670ef6e59a8d58542e03e0d5317
Author:    Michael Niedermayer <michaelni at gmx.at> at Sat, 4 May 2013 02:47:58 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:22 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=0ed0f49dd3ad1670ef6e59a8d58542e03e0d5317

evrcdec: fix sign error
The specification wants round(abs(x))) * sign(x) which is
equivakent to round(x)

Fixes out of array access

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

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



commit 00ae0e6e05675d3490fc50145c7e7b6092750a27
Author:    Michael Niedermayer <michaelni at gmx.at> at Fri, 3 May 2013 23:16:54 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:21 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=00ae0e6e05675d3490fc50145c7e7b6092750a27

eamad: Check against minimum supported dimensions
Fixes out of array reads

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

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



commit c70b7eb39ff171ad6f59c1d30b4e099762ec6f4a
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 18 Apr 2013 00:52:48 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:21 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=c70b7eb39ff171ad6f59c1d30b4e099762ec6f4a

xan: Check for overlapping copies
No valid samples i found use such copies

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

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



commit 84479a2ce4421c5b776759303faa32f51b9cc8cd
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 18 Apr 2013 02:52:41 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:21 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=84479a2ce4421c5b776759303faa32f51b9cc8cd

avcodec/bitstream: check codes in ff_init_vlc_sparse()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6998af4a40e67b5f0bfb769b7749f38a92eb2819)

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



commit ce87fa4b6056c5c330b8f96c3c10c636b3ed1d83
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 18 Apr 2013 02:47:10 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:21 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=ce87fa4b6056c5c330b8f96c3c10c636b3ed1d83

avcodec/bitstream: Check bits in ff_init_vlc_sparse()
Fixes out of array reads

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

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



commit ff635792c901b7da7ccea11fdd7daa3c6d345e85
Author:    Michael Niedermayer <michaelni at gmx.at> at Fri, 19 Apr 2013 14:46:31 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:21 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=ff635792c901b7da7ccea11fdd7daa3c6d345e85

avcodec/mpegvideo_motion: Use a field from the current frame if the last is unavailable in DMV & 16x8
Fixes null pointer dereference

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

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



commit ee8ce10606f0e2e8aa121064c88083816c82e65a
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 16 Apr 2013 16:41:21 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:20 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=ee8ce10606f0e2e8aa121064c88083816c82e65a

avcodec/c93: Check for block overlap.
Fixes overlapping memcpy()

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

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



commit c35c05b6fe37d4f234f3f409177697607fb3119e
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 18 Apr 2013 19:53:00 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:20 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=c35c05b6fe37d4f234f3f409177697607fb3119e

avcodec/mpegvideo_motion: Check P field references
If a reference is unavailable use a field from the current
picture
Fixes null pointer dereference

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

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



commit 9049670344c5e3a58b99f86583752bb78e71e09c
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 18 Apr 2013 17:54:54 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:20 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=9049670344c5e3a58b99f86583752bb78e71e09c

svq3: use memmove to avoid overlap in memcpy.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 4c8ce750abaa783109630d41ca7dde5de34f6197)

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



commit a87d9b1f02853e76c45355fba471bfe69fb1673c
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 18 Apr 2013 16:19:10 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:20 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=a87d9b1f02853e76c45355fba471bfe69fb1673c

evrcdec: use memmove() instead of memcpy() when regions can overlap.
This occurs also with valid files.

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

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



commit 96aaba426a8a049a209d0508302bebeb57974743
Author:    Michael Niedermayer <michaelni at gmx.at> at Fri, 6 Dec 2013 23:30:34 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:19 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=96aaba426a8a049a209d0508302bebeb57974743

avutil/log: skip IO calls on empty strings
These occur when no context is set for example, thus they are common

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

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



commit 5109627c80b611bcdff2028bd178536ff48ea72b
Author:    Michael Niedermayer <michaelni at gmx.at> at Fri, 6 Dec 2013 16:49:35 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:19 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=5109627c80b611bcdff2028bd178536ff48ea72b

avcodec/error_resilience: check that er is supported before attempting to read the status of the previous slice
Fixes incorrectly set error_occured and improves speed

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

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



commit bd53eae7777b89c3878475d7c7e2a9a82517ce48
Author:    Michael Niedermayer <michaelni at gmx.at> at Fri, 6 Dec 2013 16:49:00 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:19 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=bd53eae7777b89c3878475d7c7e2a9a82517ce48

avcodec/error_resilience: factor er_supported() check out
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit afb18c55783362546b5e512ce01b7fe7bf5744d9)

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



commit a842c2a5618b62f276c4fce772f75fdbf8d0342d
Author:    Paul B Mahol <onemda at gmail.com> at Fri, 15 Nov 2013 01:09:06 +0000
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:19 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=a842c2a5618b62f276c4fce772f75fdbf8d0342d

avcodec/libopusenc: change default frame duration to 20 ms
20 ms is used by libopus encoder.

Signed-off-by: Paul B Mahol <onemda at gmail.com>
(cherry picked from commit 74906d3727ec3bd9b7b28dfa7a98ff6e8cf8b6d7)

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



commit 3f253030970a042197fe5b75be599b5761c2a112
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 21 Nov 2013 02:32:37 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:18 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=3f253030970a042197fe5b75be599b5761c2a112

avcodec: move end zeroing code from av_packet_split_side_data() to avcodec_decode_subtitle2()
This code changes the input packet, which is read only and can in
rare circumstances lead to decoder errors. (i run into one of these in
the audio decoder, which corrupted the packet during av_find_stream_info()
so that actual decoding that single packet failed later)
Until a better fix is implemented, this commit limits the problem.
A better fix might be to make the subtitle decoders not depend on
data[size] = 0 or to copy their input when this is not the case.
(cherry picked from commit 01923bab98506b1e98b4cbf08419364ce6ffea6d)

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



commit a7494bce4edfcf2ebd1bfbfc9b3ea793ee2d56b4
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 14 Nov 2013 11:27:45 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:18 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=a7494bce4edfcf2ebd1bfbfc9b3ea793ee2d56b4

h264: Do not treat the initial frame special in handling of frame gaps
The not handling of frame gaps has lead to the lack of a dummy reference
frame, which has lead to the failure of decode_slice_header() which has
lead to one SEI recovery message being skiped which had introduced a
slightly suboptimal recovery point for at least 1 h264 file compared to
JM.

Found-by: Carl & BugMaster
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 9e5ef1c5c37208326c59d642e2dc7afd3f10b09b)

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



commit 9fef5c3240e51da7bfd5ff9a43880e0dc6c8eebd
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 31 Oct 2013 02:26:07 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:18 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=9fef5c3240e51da7bfd5ff9a43880e0dc6c8eebd

avformat/thp: force moving forward
Fixes infinite loop
Fixes Ticket3098

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

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



commit f8dca0e11e7eb8c010a230d30c8a5466229f68ed
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 31 Oct 2013 02:19:40 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:18 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=f8dca0e11e7eb8c010a230d30c8a5466229f68ed

avformat/thp: fix variable types to avoid overflows
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 2b1056e4e27b046af3777e8bd65a5145abff878f)

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



commit f8280fa1c92cef500a017330ba594bb9a5434bd6
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 30 Oct 2013 23:27:28 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:18 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=f8280fa1c92cef500a017330ba594bb9a5434bd6

avcodec/jpeglsdec: check err value for ls_get_code_runterm()
Fixes infinite loop
Fixes Ticket3086

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

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



commit 0f44e9bed93c5148047cdd400f31825c090430d5
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 20 Oct 2013 18:38:48 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:17 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=0f44e9bed93c5148047cdd400f31825c090430d5

avutil/opt: initialize ret
Fixes CID1108610
Fixes use of uninitialized variable

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

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



commit 0b54ccfb013b056b94d01e09fbad20b3b057fac2
Author:    Michael Niedermayer <michaelni at gmx.at> at Sat, 19 Oct 2013 17:52:47 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:17 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=0b54ccfb013b056b94d01e09fbad20b3b057fac2

avcodec/utils: add some saftey checks to add_metadata_from_side_data()
This fixes potential overreads with crafted files.

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 838f461b0716393a1b5c70efd03de1e8bc197380)

Conflicts:

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



commit b70e256c91031215c285d89cf1361146a28452fb
Author:    Michael Niedermayer <michaelni at gmx.at> at Sat, 19 Oct 2013 17:45:54 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:17 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=b70e256c91031215c285d89cf1361146a28452fb

avcodec/avpacket/av_packet_split_side_data: ensure that side data padding is initialized
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 240fd8c96f59ebe9dcfc4152a1086cd3f63400c0)

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



commit 82f36992858df238f7fbf650e37bf505c2504667
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 21 Oct 2013 16:21:14 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:17 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=82f36992858df238f7fbf650e37bf505c2504667

avfilter/ff_insert_pad: fix order of operations
Fixes out of bounds access
Fixes CID732170
Fixes CID732169

No filter is known to use this function in a way so the issue can be reproduced.

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

Conflicts:

	libavfilter/avfilter.c
(cherry picked from commit 86591b244f3a27293153896813f5569b49b2f5c0)

Conflicts:

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



commit 66d3364027e974df35b1f87133b05b3498efa164
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 9 Oct 2013 00:30:46 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:16 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=66d3364027e974df35b1f87133b05b3498efa164

ffserver: strip odd chars from html error messages before sending them back
Fixes Ticket3034

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

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



commit 11a1b10f579d7be17eddd92d89b328c41d300fc1
Author:    Paul B Mahol <onemda at gmail.com> at Mon, 9 Sep 2013 10:44:27 +0000
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:16 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=11a1b10f579d7be17eddd92d89b328c41d300fc1

avcodec/ffv1dec: fix format detection
Fixes crash with carefuly designed files.

Signed-off-by: Paul B Mahol <onemda at gmail.com>
(cherry picked from commit a27227d401adf12534dc7a26d72e43e2f35f8944)

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



commit 723f2eb4e4d580cb22b5902bae2a0e9a57c69f7e
Author:    Carl Eugen Hoyos <cehoyos at ag.or.at> at Wed, 15 Jan 2014 23:37:47 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:16 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=723f2eb4e4d580cb22b5902bae2a0e9a57c69f7e

Do not read mkv audio bit_depth if bits_per_coded_sample is already set.
This allows decoding broken mkv files containing G.726 audio.
(cherry picked from commit 11329370770e5c982deece7d4eb4f2e95e725332)

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



commit 6537b6455bb306fc2346c3399a3dc3c6868f7312
Author:    Carl Eugen Hoyos <cehoyos at ag.or.at> at Wed, 15 Jan 2014 23:35:22 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:16 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=6537b6455bb306fc2346c3399a3dc3c6868f7312

Do not set mkv bit_depth to av_get_bytes_per_sample() for G.726.
The value is wrong and leads to broken files.
(cherry picked from commit 565102dcac4959da60e6b1528dc31315d21194ca)

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



commit 608eee9e9e8ada246890e6f7cbd281dddca2b72e
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 9 Jan 2014 04:02:58 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:15 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=608eee9e9e8ada246890e6f7cbd281dddca2b72e

avcodec/msvideo1enc: fix SKIPS_MAX
Fixes Ticket3270

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



commit 6ebd580248f7b320423440f4f67b84c5151a8334
Author:    Carl Eugen Hoyos <cehoyos at ag.or.at> at Tue, 7 Jan 2014 22:49:05 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:15 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=6ebd580248f7b320423440f4f67b84c5151a8334

Use the h264 parser when decoding VSSH in avi.
Fixes ticket #3261 visually.

Analyzed-by: Michael Doilnitsyn
(cherry picked from commit 94cf4f8bac12c58e30ce3b5d72cf5898baafe9a8)

Conflicts:
	libavformat/avidec.c

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



commit 2e8aea958762bca1758eb6079157051256088400
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 8 Jan 2014 04:49:50 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:15 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=2e8aea958762bca1758eb6079157051256088400

avformat/mxfdec: detect loops during header parsing
The header parser uses forward and backward parsing, making the
bulletproof prevention of loops difficult, thus this simple
detection code.
If someone improves the forward/backward parsing so it cannot loop
then this commit should be reverted

Fixes Ticket3278

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



commit f8301e5ceb615dd2ffbaf2caf1b906e6a53547e4
Author:    Michael Niedermayer <michaelni at gmx.at> at Sat, 4 Jan 2014 17:33:59 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:15 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=f8301e5ceb615dd2ffbaf2caf1b906e6a53547e4

avformat/oggdec: dont read timestamps from EOS pages of ogm videos
Some muxers store invalid timestamps there, which breaks seeking
Fixes Ticket2739

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



commit 238c5e4aa8c9639c436ded8eea1f3de4af828d01
Author:    Alexander Strasser <eclipse7 at gmx.net> at Fri, 6 Dec 2013 17:20:26 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:14 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=238c5e4aa8c9639c436ded8eea1f3de4af828d01

configure: Special case libfreetype test
Include the freetype header, in-directly through a macro, like it
is done in the drawtext filter. Do not break if the header is moved.

Unfortunately the drawtext filter included the file where the include
macros are defined in a wrong way. This is not needed and breaks the
build. Remove that #include line too.

(cherry picked from commit cea5812fa723c08b89d929eeba73462e05de2973)

Signed-off-by: Alexander Strasser <eclipse7 at gmx.net>

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



commit bdb60e9fd4d0f6b2c21d454a6193fda0f51fc0af
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 22 Dec 2013 18:47:28 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:14 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=bdb60e9fd4d0f6b2c21d454a6193fda0f51fc0af

nutenc/write_index: warn if 2 consecutive keyframes have the same PTS and discard the 2nd
This fixes an assertion failure and regression and restores previous behaviour
Fixes Ticket3197

An alternative would be to fail hard in this case and refuse to mux such data.

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



commit 22fd9d1101d6f3c96ea1df6d3a3fbc9e7ad1edac
Author:    Peter Ross <pross at xvid.org> at Mon, 23 Dec 2013 20:37:28 +1100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:14 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=22fd9d1101d6f3c96ea1df6d3a3fbc9e7ad1edac

wtvenc: populate VIDEOINFOHEADER2
Fixes ticket #2835.

Signed-off-by: Peter Ross <pross at xvid.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6da21c1f8190d674fd1e5619bb148c1bbab8ca3c)

Conflicts:
	tests/ref/lavf/wtv
	tests/ref/seek/lavf-wtv
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 0dc46053ae65c749b37ca50222fbc526a9b1512f
Author:    Peter Ross <pross at xvid.org> at Mon, 23 Dec 2013 20:37:13 +1100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:14 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=0dc46053ae65c749b37ca50222fbc526a9b1512f

avformat/riffenc: indent
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit f93b0abe4041b75f0dbb590ee932b37a07662856)

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



commit 620e80d14372154fa7a97a91f6b9835c183ceb4e
Author:    Peter Ross <pross at xvid.org> at Mon, 23 Dec 2013 20:37:00 +1100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:14 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=620e80d14372154fa7a97a91f6b9835c183ceb4e

riffenc: add option to ff_put_bmp_header to ignore extradata
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit fcbb94712d9873a37cdc8b526e368154b5982186)

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



commit 3c18257f277c5d283be4f34f6f1f3214b4f8e760
Author:    Martin Storsjö <martin at martin.st> at Fri, 20 Dec 2013 15:02:35 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:13 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=3c18257f277c5d283be4f34f6f1f3214b4f8e760

arm: Don't clobber callee saved registers in scalarproduct
q4-q7/d8-d15 are supposed to not be clobbered by the callee.

CC: libav-stable at libav.org
Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit d307e408d4a9ada22df443cc38be77cc5e492694)
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 6d28ae889d59034605b00801b56ac0247309f65c
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 15 Dec 2013 14:13:55 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:13 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=6d28ae889d59034605b00801b56ac0247309f65c

swscale/utils: check chroma width for fast bilinear scaler
Fixes artifacts where fast bilinear was used for downscaling chroma

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



commit 0e65cd6c382da22fb82198463a3a03bb70d2d882
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 15 Dec 2013 14:10:02 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:13 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=0e65cd6c382da22fb82198463a3a03bb70d2d882

swscale/utils: remove useless ()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 554e913fd7acc9da02ddac2c5ce9487f7f633c92)
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit bcd73fbe5ebc894b1c61f65dd02187e0aa1b29be
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 5 Dec 2013 01:41:10 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:13 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=bcd73fbe5ebc894b1c61f65dd02187e0aa1b29be

avcodec/cabac: force get_cabac to be not inlined
works around bug in gccs inline asm register assignment
Fixes Ticket3177

gcc from 4.4 to 4.6 is affected at least, no non affected gccs known
clang seems not affected

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



commit cb48bc218fa124fa9922b0232b528d5ccf877c98
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 2 Apr 2013 18:08:12 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:12 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=cb48bc218fa124fa9922b0232b528d5ccf877c98

ffmpeg: Fix forcing of the framerate for stream copy on input
Fixes Ticket2211

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



commit 6bd2e98feddea0dc7a09faec65e2fc37ee110ac5
Author:    Clément Bœsch <u at pkh.me> at Fri, 8 Nov 2013 23:55:06 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:12 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=6bd2e98feddea0dc7a09faec65e2fc37ee110ac5

build: avoid stdin stall with GNU AS probing.
a758c5e added probing for various tools, such as AS. Unfortunately, GNU
AS is reading stdin with -v, and thus configure is stalled with
configure arguments such as --as=as.

Fixes Ticket #1898.
(cherry picked from commit dbb41f93c16cbc65a899a75723c95da51c851cd5)

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



commit f0309201857a25ca0d6e5726b52f7b8697a3c42e
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 18 Nov 2013 03:02:36 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:12 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=f0309201857a25ca0d6e5726b52f7b8697a3c42e

avformat/utils: dont count attached pics toward the probesize
Such pics behave more like headers which we also dont count.
Fixes Ticket3146

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



commit 0f2100e0affdb1c2a5595d84450f69fbcb947add
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 30 Oct 2013 23:56:52 +0100
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:12 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=0f2100e0affdb1c2a5595d84450f69fbcb947add

avcodec/bink: fix seeking to frame 0
Fixes Ticket3088

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

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



commit 4961dbc208f389b2e8a5edeb6fcef7f3be3fa4b7
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 27 Oct 2013 01:03:19 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:11 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=4961dbc208f389b2e8a5edeb6fcef7f3be3fa4b7

avformat/utils: do not override pts in h264 when they are provided from the demuxer
Fixes Ticket2143

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



commit 6a4d28c38784f42251a3d2c25b050507bfc4a2d2
Author:    Michael Niedermayer <michaelni at gmx.at> at Sat, 26 Oct 2013 01:22:38 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:11 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=6a4d28c38784f42251a3d2c25b050507bfc4a2d2

h264: make flush_change() set mmco_reset
This ensures that frames do not get mixed on context reinits

Fixes Ticket2836

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



commit ca57c62a56c0d0fe41af715064f3cf0830888cc0
Author:    Michael Niedermayer <michaelni at gmx.at> at Fri, 25 Oct 2013 20:03:29 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:11 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=ca57c62a56c0d0fe41af715064f3cf0830888cc0

avcodec/h264: reduce noisiness of "mmco: unref short failure"
Do not consider it an error if we have no frames and should discard one.
This condition can easily happen when decoding is started from an I frame

Fixes Ticket2811

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

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



commit baa29fac60d950754fd6dba7b6eb105f654f8cf2
Author:    Michael Niedermayer <michaelni at gmx.at> at Fri, 25 Oct 2013 19:35:55 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:11 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=baa29fac60d950754fd6dba7b6eb105f654f8cf2

avformat/mp3dec: perform seek resync in the correct direction
Fixes seeking to the last frame in CBR files
Fixes Ticket2773

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



commit c62efdecec17aadcd1685a2eaa89eafeda16187c
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 24 Oct 2013 23:11:41 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:10 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=c62efdecec17aadcd1685a2eaa89eafeda16187c

avcodec/h264: do not trust last_pic_droppable when marking pictures as done
This simplifies the code and fixes a deadlock

Fixes Ticket2927
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 29ffeef5e73b8f41ff3a3f2242d356759c66f91f)

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



commit da21885d60894500cda38297a3ccd56761b578a2
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 9 Oct 2013 23:52:54 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:10 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=da21885d60894500cda38297a3ccd56761b578a2

avcodec/h264_refs: modify key frame detection heuristic to detect more cases
Fixes Ticket2968

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



commit 2b2f4f0b52c4e7691cd4cf2e6e9e1169c690a0ae
Author:    mrlika <andriy.lysnevych at gmail.com> at Mon, 2 Sep 2013 15:10:22 +0300
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:10 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=2b2f4f0b52c4e7691cd4cf2e6e9e1169c690a0ae

lavd/v4l2: do not fail when VIDIOC_ENUMSTD returns EINVAL without a valid match
With some (buggy) drivers, the VIDIOC_G_STD ioctl returns a std_id that cannot
be matched with any of the enumerated v4l2_standard structures (for example
std_id = 0 or std_id = 0xffffff). Do not fail when we reach the end of the
enumeration without a valid match.

Fixes ticket #2370

Note: This commit message has been modified by Giorgio Vazzana, the original
commit message was:

"Fixed regression for mandatory VIDIOC_ENUMSTD support by v4l2"

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



commit e0a1fa55d0bc8b03ede580607af5f02f6b7d5d3a
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 9 Oct 2013 21:43:06 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:10 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=e0a1fa55d0bc8b03ede580607af5f02f6b7d5d3a

avformat/wavdec: Dont trust the fact chunk for PCM
Fixes Ticket3033

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

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



commit 5cef4f3b4a38795d831e4f64c8dc0fc2f83ed828
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 6 Oct 2013 00:07:28 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:09 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=5cef4f3b4a38795d831e4f64c8dc0fc2f83ed828

avformat/matroskadec: only set r_frame_rate if the value is within reasonable limits
Fixes Ticket2451

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



commit ad847f48abcf6393fa46d231318dec616ac69656
Author:    Michael Niedermayer <michaelni at gmx.at> at Fri, 4 Oct 2013 17:39:19 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:09 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=ad847f48abcf6393fa46d231318dec616ac69656

avformat/mov: force parsing of headers if stts is absent
Fixes Ticket2991

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



commit 37d10704453235d0c72000e0071136ed18d77946
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 3 Oct 2013 01:28:06 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:09 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=37d10704453235d0c72000e0071136ed18d77946

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



commit 9b2cf9454834b1666fd9b0fddc4ace4f444e6a79
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 26 Sep 2013 21:03:48 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:09 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=9b2cf9454834b1666fd9b0fddc4ace4f444e6a79

avcodec/parser: reset indexes on realloc failure
Fixes Ticket2982

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

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



commit 944976ecefb815c07087bb7417d9c3f7837bdcff
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 9 Sep 2013 17:58:18 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:08 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=944976ecefb815c07087bb7417d9c3f7837bdcff

avcodec/ffv1enc: update buffer check for 16bps
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 3728603f1854b5c79d1a64dd3b41b80640ef1e7f)

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



commit 3048a67557fac159369a19d924409c47ccd05cdd
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 8 Sep 2013 20:27:54 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:08 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=3048a67557fac159369a19d924409c47ccd05cdd

avcodec/truemotion2: Fix av_freep arguments
Fixes null pointer dereference
Fixes Ticket2944

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

Conflicts:

	libavcodec/truemotion2.c

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



commit df467d9d9faed678a650d2274a37b22d86731a0e
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 5 Sep 2013 00:36:44 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:08 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=df467d9d9faed678a650d2274a37b22d86731a0e

avcodec/mjpegdec: Add some sanity checks to ljpeg_decode_rgb_scan()
These prevent the rgb ljpeg code from being run on parameters that it doesnt
support. No testcase available but it seems possible to trigger these.

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

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



commit 65418775d175cf6674fea673b7657c00c4744621
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 2 Sep 2013 04:32:23 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:08 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=65418775d175cf6674fea673b7657c00c4744621

avfilter/vf_fps: make sure the fifo is not empty before using it
Fixes Ticket2905

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

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



commit 4de9d5e31a4e8d6ab305487bada0d23bec110e8e
Author:    Michael Niedermayer <michaelni at gmx.at> at Fri, 30 Aug 2013 23:40:47 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:07 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=4de9d5e31a4e8d6ab305487bada0d23bec110e8e

avcodec/dsputil: fix signedness in sizeof() comparissions
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 454a11a1c9c686c78aa97954306fb63453299760)

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



commit 1ceaa71bc86a9e6a613945f33ed3b24822935b59
Author:    Michael Niedermayer <michaelni at gmx.at> at Fri, 30 Aug 2013 06:08:32 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:07 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=1ceaa71bc86a9e6a613945f33ed3b24822935b59

ffv1dec: Check bits_per_raw_sample and colorspace for equality in ver 0/1 headers
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit b05cd1ea7e45a836f7f6071a716c38bb30326e0f)

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



commit 62fb550931da37ef4c960e1da700452fadf30a2a
Author:    Michael Niedermayer <michaelni at gmx.at> at Fri, 30 Aug 2013 04:51:09 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:07 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=62fb550931da37ef4c960e1da700452fadf30a2a

ffv1dec: check that global parameters dont change in version 0/1
Such changes are not allowed nor supported

Fixes Ticket2906

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 547d690d676064069d44703a1917e0dab7e33445)

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



commit 5680bfc6e9763d4c8f0b288cb52622dec1331282
Author:    Michael Niedermayer <michaelni at gmx.at> at Fri, 30 Aug 2013 03:43:49 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:07 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=5680bfc6e9763d4c8f0b288cb52622dec1331282

avcodec/ffv1dec: check global header version
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 20b965a1a43ae88b7ae95635d5a3570e7dc2bbd4)

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



commit bfca46d5606a8f74f75e402d8c6d8c579a77452d
Author:    Timothy Gu <timothygu99 at gmail.com> at Sun, 8 Sep 2013 16:32:22 -0700
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:07 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=bfca46d5606a8f74f75e402d8c6d8c579a77452d

doc/encoders: add doc for AAC encoder
Thanks-to: Kostya Shishkov <kostya.shishkov at gmail.com>
Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Stefano Sabatini <stefasab at gmail.com>
(cherry picked from commit 0e11790cf7eef3b0f38a64486da1e3fb8c7f14b8)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit c8eb0e5d0b3c1fc639eaea4e6995b27c5bcb31ed
Author:    Timothy Gu <timothygu99 at gmail.com> at Sat, 7 Sep 2013 20:13:11 -0700
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:06 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=c8eb0e5d0b3c1fc639eaea4e6995b27c5bcb31ed

doc/encoders: improve libvo-aacenc doc
Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Stefano Sabatini <stefasab at gmail.com>
(cherry picked from commit 81bbe49a0e588aa899f37a567808ba8926d798d6)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 2eb974ab6e8edbc4a40ead585a4cbc744a6dbe52
Author:    Timothy Gu <timothygu99 at gmail.com> at Sun, 15 Sep 2013 19:08:58 -0700
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:06 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=2eb974ab6e8edbc4a40ead585a4cbc744a6dbe52

doc/ffmpeg-formats: Add documentation for 3 parameters that have been missing
Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit b7dd4598630fb1f890ae060f21a9ec92a103f22d)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>

Conflicts:
	doc/formats.texi
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 1d861698d069d9bb8a17ebb60b9a46086f209c23
Author:    Timothy Gu <timothygu99 at gmail.com> at Sun, 8 Sep 2013 16:56:39 -0700
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:06 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=1d861698d069d9bb8a17ebb60b9a46086f209c23

doc/encoders: Remove options that were not there when branch was cut from master
Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit ecd61156dc3cd60e8bf5c590dde10d1a9f7482da
Author:    Timothy Gu <timothygu99 at gmail.com> at Sat, 3 Aug 2013 16:55:40 -0700
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:06 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=ecd61156dc3cd60e8bf5c590dde10d1a9f7482da

doc/encoders: reformat and add some clarification in libtwolame doc
Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Stefano Sabatini <stefasab at gmail.com>
(cherry picked from commit e45e72f5f89ef5a5791562cfcb935028b46ecd0a)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 0b959343266b20a749f0921832b2299b26039199
Author:    Timothy Gu <timothygu99 at gmail.com> at Sat, 3 Aug 2013 16:51:26 -0700
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:05 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=0b959343266b20a749f0921832b2299b26039199

doc/encoders: reformat libmp3lame doc
Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Stefano Sabatini <stefasab at gmail.com>
(cherry picked from commit 40b8350b57adaa9aaf6731bac5130d4fec1639c3)

Conflicts:
	doc/encoders.texi
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit eddce5a5c739bdbaff73e0c273b7969a59dda128
Author:    Clément Bœsch <u at pkh.me> at Sun, 8 Sep 2013 18:28:11 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:05 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=eddce5a5c739bdbaff73e0c273b7969a59dda128

avcodec/srtdec: fix potential overread.
(cherry picked from commit 3a54c221d574ec944db1eddf9df895808f32bf9e)

Signed-off-by: Alexander Strasser <eclipse7 at gmx.net>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit f432f2a3ec9baf44e869ca35ae4a2e35f505a220
Author:    Clément Bœsch <u at pkh.me> at Sun, 8 Sep 2013 18:02:45 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:05 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=f432f2a3ec9baf44e869ca35ae4a2e35f505a220

avformat/subtitles: add a next line jumper and use it.
This fixes a bunch of possible overread in avformat with the idiom p +=
strcspn(p, "\n") + 1 (strcspn() can focus on the trailing '\0' if no
'\n' is found, so the +1 leads to an overread).

Note on lavf/matroskaenc: no extra subtitles.o Makefile dependency is
added because only the header is required for ff_subtitles_next_line().

Note on lavf/mpsubdec: code gets slightly complex to avoid an infinite
loop in the probing since there is no more forced increment.

NOTE:
Code of function ff_subtitles_next_line fixed by Alexander Strasser.

The original code from master did test the wrong character, but was
corrected by a subsequent commit. That commit however is not backported,
so it had to be fixed in this commit for the backport.

Conflicts:
	libavformat/mpl2dec.c

(cherry picked from commit 90fc00a623de44e137fe1601b91356e8cd8bdd54)

Signed-off-by: Alexander Strasser <eclipse7 at gmx.net>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit cef4e4985bfe5a03453f6b6bd3ea59bdf5606b6e
Author:    Clément Bœsch <u at pkh.me> at Sun, 8 Sep 2013 16:17:46 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:05 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=cef4e4985bfe5a03453f6b6bd3ea59bdf5606b6e

avformat/srtdec: skip initial random line breaks.
I found a bunch of (recent) SRT files in the wild with 3 to 10 line
breaks at the beginning.

(cherry picked from commit cfcd55db164e0acc0c30b2cf084e6eebe9741d34)

Signed-off-by: Alexander Strasser <eclipse7 at gmx.net>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit a3a83bfa465e3e41c9473a36ec330f6da08a2728
Author:    Carl Eugen Hoyos <cehoyos at ag.or.at> at Mon, 9 Sep 2013 10:03:14 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:05 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=a3a83bfa465e3e41c9473a36ec330f6da08a2728

Use rc_max_rate if no video bit_rate was specified when muxing mxf_d10.
Fixes ticket #2945.

Reviewed-by: Matthieu Bouron
(cherry picked from commit d73565d5ddf41d4b7805327cdb271c59d8c3fc59)

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



commit a21b2b99b8c358a980010f14635ce9db8903f2ee
Author:    Carl Eugen Hoyos <cehoyos at ag.or.at> at Mon, 9 Sep 2013 10:02:12 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:04 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=a21b2b99b8c358a980010f14635ce9db8903f2ee

Store the video bit_rate in the context when muxing mxf.
This will allow using rc_max_rate if no bit_rate is specified (on remuxing).

Reviewed-by: Matthieu Bouron
(cherry picked from commit 52cf08b4c8859f7cac010a7a59f7aa369384ad85)

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



commit 9941ac7b1402d36a2ab428100e855887026623d6
Author:    Clément Bœsch <u at pkh.me> at Sun, 8 Sep 2013 09:55:02 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:04 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=9941ac7b1402d36a2ab428100e855887026623d6

avformat/subtitles: check lower bound for duration overlap seeking.
(cherry picked from commit 1ca4bf930bab681a79fb591330043675c7cfd798)

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



commit ac004a8316294de028782c65b7a8a4747df90804
Author:    Clément Bœsch <u at pkh.me> at Sun, 8 Sep 2013 09:43:53 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:04 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=ac004a8316294de028782c65b7a8a4747df90804

avformat/vobsub: fix seeking.
(cherry picked from commit f8678dcef3c5b0ea82e898e1f419863409fa135f)

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



commit f0b2dd4b17495f59a6c015900f49ec9996bc327b
Author:    Paul B Mahol <onemda at gmail.com> at Sun, 8 Sep 2013 12:35:31 +0000
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:03 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=f0b2dd4b17495f59a6c015900f49ec9996bc327b

avformat/matroskaenc: remove bogus prores tag
Fixes: ffmpeg -i input -c:v prores output.mkv

Signed-off-by: Paul B Mahol <onemda at gmail.com>
(cherry picked from commit 14851ca5f5a3af140085e82589e28e06c7cdefdc)

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



commit 85d3cb53816517b4b5521a33dce11fb766f60777
Author:    Carl Eugen Hoyos <cehoyos at ag.or.at> at Sun, 1 Sep 2013 20:20:47 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:03 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=85d3cb53816517b4b5521a33dce11fb766f60777

Read h264 headers from v4l2 to allow stream-copying.
Fixes ticket #2882.
Analyzed and tested by William C Bonner.
(cherry picked from commit e337c9d56408dc00a15887309488a1ff5cb06ba3)

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



commit 326e84f705d1aa4680d9cfe241cc91307214cacb
Author:    Paul B Mahol <onemda at gmail.com> at Tue, 3 Sep 2013 01:03:10 +0000
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:03 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=326e84f705d1aa4680d9cfe241cc91307214cacb

w64dec: fix end position of summarylist guid
Noticed-by: James Almer

Signed-off-by: Paul B Mahol <onemda at gmail.com>
(cherry picked from commit 3e36dc8626f4721ea749286dae40169ee5cb7d04)
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 6092750c8fad6c1911b15315ca57acb8b782f976
Author:    Paul B Mahol <onemda at gmail.com> at Mon, 2 Sep 2013 22:50:00 +0000
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:03 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=6092750c8fad6c1911b15315ca57acb8b782f976

w64dec: fix skipping of unknown guids
Regression since 14d50c1.
Fixes #2932.

Signed-off-by: Paul B Mahol <onemda at gmail.com>
(cherry picked from commit 79b70e47a463057a3a48353ee1dd58671c11f86c)
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 457d0bed9643bf2ee7d40aa2cd71325599a9ebd5
Author:    Carl Eugen Hoyos <cehoyos at ag.or.at> at Mon, 2 Sep 2013 08:32:24 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:02 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=457d0bed9643bf2ee7d40aa2cd71325599a9ebd5

Avoid a deadlock when decoding wma.
Fixes ticket #2925.
(cherry picked from commit ec8a4841f7e81040f9a2757f23e70dff5e6b33a4)

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



commit a36d535dd0f1dd3dc33970553f1d720432d0cdb9
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 1 Sep 2013 00:21:37 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:02 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=a36d535dd0f1dd3dc33970553f1d720432d0cdb9

avformat/lxfdec: use a parser to parse video frame headers
lxf needs a parser (or would need to set a few fields explicitly).
Fixes Ticket2917

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



commit c91049cb0eaa5d818d5e785589f080b231eade33
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 1 Sep 2013 03:40:20 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:02 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=c91049cb0eaa5d818d5e785589f080b231eade33

avcodec/h264: set er.ref_count earlier
Fixes Ticket2910

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



commit e6039b0cc385044350790fc52ab532d5db6642b7
Author:    Michael Niedermayer <michaelni at gmx.at> at Sat, 31 Aug 2013 03:08:25 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:02 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=e6039b0cc385044350790fc52ab532d5db6642b7

avformat/avidec: match first index and first packet size=0 handling
Fixes Ticket2861

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

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



commit 12ebee2701cd10985db7bada1fcad173e6c40195
Author:    Michael Niedermayer <michaelni at gmx.at> at Fri, 30 Aug 2013 23:14:32 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:01 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=12ebee2701cd10985db7bada1fcad173e6c40195

avcodec/pngdsp: fix (un)signed type in end comparission
Fixes out of array accesses
Fixes Ticket2919

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



commit 1eb7043458bc1adffdc50edb04f859b3e509f9a9
Author:    Stefano Sabatini <stefasab at gmail.com> at Sat, 27 Jul 2013 16:50:19 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:01 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=1eb7043458bc1adffdc50edb04f859b3e509f9a9

doc/codecs: fix dangling reference to codec-options chapter (cherry picked from commit b4bd21b7fe2ad8be59b16538448586814e5db65b)
Signed-off-by: Timothy Gu <timothygu99 at gmail.com>

Conflicts:
	doc/codecs.texi
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit b2386cc9525976aa077819a7280417b04983a302
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 27 Aug 2013 00:26:24 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:01 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=b2386cc9525976aa077819a7280417b04983a302

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



commit 5df28d9d629fb471baac51d548794abfb4d56190
Author:    Stefano Sabatini <stefasab at gmail.com> at Sat, 6 Apr 2013 01:43:01 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:01 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=5df28d9d629fb471baac51d548794abfb4d56190

doc/filters: review introductory example and explanation
In particular, fix wrong vertical mirroring command, and clarify
and extend explanation.

Based on a patch by littlebat <dashing.meng at gmail.com>.

Should fix trac ticket #2413.
(cherry picked from commit 215ca864759a54f45265a51ac57dbfd75cb23da2)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>

Conflicts:
	doc/filters.texi
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit e261696ca24bf3b32c4459ea7533a3d69fb0d848
Author:    Timothy Gu <timothygu99 at gmail.com> at Mon, 29 Jul 2013 19:12:10 -0700
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:01 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=e261696ca24bf3b32c4459ea7533a3d69fb0d848

doc/encoders: add libxvid doc
Signed-off-by: Stefano Sabatini <stefasab at gmail.com>
(cherry picked from commit 6b255e5e70c72aa59ff7aed74b4ee976223eb140)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>

Conflicts:
	doc/encoders.texi
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 5584dfb9d4c695aab28b6a6135c3f084acd41f7c
Author:    Timothy Gu <timothygu99 at gmail.com> at Mon, 22 Jul 2013 16:44:11 -0700
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:00 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=5584dfb9d4c695aab28b6a6135c3f084acd41f7c

doc/encoders: partially rewrite and reformat libx264 docs
Format is based on the thread:
"[PATCH] doc/encoders: Add libopus encoder doc" (06-28-2013)
http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/165368/

Also merge the two option sections (Mapping and Private options).

Patch partially edited by Stefano Sabatini.

Signed-off-by: Stefano Sabatini <stefasab at gmail.com>
(cherry picked from commit 11cb697501edf6447a718d6194f0e63ec2310d39)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit ff0b99bcdca00ebf0f7a0ca145579ce63a979eb8
Author:    Timothy Gu <timothygu99 at gmail.com> at Fri, 5 Jul 2013 20:37:18 -0700
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:00 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=ff0b99bcdca00ebf0f7a0ca145579ce63a979eb8

doc/encoders: add libopus encoder doc
Signed-off-by: Stefano Sabatini <stefasab at gmail.com>
(cherry picked from commit 561e05136f1cbe28a79af1940aa137f70281eef4)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit f4dc5b0a3183f76b547e77bc2a787d702f5c39be
Author:    Timothy Gu <timothygu99 at gmail.com> at Tue, 2 Jul 2013 19:32:27 -0700
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:00 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=f4dc5b0a3183f76b547e77bc2a787d702f5c39be

doc/muxers: Add AIFF doc
Signed-off-by: Stefano Sabatini <stefasab at gmail.com>
(cherry picked from commit 4ec46b1160eb549a551823c168905b43922add31)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 32386a2dcf4afabbf9396e594039a0120710f4d0
Author:    Timothy Gu <timothygu99 at gmail.com> at Thu, 27 Jun 2013 19:07:32 -0700
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:00 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=32386a2dcf4afabbf9396e594039a0120710f4d0

doc/decoders: document libopus decoder
Signed-off-by: Stefano Sabatini <stefasab at gmail.com>
(cherry picked from commit 7eb5288f17aad81d5bd1b4d3d46533e457df262c)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit fc0a951395c24e23257349487ac16d717b5fe8f1
Author:    Timothy Gu <timothygu99 at gmail.com> at Thu, 27 Jun 2013 18:50:54 -0700
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:03:00 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=fc0a951395c24e23257349487ac16d717b5fe8f1

doc/encoders: alphabetically list the encoders
Signed-off-by: Stefano Sabatini <stefasab at gmail.com>
(cherry picked from commit 934df3b0375743ae2b03168a4174edb9f88a6889)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 2ccaa446862fae4bc3c8ec0b8b80329f0f367cc1
Author:    Timothy Gu <timothygu99 at gmail.com> at Fri, 21 Jun 2013 18:17:21 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:59 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=2ccaa446862fae4bc3c8ec0b8b80329f0f367cc1

doc/decoders: Add libopencore-amrwb decoder doc
Signed-off-by: Stefano Sabatini <stefasab at gmail.com>
(cherry picked from commit 83647ace735d1707d4b28345ef77fefe525ea52e)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 09301b2cce5e7296dedc0bc1c98d6166812d0fe1
Author:    Timothy Gu <timothygu99 at gmail.com> at Thu, 20 Jun 2013 20:08:35 -0700
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:59 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=09301b2cce5e7296dedc0bc1c98d6166812d0fe1

doc/decoders: Document libopencore-amrnb decoder
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit b43860ee0c27279f2fa020ea965c03d359f8f45c)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit f580ca58bae497a685ee5b9ecbdf7f0d8efbddd4
Author:    Timothy Gu <timothygu99 at gmail.com> at Thu, 20 Jun 2013 16:33:49 -0700
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:59 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=f580ca58bae497a685ee5b9ecbdf7f0d8efbddd4

doc/decoders: Document libilbc decoder
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 8cdea50f6eee1271e24ff0c9590522f8323e87fe)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 4f15bbba7d5f0e3bdb16a7288e098f81107114a4
Author:    Timothy Gu <timothygu99 at gmail.com> at Tue, 18 Jun 2013 16:01:43 -0700
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:59 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=4f15bbba7d5f0e3bdb16a7288e098f81107114a4

doc/decoders: Document libgsm decoder
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit c16496c3770fa083472ab86146c18dc96c1feea7)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 05547791e05b46735d7e6ae955beb9c70b1e928f
Author:    Timothy Gu <timothygu99 at gmail.com> at Mon, 17 Jun 2013 17:38:38 -0700
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:58 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=05547791e05b46735d7e6ae955beb9c70b1e928f

doc/encoders: Add libopencore-amrnb doc
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 9ead06057acfcc43bcb99a63a7c58543007b2847)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit a3239de97d92243353ee6ce395a567f5f0d71646
Author:    Timothy Gu <timothygu99 at gmail.com> at Mon, 17 Jun 2013 17:42:08 -0700
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:58 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=a3239de97d92243353ee6ce395a567f5f0d71646

doc/decoders: Document libcelt
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit e3580449221c79cf611995dc7e2fcb61dd867d4c)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 50f7d113d81eaa058c452956f55f18876191e015
Author:    Timothy Gu <timothygu99 at gmail.com> at Tue, 11 Jun 2013 16:52:12 -0700
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:58 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=50f7d113d81eaa058c452956f55f18876191e015

doc/general: Make the license status of the Android libraries clearer
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6fe419bf73146655961a373c734e9e4d8826c835)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 61674c257702b2520fb07efe63340c96f75eb1cf
Author:    Timothy Gu <timothygu99 at gmail.com> at Tue, 11 Jun 2013 16:58:01 -0700
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:58 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=61674c257702b2520fb07efe63340c96f75eb1cf

doc/encoders: Add libvo-amrwbenc doc
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 0ec65aa1046a4417d5c7dfcf8faeecde60e3fe00)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>

Conflicts:
	doc/encoders.texi
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 1705bee6846655dd146deabe3682b152a5919fe2
Author:    Timothy Gu <timothygu99 at gmail.com> at Fri, 7 Jun 2013 19:54:23 -0700
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:58 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=1705bee6846655dd146deabe3682b152a5919fe2

doc/encoders: Add libvo-aacenc doc
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit ba7cb4807f050c401f8fd7ef1d1065b138358135)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 11816fd44b3267c94d788eb9a69b473e4d6fde13
Author:    Timothy Gu <timothygu99 at gmail.com> at Sat, 1 Jun 2013 16:26:03 -0700
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:57 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=11816fd44b3267c94d788eb9a69b473e4d6fde13

doc/encoders: add documentation for libtwolame (cherry picked from commit ea038b996d5662702b2247a6aa919dee1cebc0be)
Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 058308c67bdf6765789fb46ff19325c7d3267e43
Author:    Timothy Gu <timothygu99 at gmail.com> at Fri, 24 May 2013 12:28:48 -0700
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:57 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=058308c67bdf6765789fb46ff19325c7d3267e43

doc/encoders: Add documentation for libmp3lame
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 4703a345fb41b14fe28f7e6bf7f60bb2213aa9e0)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 9e5560fe55c6427a4add4b26a35162a6de5a7d78
Author:    Timothy Gu <timothygu99 at gmail.com> at Sun, 31 Mar 2013 12:20:17 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:57 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=9e5560fe55c6427a4add4b26a35162a6de5a7d78

doc/filters: fix width/height typo in crop filter.
Signed-off-by: Clément Bœsch <ubitux at gmail.com>
(cherry picked from commit 874173002e9ea7e3504197c2f55a565f78cddf61)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 502d2f3d155367615f6848cf2e25759d30ffd435
Author:    Michael Niedermayer <michaelni at gmx.at> at Sun, 18 Aug 2013 02:20:54 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:57 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=502d2f3d155367615f6848cf2e25759d30ffd435

avformat/matroskadec: check out_samplerate before using it in av_rescale()
Prevent assertion failure with damaged input

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

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



commit 82c803f5cf4881f86329e04486b9c2547a374289
Author:    James Almer <jamrial at gmail.com> at Sat, 17 Aug 2013 14:48:33 -0300
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:56 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=82c803f5cf4881f86329e04486b9c2547a374289

matroskadec: Improve TTA duration calculation
Calculate the duration as accurately as possible to improve decoding of samples
where the last frame is smaller than the rest.

Signed-off-by: James Almer <jamrial at gmail.com>
Approved-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit af248fa1174200acb537a6ab1198bb2fed38e884)
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 81371d10fe5936d7d02e10f5957c1a3ead21d00f
Author:    Michael Niedermayer <michaelni at gmx.at> at Wed, 17 Jul 2013 13:30:36 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:56 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=81371d10fe5936d7d02e10f5957c1a3ead21d00f

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



commit 4fd9ee08e6461c0d607b7ded94aaebaa78a3f287
Author:    James Almer <jamrial at gmail.com> at Wed, 17 Jul 2013 03:10:16 -0300
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:56 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=4fd9ee08e6461c0d607b7ded94aaebaa78a3f287

lavf/matroskaenc: Check for valid metadata before creating tags
Tags must have at least one SimpleTag element to be spec conformant.
Updated lavf-mkv and seek-lavf-mkv FATE references as the tests were affected by
this.

Fixes ticket #2785

Signed-off-by: James Almer <jamrial at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 088ed5314694031e07e02e9d364c9d486a60e704)
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 3108e109c33db5725b852a7ac57e74bff62b9e0c
Author:    Michael Niedermayer <michaelni at gmx.at> at Mon, 20 May 2013 04:00:30 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:56 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=3108e109c33db5725b852a7ac57e74bff62b9e0c

matroska_read_seek: Fix used streams for subtitle index compensation
Might fix Ticket1907 (I have no testcase so i cant test)

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

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



commit 7a7cd8515606ce43db2b984b316fe789aca2c80f
Author:    Michael Niedermayer <michaelni at gmx.at> at Sat, 24 Aug 2013 03:19:40 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:56 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=7a7cd8515606ce43db2b984b316fe789aca2c80f

jpeg2000: check log2_cblk dimensions
Fixes out of array access
Fixes Ticket2895

Found-by: Piotr Bandurski <ami_stuff at o2.pl>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 9a271a9368eaabf99e6c2046103acb33957e63b7)

Conflicts:

	libavcodec/jpeg2000dec.c

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



commit 16ae3e77e10a9c8dfe5ed3ab038164d967b39aca
Author:    Michael Niedermayer <michaelni at gmx.at> at Thu, 22 Aug 2013 01:07:32 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:55 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=16ae3e77e10a9c8dfe5ed3ab038164d967b39aca

avcodec/rpza: Perform pointer advance and checks before using the pointers
Fixes out of array accesses
Fixes Ticket2850

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

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



commit 6f40cfc85fe3d889befa665e255a9418cb375437
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 20 Aug 2013 23:18:48 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:55 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=6f40cfc85fe3d889befa665e255a9418cb375437

avcodec/flashsv: check diff_start/height
Fixes out of array accesses
Fixes Ticket2844

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 880c73cd76109697447fbfbaa8e5ee5683309446)

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



commit a18e820c443bc05af7f43419745dbc15ae72eb57
Author:    Michael Niedermayer <michaelni at gmx.at> at Fri, 9 Aug 2013 13:23:10 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:55 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=a18e820c443bc05af7f43419745dbc15ae72eb57

avformat/paf: Fix integer overflow and out of array read
Found-by:  Laurent Butti <laurentb at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit f58cd2867a8af2eed13acdd21d067b48249b14a1)

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



commit 97ef6ad14038067660d8ebd1608020a5403c2eb7
Author:    Michael Niedermayer <michaelni at gmx.at> at Sat, 3 Aug 2013 18:54:43 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:55 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=97ef6ad14038067660d8ebd1608020a5403c2eb7

avfilter: fix plane validity checks
Fixes out of array accesses

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

Conflicts:

	libavfilter/vf_delogo.c
	libavfilter/vf_fieldmatch.c
	libavfilter/vf_fieldorder.c
	libavfilter/vf_hflip.c
	libavfilter/vf_kerndeint.c
	libavfilter/vf_lut.c
	libavfilter/vf_pad.c
	libavfilter/vf_showinfo.c
	libavfilter/vf_vignette.c

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



commit b1ff9560e7d31926134085e6eec7626224f40a5d
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 20 Aug 2013 16:56:51 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:54 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=b1ff9560e7d31926134085e6eec7626224f40a5d

swr/rematrix: Fix handling of AV_CH_LAYOUT_STEREO_DOWNMIX output
Fixes Ticket2859

Note, testcases related to the downmix channels are welcome.
(id like to make sure this is working correctly now, as obviously it didnt
 work before ...)

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



commit d0bdff674a30a82df1ecfc3fb1bdf1cb193a7866
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 20 Aug 2013 16:49:31 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:54 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=d0bdff674a30a82df1ecfc3fb1bdf1cb193a7866

swr: clean layouts before checking sanity
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6dfffe92004dfd8c79d18791f28a2b1c7e387845)
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>



commit 819e8b3052deb1e6a01e14047b01391fa29525c2
Author:    Michael Niedermayer <michaelni at gmx.at> at Tue, 20 Aug 2013 13:45:20 +0200
Committer: Jean-Yves Avenard <jyavenard at mythtv.org> at Sun, 4 May 2014 03:02:54 +1000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=819e8b3052deb1e6a01e14047b01391fa29525c2

movenc: ilbc needs audio_vbr set.
Without this the block_align or bitrate value is not available to the decoder

Fixes Ticket2858

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



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

Summary of changes:
 mythtv/external/FFmpeg/README.sync                 |    1 +
 mythtv/external/FFmpeg/RELEASE                     |    2 +-
 mythtv/external/FFmpeg/VERSION                     |    2 +-
 mythtv/external/FFmpeg/cmdutils.c                  |    2 +-
 mythtv/external/FFmpeg/configure                   |   28 +-
 mythtv/external/FFmpeg/doc/Doxyfile                |    2 +-
 mythtv/external/FFmpeg/doc/decoders.texi           |   72 ++
 mythtv/external/FFmpeg/doc/encoders.texi           |  906 ++++++++++++++++---
 mythtv/external/FFmpeg/doc/ffmpeg-codecs.texi      |    1 +
 mythtv/external/FFmpeg/doc/ffmpeg-formats.texi     |    9 +
 mythtv/external/FFmpeg/doc/filters.texi            |   41 +-
 mythtv/external/FFmpeg/doc/general.texi            |   11 +-
 mythtv/external/FFmpeg/doc/muxers.texi             |   17 +
 mythtv/external/FFmpeg/ffmpeg.c                    |    7 +-
 mythtv/external/FFmpeg/ffprobe.c                   |    1 +
 mythtv/external/FFmpeg/ffserver.c                  |    9 +
 mythtv/external/FFmpeg/libavcodec/aacdec.c         |    3 +
 mythtv/external/FFmpeg/libavcodec/aacps.c          |    4 +-
 mythtv/external/FFmpeg/libavcodec/adpcm.c          |   16 +-
 mythtv/external/FFmpeg/libavcodec/ansi.c           |   10 +-
 mythtv/external/FFmpeg/libavcodec/arm/dca.h        |   74 +-
 mythtv/external/FFmpeg/libavcodec/arm/int_neon.S   |   12 +-
 mythtv/external/FFmpeg/libavcodec/avpacket.c       |    2 +-
 mythtv/external/FFmpeg/libavcodec/bink.c           |   13 +-
 mythtv/external/FFmpeg/libavcodec/bitstream.c      |    8 +
 mythtv/external/FFmpeg/libavcodec/c93.c            |    8 +-
 mythtv/external/FFmpeg/libavcodec/cabac.c          |    2 +-
 mythtv/external/FFmpeg/libavcodec/dnxhdenc.c       |    2 +-
 mythtv/external/FFmpeg/libavcodec/dsputil.c        |    4 +-
 mythtv/external/FFmpeg/libavcodec/dxa.c            |   10 +
 mythtv/external/FFmpeg/libavcodec/eamad.c          |    5 +
 .../external/FFmpeg/libavcodec/error_resilience.c  |   17 +-
 mythtv/external/FFmpeg/libavcodec/evrcdec.c        |   10 +-
 mythtv/external/FFmpeg/libavcodec/ffv1dec.c        |   61 +-
 mythtv/external/FFmpeg/libavcodec/ffv1enc.c        |    2 +-
 mythtv/external/FFmpeg/libavcodec/flashsv.c        |    4 +
 mythtv/external/FFmpeg/libavcodec/h263dec.c        |    4 +-
 mythtv/external/FFmpeg/libavcodec/h264.c           |   60 +-
 mythtv/external/FFmpeg/libavcodec/h264_cavlc.c     |   10 +-
 mythtv/external/FFmpeg/libavcodec/h264_refs.c      |   10 +-
 mythtv/external/FFmpeg/libavcodec/j2kdec.c         |    8 +
 mythtv/external/FFmpeg/libavcodec/jpeglsdec.c      |    2 +
 mythtv/external/FFmpeg/libavcodec/lcldec.c         |   10 +
 mythtv/external/FFmpeg/libavcodec/libopusenc.c     |    2 +-
 mythtv/external/FFmpeg/libavcodec/mjpegdec.c       |   15 +-
 .../external/FFmpeg/libavcodec/mpegvideo_motion.c  |   10 +-
 mythtv/external/FFmpeg/libavcodec/msrle.c          |    3 +-
 mythtv/external/FFmpeg/libavcodec/msvideo1enc.c    |    2 +-
 mythtv/external/FFmpeg/libavcodec/parser.c         |   10 +-
 mythtv/external/FFmpeg/libavcodec/pngdsp.c         |    2 +-
 mythtv/external/FFmpeg/libavcodec/pthread.c        |    5 +-
 mythtv/external/FFmpeg/libavcodec/rpza.c           |    8 +-
 mythtv/external/FFmpeg/libavcodec/shorten.c        |    4 +-
 mythtv/external/FFmpeg/libavcodec/snow.h           |    6 +-
 mythtv/external/FFmpeg/libavcodec/srtdec.c         |    3 +-
 mythtv/external/FFmpeg/libavcodec/svq3.c           |    4 +-
 mythtv/external/FFmpeg/libavcodec/takdec.c         |    8 +-
 mythtv/external/FFmpeg/libavcodec/truemotion2.c    |   16 +-
 mythtv/external/FFmpeg/libavcodec/utils.c          |   19 +-
 mythtv/external/FFmpeg/libavcodec/utvideoenc.c     |    5 +-
 mythtv/external/FFmpeg/libavcodec/vc1.c            |    2 +
 mythtv/external/FFmpeg/libavcodec/vdpau_vc1.c      |    2 +-
 mythtv/external/FFmpeg/libavcodec/vmnc.c           |    5 +
 mythtv/external/FFmpeg/libavcodec/vorbisdec.c      |   37 +-
 mythtv/external/FFmpeg/libavcodec/wmadec.c         |    4 +
 mythtv/external/FFmpeg/libavcodec/wmalosslessdec.c |    4 +-
 mythtv/external/FFmpeg/libavcodec/wmaprodec.c      |    3 +-
 mythtv/external/FFmpeg/libavcodec/xan.c            |    5 +
 mythtv/external/FFmpeg/libavdevice/v4l2.c          |    7 +
 mythtv/external/FFmpeg/libavfilter/avfilter.c      |    6 +-
 mythtv/external/FFmpeg/libavfilter/vf_boxblur.c    |    4 +-
 mythtv/external/FFmpeg/libavfilter/vf_delogo.c     |    2 +-
 mythtv/external/FFmpeg/libavfilter/vf_drawtext.c   |    1 -
 mythtv/external/FFmpeg/libavfilter/vf_fieldorder.c |    2 +-
 mythtv/external/FFmpeg/libavfilter/vf_fps.c        |    2 +-
 mythtv/external/FFmpeg/libavfilter/vf_gradfun.c    |    2 +-
 mythtv/external/FFmpeg/libavfilter/vf_hflip.c      |    2 +-
 mythtv/external/FFmpeg/libavfilter/vf_kerndeint.c  |    2 +-
 mythtv/external/FFmpeg/libavfilter/vf_lut.c        |    2 +-
 mythtv/external/FFmpeg/libavfilter/vf_pad.c        |    2 +-
 mythtv/external/FFmpeg/libavfilter/vf_showinfo.c   |    4 +-
 mythtv/external/FFmpeg/libavformat/aiffdec.c       |    2 +-
 mythtv/external/FFmpeg/libavformat/asfdec.c        |    2 +-
 mythtv/external/FFmpeg/libavformat/asfenc.c        |    2 +-
 mythtv/external/FFmpeg/libavformat/avidec.c        |   17 +-
 mythtv/external/FFmpeg/libavformat/avienc.c        |    2 +-
 mythtv/external/FFmpeg/libavformat/flvdec.c        |    4 +
 mythtv/external/FFmpeg/libavformat/id3v2.c         |   17 +-
 mythtv/external/FFmpeg/libavformat/id3v2.h         |    4 +-
 mythtv/external/FFmpeg/libavformat/jacosubdec.c    |    2 +-
 mythtv/external/FFmpeg/libavformat/lxfdec.c        |    1 +
 mythtv/external/FFmpeg/libavformat/matroskadec.c   |   23 +-
 mythtv/external/FFmpeg/libavformat/matroskaenc.c   |   37 +-
 mythtv/external/FFmpeg/libavformat/microdvddec.c   |    2 +-
 mythtv/external/FFmpeg/libavformat/mov.c           |    7 +
 mythtv/external/FFmpeg/libavformat/movenc.c        |    3 +
 mythtv/external/FFmpeg/libavformat/mp3dec.c        |    5 +-
 mythtv/external/FFmpeg/libavformat/mpeg.c          |   16 +
 mythtv/external/FFmpeg/libavformat/mpegtsenc.c     |    9 +-
 mythtv/external/FFmpeg/libavformat/mpl2dec.c       |    2 +-
 mythtv/external/FFmpeg/libavformat/mpsubdec.c      |    6 +-
 mythtv/external/FFmpeg/libavformat/mxfdec.c        |    9 +-
 mythtv/external/FFmpeg/libavformat/mxfenc.c        |   16 +-
 mythtv/external/FFmpeg/libavformat/nutenc.c        |    9 +-
 mythtv/external/FFmpeg/libavformat/oggdec.c        |    5 +
 mythtv/external/FFmpeg/libavformat/omadec.c        |    2 +-
 mythtv/external/FFmpeg/libavformat/paf.c           |    5 +-
 mythtv/external/FFmpeg/libavformat/riff.c          |   12 +-
 mythtv/external/FFmpeg/libavformat/riff.h          |    2 +-
 mythtv/external/FFmpeg/libavformat/rtpdec_asf.c    |    2 +
 mythtv/external/FFmpeg/libavformat/srtdec.c        |    9 +-
 mythtv/external/FFmpeg/libavformat/subtitles.c     |   19 +-
 mythtv/external/FFmpeg/libavformat/subtitles.h     |   13 +
 mythtv/external/FFmpeg/libavformat/thp.c           |   16 +-
 mythtv/external/FFmpeg/libavformat/utils.c         |   13 +-
 mythtv/external/FFmpeg/libavformat/vqf.c           |    5 +
 mythtv/external/FFmpeg/libavformat/wavdec.c        |   15 +-
 mythtv/external/FFmpeg/libavformat/wtvenc.c        |   51 +-
 mythtv/external/FFmpeg/libavutil/log.c             |    3 +
 mythtv/external/FFmpeg/libavutil/opt.c             |    2 +-
 mythtv/external/FFmpeg/libavutil/samplefmt.c       |    2 +
 mythtv/external/FFmpeg/libavutil/timestamp.h       |    4 +
 mythtv/external/FFmpeg/libswresample/rematrix.c    |   11 +-
 .../external/FFmpeg/libswscale/swscale_unscaled.c  |    2 +-
 mythtv/external/FFmpeg/libswscale/utils.c          |    7 +-
 mythtv/external/FFmpeg/libswscale/x86/swscale.c    |    3 +-
 mythtv/external/FFmpeg/tests/ref/lavf/mkv          |    8 +-
 mythtv/external/FFmpeg/tests/ref/lavf/wtv          |    2 +-
 mythtv/external/FFmpeg/tests/ref/seek/lavf-mkv     |   44 +-
 mythtv/external/FFmpeg/tests/ref/seek/lavf-wtv     |   44 +-
 130 files changed, 1689 insertions(+), 513 deletions(-)

-- 



More information about the mythtv-commits mailing list