Merge commit '0662440b991361fdb5e732712d997a73e4692e34'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Mar 2015 00:00:40 +0000 (01:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Mar 2015 00:00:44 +0000 (01:00 +0100)
* commit '0662440b991361fdb5e732712d997a73e4692e34':
  rtpenc_aac: Set a default value for max_frames_per_packet at init

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

Simple merge
Simple merge