aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/flacdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-18 02:38:38 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-18 02:46:07 +0100
commit9943c5a42bdf8412f60e8a33489d6f2a8b1b9d61 (patch)
treea1dd73d724ac6e4e34cb818f9bd3d7b309be347c /libavcodec/flacdec.c
parentafbaa9a737b3546c12fdf328016cc1e587d65dc9 (diff)
parent9257692ac15eff7b07540c1f61cebde0d8823fbd (diff)
downloadffmpeg-9943c5a42bdf8412f60e8a33489d6f2a8b1b9d61.tar.gz
Merge commit '9257692ac15eff7b07540c1f61cebde0d8823fbd'
* commit '9257692ac15eff7b07540c1f61cebde0d8823fbd': lavf: Only initialize s->offset once when using avoid_negative_ts make_zero Conflicts: libavformat/mux.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flacdec.c')
0 files changed, 0 insertions, 0 deletions