diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-08 14:27:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-08 14:29:47 +0200 |
| commit | 70b423e1484f178c40f04b6040349a08aff31f96 (patch) | |
| tree | 8e41fffaf4badf9477863a64e6bc4a3ff321246c /libavformat/sdp.c | |
| parent | e1f729d977be579ea75d1d3a3d5cffcf17865e86 (diff) | |
| parent | 3d90f27ad5843ccd63d34fd6da4d4bff212c1bfe (diff) | |
| download | ffmpeg-70b423e1484f178c40f04b6040349a08aff31f96.tar.gz | |
Merge commit '3d90f27ad5843ccd63d34fd6da4d4bff212c1bfe'
* commit '3d90f27ad5843ccd63d34fd6da4d4bff212c1bfe':
avformat_new_stream: make the AVCodec parameter const
Conflicts:
libavformat/utils.c
See: e12cfd044c2bae4a099a3b9384b148424858d72b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/sdp.c')
0 files changed, 0 insertions, 0 deletions