diff options
| author | Michael Niedermayer <[email protected]> | 2014-07-11 13:07:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-07-11 13:07:26 +0200 |
| commit | 375d7ee8056ad087f16ba7320a9b3dca8aa86512 (patch) | |
| tree | bc1693ee314ffa9d55ce349ba4c56930dda1d5c9 /libavformat/rtmppkt.c | |
| parent | 4c91599484e115e9b51c884fc46cea3f8511f8ae (diff) | |
| parent | df2aa22203afc9377832bdf800df5dbd3aa9687e (diff) | |
Merge commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e'
* commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e':
mov: Clarify tkhd flag settings
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/rtmppkt.c')
0 files changed, 0 insertions, 0 deletions