diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 12:04:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 12:04:46 +0200 |
| commit | a0fb6083967afcd7f2c43ab3ff1e510912644daa (patch) | |
| tree | c8c71575049cf763b9acc8b8cf91e026650f607a /libavcodec/avcodec.h | |
| parent | f09b5fb4afedb711b169a582b2c1b1c61e6653e0 (diff) | |
| parent | 5afe1d27912be9b643ffb4ddc21f6d920260dbb0 (diff) | |
| download | ffmpeg-a0fb6083967afcd7f2c43ab3ff1e510912644daa.tar.gz | |
Merge commit '5afe1d27912be9b643ffb4ddc21f6d920260dbb0'
* commit '5afe1d27912be9b643ffb4ddc21f6d920260dbb0':
avio: Add const qualifiers to ffio_read_indirect
Conflicts:
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
0 files changed, 0 insertions, 0 deletions