1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00

Merge commit '0b6e5d6b32b91c6da79cd919a3c2ede9d682f838'

This commit is a no-op.

[16:15] <@Daemon404> wm4, ping
[16:15] <@Daemon404> whats up with "avconv: remove sub-frame warning"
[16:15] <@Daemon404> it's in libav but not ours?
[16:15] <@Daemon404> mailing list bikeshedding?
[16:15] <@wm4> it's in ffmpeg.c too
[16:16] <@wm4> you can probably skip it for now
[16:16] <@wm4> michaelni was against removing it this way
[16:17] <@Daemon404> ok

* commit '0b6e5d6b32b91c6da79cd919a3c2ede9d682f838':
  avconv: remove sub-frame warning

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis
2016-04-13 16:17:18 +01:00

Diff Content Not Available