]> git.sesse.net Git - ffmpeg/commit
projects / ffmpeg / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2a622c2 65a80ee)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Jun 2012 18:44:57 +0000 (20:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Jun 2012 18:44:57 +0000 (20:44 +0200)
commitdc1c79be1bfc76839b1fd277a55e6baad4379498
treed2c7f66e872b9bcb1b0816a31ba5b13deecd7e8btree | snapshot
parent2a622c2369e399907297465b14328b2389bb524ccommit | diff
parent65a80ee1ec854dc4e5d090fa5b2be9afeae312d3commit | diff
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avfilter: Log an error if avfilter fails to configure a link.
  avconv: support only native pthreads.
  rtmp: Fix a possible access to invalid memory location when the playpath is too short.

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c diff1 | diff2 | blob | history
libavfilter/avfilter.c diff1 | diff2 | blob | history
libavformat/rtmpproto.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.