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)
commita137e50ee54cd902c436d15463c6e621623cc9ad
treecd35fd68925ba2612944cac13cedbfd5c508127b
parentfcc117af30bcf59c7ae61a90bdebba0472dd3ddc
parentdc1de0b958836545339611e9c050a1d4fdded263
Merge commit 'dc1de0b958836545339611e9c050a1d4fdded263'

* 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>
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