diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 16:08:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 16:09:56 +0200 |
| commit | bed611f937cf98c69c5a0b97d304a72baec02b19 (patch) | |
| tree | 2e95518b8c8b73cbf1d2ea9bd1724826fc1deafd /libavformat/matroskaenc.c | |
| parent | 8377b2b6bfa3ebed6af621670409f853a86b5582 (diff) | |
| parent | 1cad7171dd6896b59c7e102f8ca0c1f1066c515a (diff) | |
| download | ffmpeg-bed611f937cf98c69c5a0b97d304a72baec02b19.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: remove an unused static constant
Merge only for metadata as the constant us not unused in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskaenc.c')
0 files changed, 0 insertions, 0 deletions