Merge commit 'f9f883af4fe615a832407a657752e248a96c6280'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 11:55:21 +0000 (12:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 11:55:21 +0000 (12:55 +0100)
commited8de1570db856ba830c3e4b19b5628ab24a8853
treef294d2fd0292809bffe8a29039f39f6fb160d27b
parent5f2cdf9c3cc5e1159428999ec550a3979576c213
parentf9f883af4fe615a832407a657752e248a96c6280
Merge commit 'f9f883af4fe615a832407a657752e248a96c6280'

* commit 'f9f883af4fe615a832407a657752e248a96c6280':
  h264: simplify code in flush_dpb()

Conflicts:
libavcodec/h264.c

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