Merge commit '68f930d2188aba5b32624887dcbf688c23482834'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Feb 2013 13:13:20 +0000 (14:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Feb 2013 13:13:20 +0000 (14:13 +0100)
commit131b9c924d6df2b52ca5821a13ddf6fdb49fe76c
tree9dfba94c2fb8f998a75b9bba1f2338681b333ef1
parent0a707da37b4101730debda1a5600022bbb0b736e
parent68f930d2188aba5b32624887dcbf688c23482834
Merge commit '68f930d2188aba5b32624887dcbf688c23482834'

* commit '68f930d2188aba5b32624887dcbf688c23482834':
  h264: simplify calls to ff_er_add_slice().

Conflicts:
libavcodec/h264.c

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