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)
* commit 'f9f883af4fe615a832407a657752e248a96c6280':
  h264: simplify code in flush_dpb()

Conflicts:
libavcodec/h264.c

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

Simple merge