diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:04:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:04:13 +0100 |
| commit | a475755b3ad600ff50cc1d6f0cf803d14ce6cc40 (patch) | |
| tree | 18288e9d6f64a39df0117293d387552be6e84bae /libavcodec/adpcmenc.c | |
| parent | 66030e8133d1e874c255c767f12d9afc84273218 (diff) | |
| parent | c3861e14ceace7ee69820091871173b4abcae311 (diff) | |
| download | ffmpeg-a475755b3ad600ff50cc1d6f0cf803d14ce6cc40.tar.gz | |
Merge commit 'c3861e14ceace7ee69820091871173b4abcae311' into release/2.2
* commit 'c3861e14ceace7ee69820091871173b4abcae311':
movenc: allow override of "writing application" tag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcmenc.c')
0 files changed, 0 insertions, 0 deletions