aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/udp.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-12 20:47:14 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-12 20:47:14 +0200
commit58f63670e173c1113ab231850572be303a21faef (patch)
tree5249a0ca6dc3250c0cd96516888ef57495aace25 /libavformat/udp.c
parentc39637f36aa3a942efaa098854bd0c2ae612bcd0 (diff)
parent8b5007a31b8d1ddbe3661bf45a732336450b7d25 (diff)
downloadffmpeg-58f63670e173c1113ab231850572be303a21faef.tar.gz
Merge commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25'
* commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25': mpegvideo: Move ER functions to a separate file Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/udp.c')
0 files changed, 0 insertions, 0 deletions