Merge commit '43fd3dd80ca2d1c2ccf6a7b7632db544c809c690'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Apr 2015 19:11:25 +0000 (21:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Apr 2015 19:11:25 +0000 (21:11 +0200)
commit14d241b19dcde7808de7c3c631886f25f91f2008
treee5df42c7d81fe8b5a88b354b3a0444c1ca2a03ac
parent68f48406069e9aff0c01c96671f7c58de166e1f8
parent43fd3dd80ca2d1c2ccf6a7b7632db544c809c690
Merge commit '43fd3dd80ca2d1c2ccf6a7b7632db544c809c690'

* commit '43fd3dd80ca2d1c2ccf6a7b7632db544c809c690':
  h264: drop redundant initialization in init()

Conflicts:
libavcodec/h264.c

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