ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri Oct 17
13:35:27 2014 +0200| [9d1155dae303c20f51ae8579df1b8c3928c3bf21] | committer:
Michael Niedermayer
Merge commit 'aeb23fc4549a25ef32ff085d2a76227f90caf403'
* commit 'aeb23fc4549a25ef32ff085d2a76227f90caf403':
avprobe: Remove a pointless check
Conflicts:
avprobe.c
No change as the code does not exist in ffprobe
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d1155dae303c20f51ae8579df1b8c3928c3bf21
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
