diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-27 15:03:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-27 15:04:00 +0200 |
| commit | e2a5557cbb7fbcdf38a3240112cbc452930fe8b1 (patch) | |
| tree | 72d1d58af717382d33d48eff4f084ba4c4c5abaf /libswscale/swscale_internal.h | |
| parent | e9ad121ba53230ef20674599047ed1889982d698 (diff) | |
| parent | 4abbea0243eca7c62949c4c4c604482c83bf1d8c (diff) | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavf/mpeg.h: Remove an unused definition.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_internal.h')
0 files changed, 0 insertions, 0 deletions