aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/jvdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-19 13:02:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-19 13:03:19 +0200
commit374a2f4562117a4fb1c381e756f2ef0a068b1542 (patch)
treefc23e9cf250c9b2b9b05f617d1513d5386b4de78 /libavformat/jvdec.c
parent32ea39f56d90585c63eedfcb631e0a939fc1f95e (diff)
parentae0f316a4778e473d407cffa8392595ba0735153 (diff)
downloadffmpeg-374a2f4562117a4fb1c381e756f2ef0a068b1542.tar.gz
Merge commit 'ae0f316a4778e473d407cffa8392595ba0735153'
* commit 'ae0f316a4778e473d407cffa8392595ba0735153': rtmp: Unbreak handle_notify See: fbd54827b1be23c1a234210df5cc876665fbd941 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/jvdec.c')
0 files changed, 0 insertions, 0 deletions