[FFmpeg-cvslog] Merge commit 'dc1de0b958836545339611e9c050a1d4fdded263'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul  9 00:33:52 2015 +0200| [a137e50ee54cd902c436d15463c6e621623cc9ad] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a137e50ee54cd902c436d15463c6e621623cc9ad
---