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)
commitba069e08bdaa431ed8198ac20d2e648de95bc664
treef2f5a755489fdf34cccf143654f4e960a711fa5a
parent6f0a82966d82a88bedab91c617df502c3855e9aa
parent0662440b991361fdb5e732712d997a73e4692e34
Merge commit '0662440b991361fdb5e732712d997a73e4692e34'

* commit '0662440b991361fdb5e732712d997a73e4692e34':
  rtpenc_aac: Set a default value for max_frames_per_packet at init

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