aboutsummaryrefslogtreecommitdiffstats
path: root/doc/platform.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-18 01:40:31 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-18 01:40:50 +0100
commit6aece62b50cc19280213f91007cbf8d63a9f9432 (patch)
tree4123c42ef7b81037809f24b4790e194c0ec73926 /doc/platform.texi
parentc7831e55b517b44c58e64dddfdde3e542873abfd (diff)
parent34e7f70f9f493f340daab80eba4f12d005ec3e63 (diff)
downloadffmpeg-6aece62b50cc19280213f91007cbf8d63a9f9432.tar.gz
Merge commit '34e7f70f9f493f340daab80eba4f12d005ec3e63' into release/2.4
* commit '34e7f70f9f493f340daab80eba4f12d005ec3e63': assdec: check av_new_packet return value Conflicts: libavformat/assdec.c See: 7c9f9685ae2d45d5bbb939483a01266622e8f14c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/platform.texi')
0 files changed, 0 insertions, 0 deletions