ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sun Mar  8 
23:43:40 2015 +0100| [fa14685a578d4d37f9a53c2399bba7770e48f747] | committer: 
Michael Niedermayer

Merge commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f'

* commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f':
  avprobe: Export coded_{width,height} in -show_streams

Conflicts:
        avprobe.c

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

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



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

Reply via email to