* commit '103d073dd7ce23b912df32be8c9524ba25dd5991': h264_parser: Use ff_h264_reset_sei() Conflicts: libavcodec/h264_parser.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
19 KiB
19 KiB