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 '2b5c1efa1465d8646f8be525cace7a21404e40ad' 

* commit '2b5c1efa1465d8646f8be525cace7a21404e40ad':
  g2meet: check ff_set_dimensions return value

Conflicts:
	libavcodec/g2meet.c

See: 3af9d8269e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.5
Michael Niedermayer 11 years ago
parent
dfa0800c41 2b5c1efa14
commit
b697a3314e
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available