Merge commit 'dc1de0b958836545339611e9c050a1d4fdded263'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Jul 2015 22:33:52 +0000 (00:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Jul 2015 22:33:52 +0000 (00:33 +0200)
* commit 'dc1de0b958836545339611e9c050a1d4fdded263':
  h261: Set 'still image mode off' in picture header

Conflicts:
tests/ref/vsynth/vsynth1-h261
tests/ref/vsynth/vsynth2-h261

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h261enc.c
tests/ref/vsynth/vsynth1-h261
tests/ref/vsynth/vsynth1-h261-trellis
tests/ref/vsynth/vsynth2-h261
tests/ref/vsynth/vsynth2-h261-trellis
tests/ref/vsynth/vsynth_lena-h261
tests/ref/vsynth/vsynth_lena-h261-trellis

Simple merge
@@@ -1,4 -1,4 +1,4 @@@
- be41f18a8c3120b730270a9ec45545aa *tests/data/fate/vsynth1-h261.avi
 -34263080870c91c5e6c3c7dca799c50d *tests/data/fate/vsynth1-h261.avi
 -707576 tests/data/fate/vsynth1-h261.avi
 -716e83cb51afb1246bfaa80967df48ea *tests/data/fate/vsynth1-h261.out.rawvideo
++db4087f42cc63b7a9f892ac3a085e8d9 *tests/data/fate/vsynth1-h261.avi
 +707550 tests/data/fate/vsynth1-h261.avi
 +85fde92037c2ccecc02e2d6c21a169b0 *tests/data/fate/vsynth1-h261.out.rawvideo
  stddev:    9.11 PSNR: 28.93 MAXDIFF:  113 bytes:  7603200/  7603200
index bf74a24,0000000..3f621c1
mode 100644,000000..100644
--- /dev/null
@@@ -1,4 -1,0 +1,4 @@@
- 707aac692b7478d2312a87b09228e437 *tests/data/fate/vsynth1-h261-trellis.avi
++19ab4e95eab4c8f328a07ea49480359f *tests/data/fate/vsynth1-h261-trellis.avi
 +655416 tests/data/fate/vsynth1-h261-trellis.avi
 +70ceba944548ba680b1101c91707ea25 *tests/data/fate/vsynth1-h261-trellis.out.rawvideo
 +stddev:    8.75 PSNR: 29.28 MAXDIFF:   90 bytes:  7603200/  7603200
@@@ -1,4 -1,4 +1,4 @@@
- 6334083b8899cdd8b56f80f8e1345213 *tests/data/fate/vsynth2-h261.avi
 -70e9342de71456cd6fbe9a771cceefd5 *tests/data/fate/vsynth2-h261.avi
 -257928 tests/data/fate/vsynth2-h261.avi
 -1a9bb0d52bd24cb62162c5e3c2aed317 *tests/data/fate/vsynth2-h261.out.rawvideo
++9c0593e0f2529c326c1e23754aab4be7 *tests/data/fate/vsynth2-h261.avi
 +257938 tests/data/fate/vsynth2-h261.avi
 +8962b6ea3153a828e5a4df68e1d5da44 *tests/data/fate/vsynth2-h261.out.rawvideo
  stddev:    7.21 PSNR: 30.97 MAXDIFF:   96 bytes:  7603200/  7603200
index 7f53e30,0000000..8867131
mode 100644,000000..100644
--- /dev/null
@@@ -1,4 -1,0 +1,4 @@@
- f5105d846793cd12f1fedffd917a240d *tests/data/fate/vsynth2-h261-trellis.avi
++d1b1559cbc0cee8af629514edd71d608 *tests/data/fate/vsynth2-h261-trellis.avi
 +249856 tests/data/fate/vsynth2-h261-trellis.avi
 +15452237f6c333690d3e05f354f63196 *tests/data/fate/vsynth2-h261-trellis.out.rawvideo
 +stddev:    7.10 PSNR: 31.10 MAXDIFF:   96 bytes:  7603200/  7603200
index c4ea318,0000000..5074977
mode 100644,000000..100644
--- /dev/null
@@@ -1,4 -1,0 +1,4 @@@
- a8a6fe710cf8591d1ce5fd18f478e217 *tests/data/fate/vsynth_lena-h261.avi
++c04b1e1b102a59e678743c6e8b6ccddf *tests/data/fate/vsynth_lena-h261.avi
 +191064 tests/data/fate/vsynth_lena-h261.avi
 +08f65e9aeeeaf189548c2bb417d5114f *tests/data/fate/vsynth_lena-h261.out.rawvideo
 +stddev:    6.37 PSNR: 32.03 MAXDIFF:   77 bytes:  7603200/  7603200
index 128f224,0000000..05e4c47
mode 100644,000000..100644
--- /dev/null
@@@ -1,4 -1,0 +1,4 @@@
- 43fca6298b5366199104942e8a901d52 *tests/data/fate/vsynth_lena-h261-trellis.avi
++c835142acd32a6b448fe2666daa07944 *tests/data/fate/vsynth_lena-h261-trellis.avi
 +184586 tests/data/fate/vsynth_lena-h261-trellis.avi
 +f9df8cd110a2f3d9706dd2f29a1d0a89 *tests/data/fate/vsynth_lena-h261-trellis.out.rawvideo
 +stddev:    6.32 PSNR: 32.11 MAXDIFF:   89 bytes:  7603200/  7603200