eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 18:10:13 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
1fddfaa282ff63dba4170ced30f96dbb48bd0246
ffmpeg/libavformat/mux.c
Michael Niedermayer 0d71e825db Merge commit '897d5c3a4296f3da80b8699d1487328ca2de8e55' 
* commit '897d5c3a4296f3da80b8699d1487328ca2de8e55':
  lavf: Print a warning if failed to avoid negative timestamps when requested

Conflicts:
	libavformat/mux.c

See: ec6a5fc6cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-07 23:22:10 +01:00

34 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink