Merge commit '103d073dd7ce23b912df32be8c9524ba25dd5991'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Oct 2013 17:17:18 +0000 (19:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Oct 2013 17:19:28 +0000 (19:19 +0200)
commit4aeafbaab891d81c377f92be3969d8d3e6abf379
treeb2f5af6cc5ba152e6c5df9fa1f3e43edc75727a2
parent3e1483d03e8e2439b4c31d782bb7126ba1afdc6c
parent103d073dd7ce23b912df32be8c9524ba25dd5991
Merge commit '103d073dd7ce23b912df32be8c9524ba25dd5991'

* commit '103d073dd7ce23b912df32be8c9524ba25dd5991':
  h264_parser: Use ff_h264_reset_sei()

Conflicts:
libavcodec/h264_parser.c

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