Merge commit 'b3dc260e7fa6f3f852dd5cb7d86763c4b5736714'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 08:08:48 +0000 (10:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 08:08:48 +0000 (10:08 +0200)
commite0b45ca730f2b805d1d111067e1a99bff4516549
treeba8e1247df52dd8b5b0138aa739acf9a2c99fc50
parent4dcb2f74786e86e93436d5a8c2460c1249f9226b
parentb3dc260e7fa6f3f852dd5cb7d86763c4b5736714
Merge commit 'b3dc260e7fa6f3f852dd5cb7d86763c4b5736714'

* commit 'b3dc260e7fa6f3f852dd5cb7d86763c4b5736714':
  h264: return meaningful values

Conflicts:
libavcodec/h264.c

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