[FFmpeg-cvslog] Merge commit 'e73996954d8e00117056dcefb38ef3d4d2f37967'

Michael Niedermayer git at videolan.org
Mon Nov 4 21:58:53 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov  4 21:52:46 2013 +0100| [4b4a7fcb073ecfacfa93a49144acc05c3ece9819] | committer: Michael Niedermayer

Merge commit 'e73996954d8e00117056dcefb38ef3d4d2f37967'

* commit 'e73996954d8e00117056dcefb38ef3d4d2f37967':
  filtfmts-test: Fix use of deprecated API

Conflicts:
	libavfilter/filtfmts.c

See: f12174c8cef872030a156cbf252f4951c3a6357c
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4b4a7fcb073ecfacfa93a49144acc05c3ece9819
---





More information about the ffmpeg-cvslog mailing list