ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Thu Nov  6 
13:10:01 2014 +0100| [042eba52a5ff4939b8c548a9fb5e209790c17b37] | committer: 
Michael Niedermayer

Merge commit '91e8d2eb1f7bf3af949008b106ec1ca037b88b0e'

* commit '91e8d2eb1f7bf3af949008b106ec1ca037b88b0e':
  lavf: use the format context strict_std_compliance instead of the codec one

Conflicts:
        libavformat/mux.c

Merged-by: Michael Niedermayer <[email protected]>

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



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to