October 2016 - ffmpeg-devel - lists.ffmpeg.org

[PATCH] lavc/mediacodecdec_h2645: fix nalu data_size type
by Matthieu Bouron 03 Oct '16

03 Oct '16

From: Matthieu Bouron <matthieu.bouron(a)stupeflix.com> --- libavcodec/mediacodecdec_h2645.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mediacodecdec_h2645.c b/libavcodec/mediacodecdec_h2645.c index 122be88..9f8110c 100644 --- a/libavcodec/mediacodecdec_h2645.c +++ b/libavcodec/mediacodecdec_h2645.c @@ -154,7 +154,7 @@ static int h264_set_extradata(AVCodecContext *avctx, FFAMediaFormat *format) if (pps && sps) { uint8_t *data = NULL; - size_t data_size = 0; + int data_size = 0; if ((ret = h2645_ps_to_nalu(sps->data, sps->data_size, &data, &data_size)) < 0) { goto done; -- 2.10.0

3 4

[PATCH] fate: Add PSP test
by Michael Niedermayer 02 Oct '16

02 Oct '16

Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- tests/fate/ffmpeg.mak | 4 + tests/ref/fate/psp | 287 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 291 insertions(+) create mode 100644 tests/ref/fate/psp diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index eb90090..a0d9f9b 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -105,5 +105,9 @@ fate-ffmpeg-bsf-remove-e: $(TARGET_SAMPLES)/mpeg2/matrixbench_mpeg2.lq1.mpg fate-ffmpeg-bsf-remove-e: CMD = transcode "mpeg" $(TARGET_SAMPLES)/mpeg2/matrixbench_mpeg2.lq1.mpg\ avi "-vbsf remove_extra=e" "-codec copy" +FATE_SAMPLES_FFMPEG-$(call ALLYES, MOV_DEMUXER MOV_MUXER) += fate-psp +fate-psp: $(TARGET_SAMPLES)/h264/wwwq_cut.mp4 +fate-psp: CMD = transcode "mov" $(TARGET_SAMPLES)/h264/wwwq_cut.mp4\ + psp "-c copy" "-codec copy" FATE_SAMPLES_FFMPEG-yes += $(FATE_STREAMCOPY-yes) diff --git a/tests/ref/fate/psp b/tests/ref/fate/psp new file mode 100644 index 0000000..df6e532 --- /dev/null +++ b/tests/ref/fate/psp @@ -0,0 +1,287 @@ +c4b2503a069fecd2f82704decf285160 *tests/data/fate/psp.psp +2041379 tests/data/fate/psp.psp +#extradata 0: 51, 0xaf6d1012 +#extradata 1: 2, 0x00b200a1 +#tb 0: 1/90000 +#media_type 0: video +#codec_id 0: h264 +#dimensions 0: 1280x720 +#sar 0: 3/4 +#tb 1: 1/48000 +#media_type 1: audio +#codec_id 1: aac +#sample_rate 1: 48000 +#channel_layout 1: 3 +0, 0, 0, 3003, 37084, 0x021a0d3f +1, 0, 0, 1024, 10, 0x0e270398 +1, 1024, 1024, 1025, 10, 0x0f4703b8 +0, 3003, 3003, 3003, 6925, 0x011b3822, F=0x0 +1, 2049, 2049, 1023, 334, 0x2675a55f +1, 3072, 3072, 1024, 230, 0xae3f7159 +0, 6006, 6006, 3003, 7555, 0x1bca7055, F=0x0 +1, 4096, 4096, 1025, 262, 0x76e98657 +0, 9009, 9009, 3003, 8757, 0x3a20f1d9, F=0x0 +1, 5121, 5121, 1023, 233, 0x262577fd +1, 6144, 6144, 1024, 233, 0x75ab73c7 +0, 12012, 12012, 3003, 13027, 0x40e3644b, F=0x0 +1, 7168, 7168, 1025, 236, 0x701e7571 +0, 15015, 15015, 3003, 12987, 0x41133465, F=0x0 +1, 8193, 8193, 1023, 245, 0x09cd77dd +1, 9216, 9216, 1024, 231, 0xa9cb7094 +0, 18018, 18018, 3003, 13987, 0x362d60c8, F=0x0 +1, 10240, 10240, 1025, 245, 0xc99d7a23 +0, 21021, 21021, 3003, 13963, 0x9b1124af, F=0x0 +1, 11265, 11265, 1023, 243, 0xbeeb7935 +1, 12288, 12288, 1024, 238, 0xe4bd7cf5 +0, 24024, 24024, 3003, 15351, 0xd21aa7af, F=0x0 +1, 13312, 13312, 1025, 238, 0x7e9b75d8 +1, 14337, 14337, 1023, 246, 0x49147fd8 +0, 27027, 27027, 3003, 21021, 0x9df020ce, F=0x0 +1, 15360, 15360, 1024, 246, 0x5a317584 +0, 30030, 30030, 3003, 14791, 0x8bee8b7d, F=0x0 +1, 16384, 16384, 1025, 231, 0xfcb075e9 +1, 17409, 17409, 1023, 232, 0xf3136bef +0, 33033, 33033, 3003, 11922, 0x0b362d3d, F=0x0 +1, 18432, 18432, 1024, 237, 0xab837892 +0, 36036, 36036, 3003, 11239, 0x77fddbf0, F=0x0 +1, 19456, 19456, 1025, 232, 0x317c7568 +1, 20481, 20481, 1023, 234, 0x904a79bc +0, 39039, 39039, 3003, 17621, 0xcb0a52fe, F=0x0 +1, 21504, 21504, 1024, 237, 0x28ec7ac7 +0, 42042, 42042, 3003, 10694, 0xc6b4d5fa, F=0x0 +1, 22528, 22528, 1025, 234, 0x1fd2755e +1, 23553, 23553, 1023, 229, 0xdcaa78d0 +0, 45045, 45045, 3003, 45249, 0x6f6421ee +1, 24576, 24576, 1024, 238, 0xfaf673bc +1, 25600, 25600, 1025, 236, 0x16867d24 +0, 48048, 48048, 3003, 20842, 0x6521c147, F=0x0 +1, 26625, 26625, 1023, 238, 0x6ee87de7 +0, 51051, 51051, 3003, 21423, 0x7a01a052, F=0x0 +1, 27648, 27648, 1024, 234, 0xf4ee6df3 +1, 28672, 28672, 1025, 235, 0xe7b8777f +0, 54054, 54054, 3003, 15648, 0x6dfd2f29, F=0x0 +1, 29697, 29697, 1023, 236, 0x8c367282 +0, 57057, 57057, 3003, 11961, 0x971439f6, F=0x0 +1, 30720, 30720, 1024, 239, 0x3be87756 +1, 31744, 31744, 1025, 243, 0x1bbb727b +0, 60060, 60060, 3003, 15398, 0x93edd999, F=0x0 +1, 32769, 32769, 1023, 242, 0xb1c7746f +0, 63063, 63063, 3003, 14844, 0x83811831, F=0x0 +1, 33792, 33792, 1024, 237, 0xe1c97add +1, 34816, 34816, 1025, 235, 0xce716f9a +0, 66066, 66066, 3003, 14585, 0xdd855cb8, F=0x0 +1, 35841, 35841, 1023, 237, 0x15697576 +0, 69069, 69069, 3003, 17576, 0xb7f618bc, F=0x0 +1, 36864, 36864, 1024, 237, 0x177c730f +1, 37888, 37888, 1025, 236, 0x247b6cb5 +0, 72072, 72072, 3003, 15626, 0x3dcd59a4, F=0x0 +1, 38913, 38913, 1023, 241, 0x04b673d0 +1, 39936, 39936, 1024, 235, 0x8f037097 +0, 75075, 75075, 3003, 13658, 0xdfccadde, F=0x0 +1, 40960, 40960, 1025, 240, 0x2fc37000 +0, 78078, 78078, 3003, 16279, 0x280fb353, F=0x0 +1, 41985, 41985, 1023, 241, 0xd6647dd4 +1, 43008, 43008, 1024, 258, 0xf0d9812d +0, 81081, 81081, 3003, 13135, 0xa20abdf0, F=0x0 +1, 44032, 44032, 1025, 238, 0x79e776e7 +0, 84084, 84084, 3003, 16185, 0x81148bd3, F=0x0 +1, 45057, 45057, 1023, 237, 0x12837273 +1, 46080, 46080, 1024, 236, 0xe53779a7 +0, 87087, 87087, 3003, 14966, 0xe8e6f6f3, F=0x0 +1, 47104, 47104, 1025, 235, 0xbe2f6f0e +0, 90090, 90090, 3003, 54254, 0x1a7c2635 +1, 48129, 48129, 1023, 238, 0x61757449 +1, 49152, 49152, 1024, 234, 0x7e006ec2 +0, 93093, 93093, 3003, 11505, 0xb40d54c7, F=0x0 +1, 50176, 50176, 1025, 235, 0xb0f46927 +1, 51201, 51201, 1023, 237, 0x8db2767a +0, 96096, 96096, 3003, 12070, 0x802756f8, F=0x0 +1, 52224, 52224, 1024, 236, 0x8708775a +0, 99099, 99099, 3003, 12537, 0x2b4038dc, F=0x0 +1, 53248, 53248, 1025, 238, 0xe3437a1b +1, 54273, 54273, 1023, 233, 0x6a66725d +0, 102102, 102102, 3003, 16289, 0xb5428821, F=0x0 +1, 55296, 55296, 1024, 231, 0xb24f7340 +0, 105105, 105105, 3003, 17662, 0x44585aef, F=0x0 +1, 56320, 56320, 1025, 243, 0x8fb17a7f +1, 57345, 57345, 1023, 240, 0x961f7d8e +0, 108108, 108108, 3003, 21341, 0xbd485492, F=0x0 +1, 58368, 58368, 1024, 240, 0x57937425 +0, 111111, 111111, 3003, 18554, 0xafb64591, F=0x0 +1, 59392, 59392, 1025, 238, 0x09907666 +1, 60417, 60417, 1023, 239, 0x0bda830f +0, 114114, 114114, 3003, 14356, 0xdee7d3eb, F=0x0 +1, 61440, 61440, 1024, 237, 0x57c07b31 +0, 117117, 117117, 3003, 15210, 0x0528bb14, F=0x0 +1, 62464, 62464, 1025, 232, 0x6a466fca +1, 63489, 63489, 1023, 233, 0x8f4b6baa +0, 120120, 120120, 3003, 18045, 0xdaddf4a5, F=0x0 +1, 64512, 64512, 1024, 227, 0x1b696c9c +1, 65536, 65536, 1025, 236, 0xe01d7262 +0, 123123, 123123, 3003, 15922, 0xc29b27d0, F=0x0 +1, 66561, 66561, 1023, 240, 0xcd0e782e +0, 126126, 126126, 3003, 13255, 0xb0b0e093, F=0x0 +1, 67584, 67584, 1024, 236, 0x042e7b88 +1, 68608, 68608, 1025, 238, 0xe2c47768 +0, 129129, 129129, 3003, 13365, 0xad86d6bf, F=0x0 +1, 69633, 69633, 1023, 236, 0x0ed47796 +0, 132132, 132132, 3003, 11754, 0x7d06ede8, F=0x0 +1, 70656, 70656, 1024, 239, 0x7371757e +1, 71680, 71680, 1025, 234, 0x2096752e +0, 135135, 135135, 3003, 23955, 0xd21cca3b +1, 72705, 72705, 1023, 233, 0x59e777fb +0, 138138, 138138, 3003, 16070, 0x74b2169d, F=0x0 +1, 73728, 73728, 1024, 239, 0x1c6470ba +1, 74752, 74752, 1025, 236, 0xfe806da3 +0, 141141, 141141, 3003, 16446, 0x3495076e, F=0x0 +1, 75777, 75777, 1023, 240, 0x2ad1718a +1, 76800, 76800, 1024, 236, 0x04b07e50 +0, 144144, 144144, 3003, 17400, 0x1cc3efdd, F=0x0 +1, 77824, 77824, 1025, 236, 0x77ad6f0e +0, 147147, 147147, 3003, 22300, 0x32a03fba, F=0x0 +1, 78849, 78849, 1023, 241, 0x94927537 +1, 79872, 79872, 1024, 235, 0x629a6fbd +0, 150150, 150150, 3003, 22783, 0xef212506, F=0x0 +1, 80896, 80896, 1025, 239, 0x09f679a2 +0, 153153, 153153, 3003, 20595, 0xb2f4b56d, F=0x0 +1, 81921, 81921, 1023, 237, 0xa36474d5 +1, 82944, 82944, 1024, 235, 0xd26a70e7 +0, 156156, 156156, 3003, 19942, 0x0c4ce0b8, F=0x0 +1, 83968, 83968, 1025, 238, 0xd95d71d9 +0, 159159, 159159, 3003, 23838, 0xc50f9426, F=0x0 +1, 84993, 84993, 1023, 237, 0x11ee7f87 +1, 86016, 86016, 1024, 239, 0x40127652 +0, 162162, 162162, 3003, 17974, 0xa878d8d6, F=0x0 +1, 87040, 87040, 1025, 233, 0x58757456 +1, 88065, 88065, 1023, 242, 0xff5f76f7 +0, 165165, 165165, 3003, 16650, 0x122b32c4, F=0x0 +1, 89088, 89088, 1024, 238, 0x15c173c8 +0, 168168, 168168, 3003, 15312, 0x133aae79, F=0x0 +1, 90112, 90112, 1025, 238, 0x140f79ba +1, 91137, 91137, 1023, 233, 0xde9b769c +0, 171171, 171171, 3003, 13753, 0xdb58b083, F=0x0 +1, 92160, 92160, 1024, 237, 0x0d9979a0 +0, 174174, 174174, 3003, 15097, 0x63ff384b, F=0x0 +1, 93184, 93184, 1025, 238, 0x87bf77a9 +1, 94209, 94209, 1023, 239, 0x1a197e12 +0, 177177, 177177, 3003, 14641, 0xafe08cb6, F=0x0 +1, 95232, 95232, 1024, 239, 0x22ef7995 +0, 180180, 180180, 3003, 29092, 0x0b42b3b3 +1, 96256, 96256, 1025, 234, 0xd4a9794c +1, 97281, 97281, 1023, 234, 0x61377aea +0, 183183, 183183, 3003, 10237, 0x505be360, F=0x0 +1, 98304, 98304, 1024, 230, 0x6c9e7294 +0, 186186, 186186, 3003, 9774, 0xbf14ba2d, F=0x0 +1, 99328, 99328, 1025, 237, 0x6caa7b23 +1, 100353, 100353, 1023, 237, 0x42196ff8 +0, 189189, 189189, 3003, 14459, 0x4dcb0f52, F=0x0 +1, 101376, 101376, 1024, 238, 0xbb96743d +1, 102400, 102400, 1025, 236, 0x4e5f7b52 +0, 192192, 192192, 3003, 14486, 0xe1151810, F=0x0 +1, 103425, 103425, 1023, 238, 0x2d1878af +0, 195195, 195195, 3003, 13444, 0x95487183, F=0x0 +1, 104448, 104448, 1024, 237, 0x42077cd4 +1, 105472, 105472, 1025, 238, 0x34d473fe +0, 198198, 198198, 3003, 13548, 0x98376bda, F=0x0 +1, 106497, 106497, 1023, 237, 0xe3a675fd +0, 201201, 201201, 3003, 16017, 0xeacb35e1, F=0x0 +1, 107520, 107520, 1024, 237, 0xf23d7e4e +1, 108544, 108544, 1025, 237, 0xaeb47b4a +0, 204204, 204204, 3003, 15774, 0x9178a444, F=0x0 +1, 109569, 109569, 1023, 233, 0xd73c7d0b +0, 207207, 207207, 3003, 14213, 0xfbafb06e, F=0x0 +1, 110592, 110592, 1024, 231, 0x82fb7b39 +1, 111616, 111616, 1025, 237, 0x877d7830 +0, 210210, 210210, 3003, 11484, 0xdcfb4d3e, F=0x0 +1, 112641, 112641, 1023, 238, 0xa6687f78 +1, 113664, 113664, 1024, 235, 0x9d2b704d +0, 213213, 213213, 3003, 11135, 0x63539825, F=0x0 +1, 114688, 114688, 1025, 230, 0x0c5a710a +0, 216216, 216216, 3003, 14806, 0xa838e206, F=0x0 +1, 115713, 115713, 1023, 237, 0x728a7284 +1, 116736, 116736, 1024, 234, 0x524b7789 +0, 219219, 219219, 3003, 17308, 0x5e7bfef1, F=0x0 +1, 117760, 117760, 1025, 239, 0x70087c21 +0, 222222, 222222, 3003, 17683, 0x570a6478, F=0x0 +1, 118785, 118785, 1023, 236, 0x1de97b11 +1, 119808, 119808, 1024, 234, 0x8d3f7965 +0, 225225, 225225, 3003, 48630, 0x069ec47f +1, 120832, 120832, 1025, 242, 0xe5337919 +0, 228228, 228228, 3003, 11899, 0x16270166, F=0x0 +1, 121857, 121857, 1023, 249, 0xed1373a5 +1, 122880, 122880, 1024, 236, 0xca247541 +0, 231231, 231231, 3003, 16519, 0xb620f0ab, F=0x0 +1, 123904, 123904, 1025, 236, 0x289a7798 +0, 234234, 234234, 3003, 13049, 0x051f52ab, F=0x0 +1, 124929, 124929, 1023, 240, 0xf1fe79fc +1, 125952, 125952, 1024, 248, 0xc5348476 +0, 237237, 237237, 3003, 16160, 0xa21297c9, F=0x0 +1, 126976, 126976, 1025, 235, 0x4f897046 +1, 128001, 128001, 1023, 235, 0x7efc7af0 +0, 240240, 240240, 3003, 12955, 0xbf92f7b3, F=0x0 +1, 129024, 129024, 1024, 235, 0x8d66780b +0, 243243, 243243, 3003, 17875, 0x61b5a332, F=0x0 +1, 130048, 130048, 1025, 236, 0x88cd7684 +1, 131073, 131073, 1023, 235, 0xdd60709c +0, 246246, 246246, 3003, 13197, 0xba0da039, F=0x0 +1, 132096, 132096, 1024, 240, 0x140578ee +0, 249249, 249249, 3003, 25564, 0x2aefc1ea, F=0x0 +1, 133120, 133120, 1025, 235, 0xc24579e0 +1, 134145, 134145, 1023, 233, 0xce1f7302 +0, 252252, 252252, 3003, 14700, 0x0452ebdf, F=0x0 +1, 135168, 135168, 1024, 233, 0x0aab7986 +0, 255255, 255255, 3003, 15489, 0x6b3ad36f, F=0x0 +1, 136192, 136192, 1025, 237, 0xb0c172fe +1, 137217, 137217, 1023, 232, 0x95847212 +0, 258258, 258258, 3003, 17101, 0x8be63e37, F=0x0 +1, 138240, 138240, 1024, 234, 0x780975bc +1, 139264, 139264, 1025, 239, 0xf12a7d34 +0, 261261, 261261, 3003, 12213, 0xcef78985, F=0x0 +1, 140289, 140289, 1023, 240, 0x7a6d76ee +0, 264264, 264264, 3003, 14714, 0x8b5cc097, F=0x0 +1, 141312, 141312, 1024, 233, 0xec837905 +1, 142336, 142336, 1025, 237, 0xc8ed6f24 +0, 267267, 267267, 3003, 14395, 0xba7fe195, F=0x0 +1, 143361, 143361, 1023, 237, 0xbeb87cd3 +0, 270270, 270270, 3003, 37194, 0x1c341a12 +1, 144384, 144384, 1024, 232, 0xc80a741c +1, 145408, 145408, 1025, 235, 0x94f07b00 +0, 273273, 273273, 3003, 14061, 0xa5c14f7f, F=0x0 +1, 146433, 146433, 1023, 238, 0x24ca7cb4 +0, 276276, 276276, 3003, 19443, 0xa7bbdef4, F=0x0 +1, 147456, 147456, 1024, 236, 0x43387d99 +1, 148480, 148480, 1025, 236, 0x8766772f +0, 279279, 279279, 3003, 21733, 0xdad44c2b, F=0x0 +1, 149505, 149505, 1023, 235, 0xc4d77369 +1, 150528, 150528, 1024, 234, 0x8f817237 +0, 282282, 282282, 3003, 17971, 0x7deccbe1, F=0x0 +1, 151552, 151552, 1025, 234, 0xc5337464 +0, 285285, 285285, 3003, 14873, 0x617fb3f1, F=0x0 +1, 152577, 152577, 1023, 238, 0x0fdc7b4f +1, 153600, 153600, 1024, 234, 0x0ca08072 +0, 288288, 288288, 3003, 15613, 0x8a293998, F=0x0 +1, 154624, 154624, 1025, 234, 0xa08f77cc +0, 291291, 291291, 3003, 12489, 0xbfba1313, F=0x0 +1, 155649, 155649, 1023, 231, 0xab257042 +0, 294294, 294294, 3003, 18231, 0xaaaa9157, F=0x0 +0, 297297, 297297, 3003, 19204, 0x18c54ec1, F=0x0 +0, 300300, 300300, 3003, 19047, 0x6cb3e900, F=0x0 +0, 303303, 303303, 3003, 15667, 0x74e133ea, F=0x0 +0, 306306, 306306, 3003, 16883, 0x39acbcf7, F=0x0 +0, 309309, 309309, 3003, 14690, 0xa8788fe0, F=0x0 +0, 312312, 312312, 3003, 13132, 0xe8958b7b, F=0x0 +0, 315315, 315315, 3003, 29348, 0x54bfe307 +0, 318318, 318318, 3003, 12581, 0x19e56122, F=0x0 +0, 321321, 321321, 3003, 12604, 0xec0d9d05, F=0x0 +0, 324324, 324324, 3003, 16139, 0x3a6c6f69, F=0x0 +0, 327327, 327327, 3003, 15635, 0x1d295c5e, F=0x0 +0, 330330, 330330, 3003, 13092, 0xd95889a5, F=0x0 +0, 333333, 333333, 3003, 10733, 0x24fb12f1, F=0x0 +0, 336336, 336336, 3003, 10358, 0xdbf93784, F=0x0 +0, 339339, 339339, 3003, 9539, 0x5c99853e, F=0x0 +0, 342342, 342342, 3003, 12646, 0xf745ae34, F=0x0 +0, 345345, 345345, 3003, 11203, 0x4385e4c9, F=0x0 +0, 348348, 348348, 3003, 15577, 0x86b16d42, F=0x0 +0, 351351, 351351, 3003, 12077, 0xe31ab9bb, F=0x0 +0, 354354, 354354, 3003, 19177, 0x8e7b6d9b, F=0x0 +0, 357357, 357357, 3003, 13853, 0x274b343a, F=0x0 -- 2.10.0

2 2

[PATCH] doc/t2h: add max-width to css.
by Josh de Kock 02 Oct '16

02 Oct '16

Full width text is really difficult to read, this just makes it slightly more legible on larger (widescreen) screens. Signed-off-by: Josh de Kock <josh(a)itanimul.li> --- See http://screenshotcomparison.com/comparison/186256 for a comparison of before/after. doc/t2h.init | 2 +- doc/t2h.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/t2h.init b/doc/t2h.init index c41be2e..994e276 100644 --- a/doc/t2h.init +++ b/doc/t2h.init @@ -22,7 +22,7 @@ EOT my $TEMPLATE_HEADER2 = $ENV{"FFMPEG_HEADER2"} || <<EOT; </head> <body> - <div style="width: 95%; margin: auto"> + <div style="width: 95%; max-width: 960px; margin: auto"> EOT my $TEMPLATE_FOOTER = $ENV{"FFMPEG_FOOTER"} || <<EOT; diff --git a/doc/t2h.pm b/doc/t2h.pm index 5efb2da..a3b7c6b 100644 --- a/doc/t2h.pm +++ b/doc/t2h.pm @@ -174,7 +174,7 @@ EOT <link rel="stylesheet" type="text/css" href="style.min.css"> </head> <body> - <div style="width: 95%; margin: auto"> + <div style="width: 95%; max-width: 960px; margin: auto"> <h1> EOT -- 2.8.4 (Apple Git-73)

3 10

[RFC]lavu/x86/pixelutils: Call emms before returning.
by Carl Eugen Hoyos 02 Oct '16

02 Oct '16

Hi! The functions in libavutil/x86/pixelutils.asm are exported to the library users if I understand the code correctly. I suspect it can be expected that the MMX state is reset after returning. Fixes the pixelutils fate test with musl on x86-32. Please comment, Carl Eugen

3 2

[PATCH] libavfilter/vf_paletteuse.c: fix warning due to misleading indentation
by Adriano Pallavicino 02 Oct '16

02 Oct '16

2 1

[PATCH 1/2] libavcodec/ivi_dsp.c: fix warning due to misleading indentation
by Adriano Pallavicino 02 Oct '16

02 Oct '16

1 0

[PATCH] libavcodec/qdm2.c: fix warning due to misleading indentation
by Adriano Pallavicino 02 Oct '16

02 Oct '16

--- libavcodec/qdm2.c | 117 +++++++++++++++++++++++++++--------------------------- 1 file changed, 59 insertions(+), 58 deletions(-) diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index dd8b257..e3cc902 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -537,7 +537,7 @@ static void fill_coding_method_array(sb_int8_array tone_level_idx, /* This case is untested, no samples available */ avpriv_request_sample(NULL, "!superblocktype_2_3"); return; - for (ch = 0; ch < nb_channels; ch++) + for (ch = 0; ch < nb_channels; ch++) { for (sb = 0; sb < 30; sb++) { for (j = 1; j < 63; j++) { // The loop only iterates to 63 so the code doesn't overflow the buffer add1 = tone_level_idx[ch][sb][j] - 10; @@ -566,67 +566,68 @@ static void fill_coding_method_array(sb_int8_array tone_level_idx, } tone_level_idx_temp[ch][sb][0] = tone_level_idx_temp[ch][sb][1]; } - acc = 0; - for (ch = 0; ch < nb_channels; ch++) - for (sb = 0; sb < 30; sb++) - for (j = 0; j < 64; j++) - acc += tone_level_idx_temp[ch][sb][j]; - - multres = 0x66666667LL * (acc * 10); - esp_40 = (multres >> 32) / 8 + ((multres & 0xffffffff) >> 31); - for (ch = 0; ch < nb_channels; ch++) - for (sb = 0; sb < 30; sb++) - for (j = 0; j < 64; j++) { - comp = tone_level_idx_temp[ch][sb][j]* esp_40 * 10; - if (comp < 0) - comp += 0xff; - comp /= 256; // signed shift - switch(sb) { - case 0: - if (comp < 30) - comp = 30; - comp += 15; - break; - case 1: - if (comp < 24) - comp = 24; - comp += 10; - break; - case 2: - case 3: - case 4: - if (comp < 16) - comp = 16; - } - if (comp <= 5) - tmp = 0; - else if (comp <= 10) - tmp = 10; - else if (comp <= 16) - tmp = 16; - else if (comp <= 24) - tmp = -1; - else - tmp = 0; - coding_method[ch][sb][j] = ((tmp & 0xfffa) + 30 )& 0xff; + } + acc = 0; + for (ch = 0; ch < nb_channels; ch++) + for (sb = 0; sb < 30; sb++) + for (j = 0; j < 64; j++) + acc += tone_level_idx_temp[ch][sb][j]; + + multres = 0x66666667LL * (acc * 10); + esp_40 = (multres >> 32) / 8 + ((multres & 0xffffffff) >> 31); + for (ch = 0; ch < nb_channels; ch++) + for (sb = 0; sb < 30; sb++) + for (j = 0; j < 64; j++) { + comp = tone_level_idx_temp[ch][sb][j]* esp_40 * 10; + if (comp < 0) + comp += 0xff; + comp /= 256; // signed shift + switch(sb) { + case 0: + if (comp < 30) + comp = 30; + comp += 15; + break; + case 1: + if (comp < 24) + comp = 24; + comp += 10; + break; + case 2: + case 3: + case 4: + if (comp < 16) + comp = 16; } + if (comp <= 5) + tmp = 0; + else if (comp <= 10) + tmp = 10; + else if (comp <= 16) + tmp = 16; + else if (comp <= 24) + tmp = -1; + else + tmp = 0; + coding_method[ch][sb][j] = ((tmp & 0xfffa) + 30 )& 0xff; + } + for (sb = 0; sb < 30; sb++) + fix_coding_method_array(sb, nb_channels, coding_method); + for (ch = 0; ch < nb_channels; ch++) for (sb = 0; sb < 30; sb++) - fix_coding_method_array(sb, nb_channels, coding_method); - for (ch = 0; ch < nb_channels; ch++) - for (sb = 0; sb < 30; sb++) - for (j = 0; j < 64; j++) - if (sb >= 10) { - if (coding_method[ch][sb][j] < 10) - coding_method[ch][sb][j] = 10; + for (j = 0; j < 64; j++) + if (sb >= 10) { + if (coding_method[ch][sb][j] < 10) + coding_method[ch][sb][j] = 10; + } else { + if (sb >= 2) { + if (coding_method[ch][sb][j] < 16) + coding_method[ch][sb][j] = 16; } else { - if (sb >= 2) { - if (coding_method[ch][sb][j] < 16) - coding_method[ch][sb][j] = 16; - } else { - if (coding_method[ch][sb][j] < 30) - coding_method[ch][sb][j] = 30; - } + if (coding_method[ch][sb][j] < 30) + coding_method[ch][sb][j] = 30; } + } } else { // superblocktype_2_3 != 0 for (ch = 0; ch < nb_channels; ch++) for (sb = 0; sb < 30; sb++) -- 2.7.4

3 6

[PATCH] configure: define _GNU_SOURCE on cygwin
by Timo Rothenpieler 02 Oct '16

02 Oct '16

Some function definitions are missing without it, for example sigaction. Fixes ticket #5868 --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 899057d..0e2f459 100755 --- a/configure +++ b/configure @@ -4805,6 +4805,7 @@ case $target_os in objformat="win32" enable dos_paths enabled shared && ! enabled small && check_cmd $windres --version && enable gnu_windres + add_cppflags -D_GNU_SOURCE ;; *-dos|freedos|opendos) network_extralibs="-lsocket" -- 2.8.3

2 4

[PATCH 1/2] ffplay: use decoder avctx for decoded subtitle width/height
by Marton Balint 02 Oct '16

02 Oct '16

Fixes ticket #5873. Signed-off-by: Marton Balint <cus(a)passwd.hu> --- ffplay.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ffplay.c b/ffplay.c index e64909a..a7a6785 100644 --- a/ffplay.c +++ b/ffplay.c @@ -2224,7 +2224,6 @@ static int video_thread(void *arg) static int subtitle_thread(void *arg) { VideoState *is = arg; - AVCodecParameters *codecpar = is->subtitle_st->codecpar; Frame *sp; int got_subtitle; double pts; @@ -2243,8 +2242,8 @@ static int subtitle_thread(void *arg) pts = sp->sub.pts / (double)AV_TIME_BASE; sp->pts = pts; sp->serial = is->subdec.pkt_serial; - sp->width = codecpar->width; - sp->height = codecpar->height; + sp->width = is->subdec.avctx->width; + sp->height = is->subdec.avctx->height; sp->uploaded = 0; /* now we can update the picture count */ -- 2.6.6

2 4

[RFC]Changelog: Compress slightly
by Carl Eugen Hoyos 02 Oct '16

02 Oct '16

Hi! I consider the Changelog more readable with attached patch. I wonder if the ogv line should be dropped... Please comment, Carl Eugen

3 2