Merge commit 'e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Apr 2014 01:36:48 +0000 (03:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Apr 2014 01:59:22 +0000 (03:59 +0200)
commit0ecb3075c1c243cfb656d1cbe0b19cdb91bde659
tree87e3c08e6648a58a743f58e532bdfdd0f0019b4e
parenta7a82f2f22afaac9155ef46b8ff274ad4573b20e
parente10fd08aa7fbe8645545ad2e8721f0ed03c8e06a
Merge commit 'e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a'

* commit 'e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a':
  h264: Refactor decode_nal_units

Conflicts:
libavcodec/h264.c

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