diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 17:14:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 17:14:38 +0100 |
| commit | 5241f900581480030e2f2ac47010f86f7ee4f9fd (patch) | |
| tree | 3d51f845ae4024782640748e539962e0cf41f6dd /libavformat/network.h | |
| parent | d70e503ebcd4c1979e05fe4548b227a2c1ba67b0 (diff) | |
| parent | e0a1d0a2b04eb5220d00fc7ce46a57cc5e3c7118 (diff) | |
| download | ffmpeg-5241f900581480030e2f2ac47010f86f7ee4f9fd.tar.gz | |
Merge commit 'e0a1d0a2b04eb5220d00fc7ce46a57cc5e3c7118'
* commit 'e0a1d0a2b04eb5220d00fc7ce46a57cc5e3c7118':
mpegvideo_enc: rework direct mode check
Conflicts:
libavcodec/mpegvideo_enc.c
See: ad985671986464015f3136ad6882ef232c19fc22
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/network.h')
0 files changed, 0 insertions, 0 deletions