aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/img2dec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-29 13:42:41 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-29 13:43:07 +0200
commit5f9b1aae504fd6842b049866b0974f710e0bd3ca (patch)
treea44517fe5156c7920e77bec7497af6f9b1009eb6 /libavformat/img2dec.c
parent8b79a458c084632ef5d911cb135c52db59b402ff (diff)
parent6454c44f9f74dbaed17d32cf0eaec185386c27fa (diff)
downloadffmpeg-5f9b1aae504fd6842b049866b0974f710e0bd3ca.tar.gz
Merge commit '6454c44f9f74dbaed17d32cf0eaec185386c27fa'
* commit '6454c44f9f74dbaed17d32cf0eaec185386c27fa': rtmpproto: Fix limelight authentication with abbreviated app names Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/img2dec.c')
0 files changed, 0 insertions, 0 deletions