aboutsummaryrefslogtreecommitdiffstats
path: root/ffserver_config.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-27 13:35:27 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-27 13:35:31 +0100
commite5c28d4f9a72691daa788a252f9b06c758882cf2 (patch)
tree2727d0126d551e007881af6f8b0b63e8fa2afc5d /ffserver_config.h
parentd078d57fb769e83c00c402f2f34978c1cd50dce7 (diff)
parent3a70c0c95feacb3844d05eebd579fc8189a77eee (diff)
downloadffmpeg-e5c28d4f9a72691daa788a252f9b06c758882cf2.tar.gz
Merge commit '3a70c0c95feacb3844d05eebd579fc8189a77eee'
* commit '3a70c0c95feacb3844d05eebd579fc8189a77eee': examples/transcode_aac: generate proper PTS and set the muxer timebase Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver_config.h')
0 files changed, 0 insertions, 0 deletions