aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/allformats.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-02 10:30:30 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-02 10:30:30 +0100
commit1344c0453615a1f0141b11f5f4e3c640ee890afc (patch)
treeb89adf4ab7358fb23496c9469090dc19cc695dbd /libavformat/allformats.c
parent0b82fdcc469ec8f5dd4affe1fe5ae8710b373cd2 (diff)
parentdc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0 (diff)
downloadffmpeg-1344c0453615a1f0141b11f5f4e3c640ee890afc.tar.gz
Merge commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0'
* commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0': mpeg4video: K&R formatting cosmetics Conflicts: libavcodec/mpeg4video.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/allformats.c')
0 files changed, 0 insertions, 0 deletions