diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-01 13:36:54 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-01 13:36:54 +0400 |
| commit | 0c8efe48917fd9d6d2c9b61397318c1fd7c3f8c4 (patch) | |
| tree | 1e724f0eea3edc4eb06880d8e272c2b017d209fa /libavformat/rtpenc.c | |
| parent | b32643813961d7d76e9040c13d88c3a7cd6f923d (diff) | |
| parent | 45dd1ae1b3c18331f3db2293a9135bc5851e553f (diff) | |
Merge commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f'
* commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f':
avfilter: Add some missing FF_API_AVFILTERBUFFER ifdefs
Conflicts:
libavfilter/buffer.c
libavfilter/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc.c')
0 files changed, 0 insertions, 0 deletions