diff options
author | Michael Niedermayer <[email protected]> | 2013-10-16 13:54:41 +0200 |
---|---|---|
committer | Michael Niedermayer <[email protected]> | 2013-10-16 13:54:41 +0200 |
commit | 8610751d07bc4c82a8e0cf416c39e845884e6b4d (patch) | |
tree | c1dd80a18fa3fd799793168e8b6449e4b5982d12 /libavformat/mpegts.c | |
parent | 10c6d1b28cbd0f39915649940821184d8278eaea (diff) | |
parent | a84616b736fca5ebd6b87489dd41bc06ccdf7860 (diff) |
Merge commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860'
* commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860':
mpegvideo: K&R formatting cosmetics
Conflicts:
libavcodec/mpegvideo_motion.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/mpegts.c')
0 files changed, 0 insertions, 0 deletions