diff options
| author | Michael Niedermayer <[email protected]> | 2014-08-03 20:53:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-08-03 20:53:00 +0200 |
| commit | 9400603140db5f44f35942482a3435e4b67e7e79 (patch) | |
| tree | 6c78861678fbf746cc94214295cad1e1d387f8a2 /libavformat/rtmppkt.c | |
| parent | 76aec9e6b4a2aabe659013198620276822420ad9 (diff) | |
| parent | 9f17685dfb70a73823aca16ad246ee3b831d1de8 (diff) | |
Merge commit '9f17685dfb70a73823aca16ad246ee3b831d1de8'
* commit '9f17685dfb70a73823aca16ad246ee3b831d1de8':
avcodec: Deprecate unused defines and options
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/rtmppkt.c')
0 files changed, 0 insertions, 0 deletions