diff options
| author | Michael Niedermayer <[email protected]> | 2015-03-21 17:23:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-03-21 17:23:10 +0100 |
| commit | a0b39747b7213b5b76c0ce5984c1dac63933737f (patch) | |
| tree | a7e0c573b4882bb07baa8c4160022f9e35e1f52b /cmdutils.c | |
| parent | 06e5b331f5bc32c7a09db4de90841225dfcd8930 (diff) | |
| parent | 6490a0c0fbe0e55f765ea2aa2e8495181ea1f719 (diff) | |
Merge commit '6490a0c0fbe0e55f765ea2aa2e8495181ea1f719'
* commit '6490a0c0fbe0e55f765ea2aa2e8495181ea1f719':
h264_mb: constify all uses of H264Context
Conflicts:
libavcodec/h264.h
libavcodec/h264_mb.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'cmdutils.c')
0 files changed, 0 insertions, 0 deletions