Merge commit '84f226a3bcd8b39801a4c9051c033ab7d61aaf76'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Apr 2015 18:43:32 +0000 (20:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Apr 2015 18:48:14 +0000 (20:48 +0200)
commitcde98920da78801a40f9120cfef650ac05a22224
tree928fd16b1392ccc810fcc480dd5d407e6397a47d
parent0968180f028a3afdf60e030084753164df0adb5b
parent84f226a3bcd8b39801a4c9051c033ab7d61aaf76
Merge commit '84f226a3bcd8b39801a4c9051c033ab7d61aaf76'

* commit '84f226a3bcd8b39801a4c9051c033ab7d61aaf76':
  h264: use the correct SPS during PPS parsing

Conflicts:
libavcodec/h264_ps.c

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