Merge commit '353b492d0f2a21ae8eb829db1ac01b54b2a4d202'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 21:19:28 +0000 (22:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 21:19:33 +0000 (22:19 +0100)
* commit '353b492d0f2a21ae8eb829db1ac01b54b2a4d202':
  rtpdec: Change enc_name to a pointer instead of a fixed-size buffer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtpdec.c
libavformat/rtpdec.h

Simple merge
Simple merge