Merge commit '34c5a6660a9e5e3cf301691bb29d011638953dc2'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Apr 2014 16:50:32 +0000 (18:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Apr 2014 16:50:32 +0000 (18:50 +0200)
commit928b5708f94c50e8cb0b982208a2d097b0d588c2
tree142af652040c8eed9368fd54196798f4d5889626
parentc1bc20bfd9f6ab2d2a3342a924938185404d7a4f
parent34c5a6660a9e5e3cf301691bb29d011638953dc2
Merge commit '34c5a6660a9e5e3cf301691bb29d011638953dc2'

* commit '34c5a6660a9e5e3cf301691bb29d011638953dc2':
  h264: codec reinit: remove statements without effect

Conflicts:
libavcodec/h264_slice.c

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