diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-01 15:25:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-01 15:25:42 +0100 |
| commit | 0f4c03cd634031181479ca94874e1b80b5638417 (patch) | |
| tree | 88e950e6349699090f698deea8e6da1b6279605c /libavformat/tcp.c | |
| parent | 2d1d053c5d2ca59c8c0f35d91404cd899267add1 (diff) | |
| parent | 0989a120f1dec400c54fcb54670cb84bba36d99b (diff) | |
| download | ffmpeg-0f4c03cd634031181479ca94874e1b80b5638417.tar.gz | |
Merge commit '0989a120f1dec400c54fcb54670cb84bba36d99b' into release/2.2
* commit '0989a120f1dec400c54fcb54670cb84bba36d99b':
mpeg12: Always invoke the get_format() callback
Conflicts:
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/tcp.c')
0 files changed, 0 insertions, 0 deletions