diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 17:28:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 17:28:10 +0200 |
| commit | 95398aa9499bfad3330b47001b7eb086c31b0cd6 (patch) | |
| tree | 0528f2243eea14e91cacc290ae713d2c2d4aa49d /libavcodec/aacsbr.h | |
| parent | bd148ce07de08dcd03178e869bacf1e1ef6358df (diff) | |
| parent | f792d3cbb8e8e35c54a9358a55dd596b7a40f228 (diff) | |
| download | ffmpeg-95398aa9499bfad3330b47001b7eb086c31b0cd6.tar.gz | |
Merge commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228'
* commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228':
lavf: add the notimestamps flag to the muxers missing it
Conflicts:
libavformat/adtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacsbr.h')
0 files changed, 0 insertions, 0 deletions