diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 13:08:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 13:08:50 +0200 |
| commit | dff4aa6afd40bcc6c71b5a21d229fb941f9fc1eb (patch) | |
| tree | e50cc5c08974c011ff14516a14d602605eee065a /tests/fate/exif.mak | |
| parent | 579e2b2874aeaa9cfdeed1fd1408767e33a63029 (diff) | |
| parent | efcde917af407a6031ecff68edd51fce7b83d104 (diff) | |
| download | ffmpeg-dff4aa6afd40bcc6c71b5a21d229fb941f9fc1eb.tar.gz | |
Merge commit 'efcde917af407a6031ecff68edd51fce7b83d104'
* commit 'efcde917af407a6031ecff68edd51fce7b83d104':
vorbiscomment: simplify API by using av_dict_count()
Conflicts:
libavformat/flacenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/exif.mak')
0 files changed, 0 insertions, 0 deletions