aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/bink.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-21 22:35:30 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-21 22:35:30 +0200
commit3099008f07808dcf6edb2311fb1ee050444ffd1d (patch)
tree645fc17239e5e2df6ecf58b7050cc23792598e73 /libavformat/bink.c
parent1922357e5a05eb5a3e6859097264224d8878fa9c (diff)
parent629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae (diff)
downloadffmpeg-3099008f07808dcf6edb2311fb1ee050444ffd1d.tar.gz
Merge commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae'
* commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae': flvdec: make sure to check create_stream and report the same error Conflicts: libavformat/flvdec.c See: d7d5b5dfc1b6f29646d2c1908c9bac8677f34256 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/bink.c')
0 files changed, 0 insertions, 0 deletions