Merge commit 'bd737b5178f361a9b592691848f29a7a79603a7e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Apr 2015 20:25:22 +0000 (22:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Apr 2015 20:25:29 +0000 (22:25 +0200)
commit39c6834c12a5627392904d0c8123c710c611a71b
treebc9646afa6e6a69bf9fc08f82499b8c41039664d
parent097efa475056e38dba8a194ff841a6ab4f1f847b
parentbd737b5178f361a9b592691848f29a7a79603a7e
Merge commit 'bd737b5178f361a9b592691848f29a7a79603a7e'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c