Merge commit '3a70c0c95feacb3844d05eebd579fc8189a77eee'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 12:35:27 +0000 (13:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 12:35:31 +0000 (13:35 +0100)
* commit '3a70c0c95feacb3844d05eebd579fc8189a77eee':
  examples/transcode_aac: generate proper PTS and set the muxer timebase

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/examples/transcode_aac.c

Simple merge