falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge commit '34e7f70f9f493f340daab80eba4f12d005ec3e63' into release/2.4 

* commit '34e7f70f9f493f340daab80eba4f12d005ec3e63':
  assdec: check av_new_packet return value

Conflicts:
	libavformat/assdec.c

See: 7c9f9685ae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.4.7
Michael Niedermayer 11 years ago
parent
c7831e55b5 34e7f70f9f
commit
6aece62b50
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available