Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23'
* commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23': lavf: use dts difference instead of AVPacket.duration in find_stream_info() avf: introduce nobuffer option fate: make yadif tests consistent across systems vf_hqdn3d: support 9 and 10bit colordepth vf_hqdn3d: reduce intermediate precision vf_hqdn3d: simplify and optimize factor identical ff_inplace_start_frame out of two filters vf_hqdn3d: cosmetics avprobe/avconv: fix tentative declaration compile errors on MSVS. Conflicts: doc/APIchanges ffmpeg.c ffprobe.c libavformat/avformat.h libavformat/options_table.h libavformat/utils.c libavformat/version.h tests/fate/filter.mak tests/ref/fate/filter-yadif-mode0 tests/ref/fate/filter-yadif-mode1 Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
@@ -35,10 +35,10 @@ FATE_FILTER += fate-filter-delogo
|
||||
FATE_SAMPLES_AVCONV += fate-filter-delogo
|
||||
|
||||
FATE_YADIF += fate-filter-yadif-mode0
|
||||
fate-filter-yadif-mode0: CMD = framecrc -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vf yadif=0
|
||||
fate-filter-yadif-mode0: CMD = framecrc -flags bitexact -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vf yadif=0
|
||||
|
||||
FATE_YADIF += fate-filter-yadif-mode1
|
||||
fate-filter-yadif-mode1: CMD = framecrc -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vf yadif=1
|
||||
fate-filter-yadif-mode1: CMD = framecrc -flags bitexact -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vf yadif=1
|
||||
|
||||
FATE_FILTER += $(FATE_YADIF)
|
||||
FATE_SAMPLES_AVCONV += $(FATE_YADIF)
|
||||
|
||||
@@ -1,32 +1,32 @@
|
||||
#tb 0: 1/25
|
||||
0, 9, 9, 1, 622080, 0x1511cae9
|
||||
0, 10, 10, 1, 622080, 0x6e77e746
|
||||
0, 11, 11, 1, 622080, 0x89aac777
|
||||
0, 12, 12, 1, 622080, 0x7e0a9335
|
||||
0, 13, 13, 1, 622080, 0x5f34759b
|
||||
0, 14, 14, 1, 622080, 0xfac498a6
|
||||
0, 15, 15, 1, 622080, 0xe60e7a9e
|
||||
0, 16, 16, 1, 622080, 0x44875bbd
|
||||
0, 17, 17, 1, 622080, 0xfa761aab
|
||||
0, 18, 18, 1, 622080, 0x59be119c
|
||||
0, 19, 19, 1, 622080, 0x21316b36
|
||||
0, 20, 20, 1, 622080, 0x929fde5b
|
||||
0, 21, 21, 1, 622080, 0xfca8990c
|
||||
0, 22, 22, 1, 622080, 0x1ec87d02
|
||||
0, 23, 23, 1, 622080, 0x5768eea0
|
||||
0, 24, 24, 1, 622080, 0x1a0894ab
|
||||
0, 25, 25, 1, 622080, 0xb4e61323
|
||||
0, 26, 26, 1, 622080, 0xb773341a
|
||||
0, 27, 27, 1, 622080, 0x8a914cf7
|
||||
0, 28, 28, 1, 622080, 0xf1cfbc7d
|
||||
0, 29, 29, 1, 622080, 0xebaeb317
|
||||
0, 30, 30, 1, 622080, 0xbae9adf4
|
||||
0, 31, 31, 1, 622080, 0x593544fd
|
||||
0, 32, 32, 1, 622080, 0x2cd8ec0b
|
||||
0, 33, 33, 1, 622080, 0x8032d9d4
|
||||
0, 34, 34, 1, 622080, 0x5c67ace7
|
||||
0, 35, 35, 1, 622080, 0x95714528
|
||||
0, 36, 36, 1, 622080, 0xa11cbed2
|
||||
0, 37, 37, 1, 622080, 0x7389f8f1
|
||||
0, 38, 38, 1, 622080, 0xa694f3f2
|
||||
0, 39, 39, 1, 622080, 0xac3a3d09
|
||||
0, 9, 9, 1, 622080, 0x4440caef
|
||||
0, 10, 10, 1, 622080, 0xce67e69d
|
||||
0, 11, 11, 1, 622080, 0x1dbdc653
|
||||
0, 12, 12, 1, 622080, 0x82c591d1
|
||||
0, 13, 13, 1, 622080, 0x8193740b
|
||||
0, 14, 14, 1, 622080, 0xcb219711
|
||||
0, 15, 15, 1, 622080, 0x1870783b
|
||||
0, 16, 16, 1, 622080, 0x7080590b
|
||||
0, 17, 17, 1, 622080, 0x6df4175d
|
||||
0, 18, 18, 1, 622080, 0x6b530e95
|
||||
0, 19, 19, 1, 622080, 0x7f9d66f7
|
||||
0, 20, 20, 1, 622080, 0x338cda81
|
||||
0, 21, 21, 1, 622080, 0xb13797f8
|
||||
0, 22, 22, 1, 622080, 0xb51e7ca4
|
||||
0, 23, 23, 1, 622080, 0x353eed75
|
||||
0, 24, 24, 1, 622080, 0xf93e92b0
|
||||
0, 25, 25, 1, 622080, 0xd0811094
|
||||
0, 26, 26, 1, 622080, 0xb04a3141
|
||||
0, 27, 27, 1, 622080, 0x4ab84909
|
||||
0, 28, 28, 1, 622080, 0xa0fcb8fb
|
||||
0, 29, 29, 1, 622080, 0x9003aebb
|
||||
0, 30, 30, 1, 622080, 0x153faa3e
|
||||
0, 31, 31, 1, 622080, 0xae724063
|
||||
0, 32, 32, 1, 622080, 0xeb4de77a
|
||||
0, 33, 33, 1, 622080, 0x209ed8c7
|
||||
0, 34, 34, 1, 622080, 0xe2bbac96
|
||||
0, 35, 35, 1, 622080, 0xe945441e
|
||||
0, 36, 36, 1, 622080, 0x8f8cbd5f
|
||||
0, 37, 37, 1, 622080, 0xbc3cf717
|
||||
0, 38, 38, 1, 622080, 0x0109f125
|
||||
0, 39, 39, 1, 622080, 0x230c373f
|
||||
|
||||
@@ -1,34 +1,34 @@
|
||||
#tb 0: 1/25
|
||||
0, 9, 9, 1, 622080, 0x1511cae9
|
||||
0, 10, 10, 1, 622080, 0xb88ca855
|
||||
0, 11, 11, 1, 622080, 0x6e77e746
|
||||
0, 12, 12, 1, 622080, 0x5da19198
|
||||
0, 13, 13, 1, 622080, 0xee31c8a8
|
||||
0, 14, 14, 1, 622080, 0xcbb7aac5
|
||||
0, 15, 15, 1, 622080, 0x19972f1a
|
||||
0, 16, 16, 1, 622080, 0xac7d34b9
|
||||
0, 17, 17, 1, 622080, 0x4adfe592
|
||||
0, 18, 18, 1, 622080, 0x5d738330
|
||||
0, 19, 19, 1, 622080, 0xb60b4447
|
||||
0, 20, 20, 1, 622080, 0x1e11acf4
|
||||
0, 21, 21, 1, 622080, 0x5ed635d0
|
||||
0, 22, 22, 1, 622080, 0x939857af
|
||||
0, 23, 23, 1, 622080, 0x530b28fd
|
||||
0, 24, 24, 1, 622080, 0x3bc0d5d3
|
||||
0, 25, 25, 1, 622080, 0x77e0fe99
|
||||
0, 26, 26, 1, 622080, 0xd2151c1e
|
||||
0, 27, 27, 1, 622080, 0xe021a815
|
||||
0, 28, 28, 1, 622080, 0xceae4f12
|
||||
0, 29, 29, 1, 622080, 0x4c2f3330
|
||||
0, 30, 30, 1, 622080, 0xf534c392
|
||||
0, 31, 31, 1, 622080, 0x88f01c11
|
||||
0, 32, 32, 1, 622080, 0x654d5df2
|
||||
0, 33, 33, 1, 622080, 0x89ef6f8a
|
||||
0, 34, 34, 1, 622080, 0x78a7b5f1
|
||||
0, 35, 35, 1, 622080, 0x8152d67f
|
||||
0, 36, 36, 1, 622080, 0x6590ff5f
|
||||
0, 37, 37, 1, 622080, 0x51d2be96
|
||||
0, 38, 38, 1, 622080, 0x483f65f7
|
||||
0, 39, 39, 1, 622080, 0x7a69143d
|
||||
0, 40, 40, 1, 622080, 0xeccc58ff
|
||||
0, 41, 41, 1, 622080, 0xc4d2c370
|
||||
0, 9, 9, 1, 622080, 0x4440caef
|
||||
0, 10, 10, 1, 622080, 0xa5cea88b
|
||||
0, 11, 11, 1, 622080, 0xce67e69d
|
||||
0, 12, 12, 1, 622080, 0x9a57891f
|
||||
0, 13, 13, 1, 622080, 0xc171c0c5
|
||||
0, 14, 14, 1, 622080, 0x20db9890
|
||||
0, 15, 15, 1, 622080, 0xdb181d52
|
||||
0, 16, 16, 1, 622080, 0xc2b913d1
|
||||
0, 17, 17, 1, 622080, 0xf1d9c5fb
|
||||
0, 18, 18, 1, 622080, 0x669c5775
|
||||
0, 19, 19, 1, 622080, 0x01921a16
|
||||
0, 20, 20, 1, 622080, 0xd5047bc9
|
||||
0, 21, 21, 1, 622080, 0xa8b006eb
|
||||
0, 22, 22, 1, 622080, 0xf0e125a7
|
||||
0, 23, 23, 1, 622080, 0x4afe2976
|
||||
0, 24, 24, 1, 622080, 0x637fcbfe
|
||||
0, 25, 25, 1, 622080, 0xd9a8f5ac
|
||||
0, 26, 26, 1, 622080, 0x4540039f
|
||||
0, 27, 27, 1, 622080, 0x3039906f
|
||||
0, 28, 28, 1, 622080, 0x52872cf9
|
||||
0, 29, 29, 1, 622080, 0x82de12ee
|
||||
0, 30, 30, 1, 622080, 0x7e849cc9
|
||||
0, 31, 31, 1, 622080, 0xffe6f770
|
||||
0, 32, 32, 1, 622080, 0xb67f3233
|
||||
0, 33, 33, 1, 622080, 0x15fe44b4
|
||||
0, 34, 34, 1, 622080, 0x380f8563
|
||||
0, 35, 35, 1, 622080, 0xb964d70f
|
||||
0, 36, 36, 1, 622080, 0x4f60f7f4
|
||||
0, 37, 37, 1, 622080, 0xd0afb742
|
||||
0, 38, 38, 1, 622080, 0xb9a15294
|
||||
0, 39, 39, 1, 622080, 0xb70b01a9
|
||||
0, 40, 40, 1, 622080, 0xcb3a371f
|
||||
0, 41, 41, 1, 622080, 0x82dfb1f2
|
||||
|
||||
Reference in New Issue
Block a user