summaryrefslogtreecommitdiff
path: root/ffserver.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-09 21:25:26 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-09 21:25:49 +0100
commitf95cd5a235bae89510cfe4320f2189c9cfbcc457 (patch)
treef33d6e04e8abacf97b6c920aeb85d4f89ed5fe4d /ffserver.c
parent1cf0f27985965c28049b7a8481c859867dad3948 (diff)
parent51da7d02748cc54b7d009115e76efa940b99a8ef (diff)
Merge commit '51da7d02748cc54b7d009115e76efa940b99a8ef'
* commit '51da7d02748cc54b7d009115e76efa940b99a8ef': matroskaenc: refuse to write AAC without valid extradata Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions