diff options
author | Michael Niedermayer <[email protected]> | 2014-02-26 22:02:19 +0100 |
---|---|---|
committer | Michael Niedermayer <[email protected]> | 2014-02-26 22:02:23 +0100 |
commit | c4c5351f0857c80a7882143378cfb3db474146e8 (patch) | |
tree | 27079d0a957b4d55638a795a7a3f86fca616a260 /libavutil/intreadwrite.h | |
parent | 1524b0fa68e0ebe94959eb4554301053f62f87ef (diff) | |
parent | a63ac1106d2e50589abeaeb09a2e78767f3d9fcf (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: Do not redundantly specifiy H.263-related object files for MSMPEG4v*
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavutil/intreadwrite.h')
0 files changed, 0 insertions, 0 deletions