diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-25 04:45:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-25 04:45:23 +0200 |
| commit | 8be93ba049f1bb62ce03a86f7d9a8a49934b9ff8 (patch) | |
| tree | 5ad5d978fc657472427069c40ac0a7f24574f886 /libavformat/frmdec.c | |
| parent | 3ae818f6ab04f14838ee073e685d73519725f6d1 (diff) | |
| parent | 28c020d4df9b060a58a124a7a5406d4313fbe249 (diff) | |
| download | ffmpeg-8be93ba049f1bb62ce03a86f7d9a8a49934b9ff8.tar.gz | |
Merge commit '28c020d4df9b060a58a124a7a5406d4313fbe249'
* commit '28c020d4df9b060a58a124a7a5406d4313fbe249':
matroskaenc: check avio_open_dyn_buf return value
Conflicts:
libavformat/matroskaenc.c
See: b1f517f503139ab9d0c406228b53663e86a128df
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/frmdec.c')
0 files changed, 0 insertions, 0 deletions