[FFmpeg-cvslog] Merge commit 'bd737b5178f361a9b592691848f29a7a79603a7e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr  5 22:25:22 2015 +0200| [39c6834c12a5627392904d0c8123c710c611a71b] | committer: Michael Niedermayer

Merge commit 'bd737b5178f361a9b592691848f29a7a79603a7e'

* commit 'bd737b5178f361a9b592691848f29a7a79603a7e':
  h264: reset the private data in init_thread_copy()

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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