diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 22:05:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 22:05:27 +0200 |
| commit | 96504b3f72a7fad602fbbb06d85633c52ceaf8da (patch) | |
| tree | 4df6ee9bbfd9aeebbf8a31deb21926c84b2b84b6 /libavformat/rtmpdh.h | |
| parent | 70c648db8948b11a86699f22e883b7310ccae6ce (diff) | |
| parent | d6006dd9f0d4d01023359230212f1f9fa4800e5b (diff) | |
| download | ffmpeg-96504b3f72a7fad602fbbb06d85633c52ceaf8da.tar.gz | |
Merge commit 'd6006dd9f0d4d01023359230212f1f9fa4800e5b'
* commit 'd6006dd9f0d4d01023359230212f1f9fa4800e5b':
libvpxenc: Do not entangle coded_frame
Conflicts:
libavcodec/libvpxenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/rtmpdh.h')
0 files changed, 0 insertions, 0 deletions