diff options
| author | Michael Niedermayer <[email protected]> | 2015-04-29 04:11:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-04-29 04:11:21 +0200 |
| commit | f6c524a9399f854602975c7c83c377fc7a4c0d5e (patch) | |
| tree | c8b06c11db7fd2cdac568a884e8d3ada13a50959 /libavformat/mpegts.c | |
| parent | 78f50e7eb69437fd108c82f963e7add5e9faa36e (diff) | |
| parent | 0c69164f451cc9ca6ce9d6e7568083e2776bc845 (diff) | |
Merge commit '0c69164f451cc9ca6ce9d6e7568083e2776bc845'
* commit '0c69164f451cc9ca6ce9d6e7568083e2776bc845':
h263: Convert function to macro
Conflicts:
libavcodec/h263.h
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/mpegts.c')
0 files changed, 0 insertions, 0 deletions