diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-25 14:02:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-25 14:02:55 +0200 |
| commit | 454f98b881fc18c553d56371ac0cd1e703e52571 (patch) | |
| tree | f85969f32fc1ad6cc7bff5ec35502ec6372e3481 /libavformat/rtmppkt.c | |
| parent | 59f49667569b5d92a7713b6db75a9e6bfa939079 (diff) | |
| parent | 4620affa24eedb167482198aa04126bcedd05620 (diff) | |
| download | ffmpeg-454f98b881fc18c553d56371ac0cd1e703e52571.tar.gz | |
Merge commit '4620affa24eedb167482198aa04126bcedd05620'
* commit '4620affa24eedb167482198aa04126bcedd05620':
m4vdec: K&R formatting cosmetics
Conflicts:
libavformat/m4vdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmppkt.c')
0 files changed, 0 insertions, 0 deletions