diff options
| author | Michael Niedermayer <[email protected]> | 2013-06-17 00:21:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-06-17 00:21:22 +0200 |
| commit | a4a2e894fca19e284c28a4114d7718bf5588dfa1 (patch) | |
| tree | 25d5681f8615a5349d2fc4b77e7f98e78f46d9ad /libavformat/smacker.c | |
| parent | 1f87cbe8349d8662c0d6ead40cc39620b01ae0da (diff) | |
| parent | 985f34b75653d02eda8eb8def3412f8577f19b01 (diff) | |
Merge commit '985f34b75653d02eda8eb8def3412f8577f19b01'
* commit '985f34b75653d02eda8eb8def3412f8577f19b01':
utils: fix avcodec_flush_buffers pre-reference counting compatibility
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/smacker.c')
0 files changed, 0 insertions, 0 deletions