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)
commite5c28d4f9a72691daa788a252f9b06c758882cf2
tree2727d0126d551e007881af6f8b0b63e8fa2afc5d
parentd078d57fb769e83c00c402f2f34978c1cd50dce7
parent3a70c0c95feacb3844d05eebd579fc8189a77eee
Merge commit '3a70c0c95feacb3844d05eebd579fc8189a77eee'

* commit '3a70c0c95feacb3844d05eebd579fc8189a77eee':
  examples/transcode_aac: generate proper PTS and set the muxer timebase

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