diff options
| author | Michael Niedermayer <[email protected]> | 2013-03-10 02:21:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-03-10 02:21:04 +0100 |
| commit | 07ab8d3369b2fee9d3871a5f65313be5d9fe5c89 (patch) | |
| tree | a8f582910c0e612f0974118bc1d28cd57e567115 /libavformat/mpegts.c | |
| parent | f0a5f71074d914dde1585f12ae5101bd639b83e1 (diff) | |
| parent | 3f78f0904bfa012b171cecfae87af7c6909c8ede (diff) | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Revert "build: disable iconv by default."
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/mpegts.c')
0 files changed, 0 insertions, 0 deletions