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 '796bd81835ebcb69d40bc87b33f13924a5937a1b' into release/2.4 

* commit '796bd81835ebcb69d40bc87b33f13924a5937a1b':
  g2meet: check ff_set_dimensions return value

Conflicts:
	libavcodec/g2meet.c

See: 3af9d8269e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.4.7
Michael Niedermayer 11 years ago
parent
98ba288737 796bd81835
commit
faa67e9777
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available