Merge commit '73e8fab31dc19c4371499e612856accbc00b2820'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 12:35:45 +0000 (13:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 12:35:45 +0000 (13:35 +0100)
commit60b46a00c62db3e366322f99d261480cd213bfa5
treea3e8cb0ad9d920b6162332fd07cd5356191de38a
parent5cbd7ce016adec2beafe49be931ff445f3decdaf
parent73e8fab31dc19c4371499e612856accbc00b2820
Merge commit '73e8fab31dc19c4371499e612856accbc00b2820'

* commit '73e8fab31dc19c4371499e612856accbc00b2820':
  h264: print values in case of error

Conflicts:
libavcodec/h264.c
libavcodec/h264_ps.c

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