Merge commit '0de07510844517b615ef2a2e2916f6391ad88687'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 11:56:08 +0000 (12:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 11:56:08 +0000 (12:56 +0100)
commita10529a3191763c8cf3e7f8bd0ba62a101e2fd3c
treec90ad5122000c93a7cbe65ed125685e53814399f
parent7fd732b75825ff5e3dd54bf56c1ab9b74477c93f
parent0de07510844517b615ef2a2e2916f6391ad88687
Merge commit '0de07510844517b615ef2a2e2916f6391ad88687'

* commit '0de07510844517b615ef2a2e2916f6391ad88687':
  rtpdec_h264: Make reusable functions non-static

Conflicts:
libavformat/rtpdec_formats.h
libavformat/rtpdec_h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtpdec_formats.h
libavformat/rtpdec_h264.c