diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-05 16:21:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-05 16:21:25 +0200 |
| commit | 714dd84f204fa210d7a727879ad6d7c4452e0bf8 (patch) | |
| tree | bb37ebf66a920fb6059b2a159a8dca21e3ca3374 /libavcodec/txd.c | |
| parent | ebd74c42a259b77b549a9135c1099921de5d3e0e (diff) | |
| parent | 2340ce6954db2c0a79c57fcba7f45e2fcc20cdc9 (diff) | |
| download | ffmpeg-714dd84f204fa210d7a727879ad6d7c4452e0bf8.tar.gz | |
Merge commit '2340ce6954db2c0a79c57fcba7f45e2fcc20cdc9' into release/1.1
* commit '2340ce6954db2c0a79c57fcba7f45e2fcc20cdc9':
update Changelog
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/txd.c')
0 files changed, 0 insertions, 0 deletions