diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 23:46:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 23:46:30 +0100 |
| commit | f5d6541ba0d279955a2df798646e30370d85458a (patch) | |
| tree | 3ee7c30cd371173edccdc9e52b559f7f173053b9 /libavformat/xwma.c | |
| parent | 91c63cb053cd7a1be8bb22b3857a170eeb2b1f95 (diff) | |
| parent | ad09f52586eae4c5473c3a6a803d73e1ba56c0eb (diff) | |
| download | ffmpeg-f5d6541ba0d279955a2df798646e30370d85458a.tar.gz | |
Merge commit 'ad09f52586eae4c5473c3a6a803d73e1ba56c0eb'
* commit 'ad09f52586eae4c5473c3a6a803d73e1ba56c0eb':
h263dec: remove commented out cruft
Conflicts:
libavcodec/h263dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/xwma.c')
0 files changed, 0 insertions, 0 deletions