-
Michael Niedermayer authored
* commit '0de07510': rtpdec_h264: Make reusable functions non-static Conflicts: libavformat/rtpdec_formats.h libavformat/rtpdec_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
a10529a3
* commit '0de07510': rtpdec_h264: Make reusable functions non-static Conflicts: libavformat/rtpdec_formats.h libavformat/rtpdec_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>