aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/librtmp.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-14 21:27:26 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-14 21:27:44 +0100
commit6998400c618fb267acb6b7281418f3b89fcabc8a (patch)
tree387c05201268ebf28bf9811d55c226099347f138 /libavformat/librtmp.c
parenta94eba6f0c0666de8ccbc56c62112d7e5f1132be (diff)
parentbf704132a51f5d838365158331d4e535e1df4c8e (diff)
downloadffmpeg-6998400c618fb267acb6b7281418f3b89fcabc8a.tar.gz
Merge commit 'bf704132a51f5d838365158331d4e535e1df4c8e'
* commit 'bf704132a51f5d838365158331d4e535e1df4c8e': Don't anonymously typedef structs Conflicts: avprobe.c libavutil/parseutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/librtmp.c')
0 files changed, 0 insertions, 0 deletions