diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-17 16:38:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-17 16:38:10 +0100 |
| commit | cd259cdaa94717f7c6d2a0c87a7ba0171d1f0978 (patch) | |
| tree | 198c75632969b62dc23856823599c705848a8dda /libavformat/asf.h | |
| parent | 6e2d3ba0eea1592e182d87a3067ff5d485f2f383 (diff) | |
| parent | 104a97beaffa6348e6fd2c2d07d67c1402322bb3 (diff) | |
| download | ffmpeg-cd259cdaa94717f7c6d2a0c87a7ba0171d1f0978.tar.gz | |
Merge commit '104a97beaffa6348e6fd2c2d07d67c1402322bb3'
* commit '104a97beaffa6348e6fd2c2d07d67c1402322bb3':
buffersrc: handle non-refcounted frames in av_buffersrc_add_frame() correctly
Conflicts:
libavfilter/buffersrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/asf.h')
0 files changed, 0 insertions, 0 deletions