aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/act.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-17 14:18:20 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-17 14:20:10 +0200
commite5cb7795fcafdf6bad58ba35161527b4a03b1122 (patch)
treea3dfbd82acdc4c2dc6205e2ee4c26ef115998d34 /libavformat/act.c
parent5fce29ef29e416d843a139e083ae9d3f7783132a (diff)
parent324ff59444ff5470bb325ff1e2be7c4b054fc944 (diff)
downloadffmpeg-e5cb7795fcafdf6bad58ba35161527b4a03b1122.tar.gz
Merge commit '324ff59444ff5470bb325ff1e2be7c4b054fc944'
* commit '324ff59444ff5470bb325ff1e2be7c4b054fc944': avpacket: Check for and return errors in ff_interleave_add_packet() Conflicts: libavformat/audiointerleave.c libavformat/internal.h libavformat/mux.c See: 4d7c71c36467331f1e0c0f17af9f371d33308a9c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/act.c')
0 files changed, 0 insertions, 0 deletions