diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-16 20:31:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-16 20:31:02 +0200 |
| commit | 7d43fbe3aef8594fbc4a07c3990f865bb3e04628 (patch) | |
| tree | d88f1137dad069618df484ad7e8ac1c86f77817b /libavformat/rtsp.h | |
| parent | 9bf260b2d2fc758dc639fad04f03d4752d066af8 (diff) | |
| parent | 45ff7c93dd84a254cc96acc589e5ac3d7bd16bce (diff) | |
| download | ffmpeg-7d43fbe3aef8594fbc4a07c3990f865bb3e04628.tar.gz | |
Merge commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce'
* commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce':
dca: K&R formatting cosmetics
Conflicts:
libavcodec/dca_parser.c
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtsp.h')
0 files changed, 0 insertions, 0 deletions