aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice/decklink_enc_c.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-11 22:19:54 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-11 22:19:54 +0100
commit4809ac75fcefe198e70936d49160036818f12e2b (patch)
treed77d672bcb8549a708a48e0426b82bba485cba09 /libavdevice/decklink_enc_c.c
parent6229f7823e2a9b93a95ce27c10efc156a555c20d (diff)
parent2383323661f3b8342b2c4d356fcfe8c5d1b045f8 (diff)
downloadffmpeg-4809ac75fcefe198e70936d49160036818f12e2b.tar.gz
Merge commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8'
* commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8': dvbsubdec: improve error checking Conflicts: libavcodec/dvbsubdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/decklink_enc_c.c')
0 files changed, 0 insertions, 0 deletions