Merge commit 'c18838f5eb7d7001a9dc653f5162868c04c1b2a1'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Aug 2013 11:03:40 +0000 (13:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Aug 2013 11:03:40 +0000 (13:03 +0200)
commit70a73213b787268b9fdfc92ed418ad9802992b10
tree0878d918420c3e0d4ae9bdc849bd7c2d5404c1fd
parente853cf53256f847fc1b8436a4bef060177a01bb2
parentc18838f5eb7d7001a9dc653f5162868c04c1b2a1
Merge commit 'c18838f5eb7d7001a9dc653f5162868c04c1b2a1'

* commit 'c18838f5eb7d7001a9dc653f5162868c04c1b2a1':
  h264_ps: Use more meaningful error values

Conflicts:
libavcodec/h264_ps.c

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