diff options
| author | Michael Niedermayer <[email protected]> | 2015-02-22 01:58:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-02-22 01:59:44 +0100 |
| commit | 20f5a179560ce844c9fa7886f60d61d4e2db7480 (patch) | |
| tree | 7e19bb0203482b4f3e004527fd445c0572f28c4e /libpostproc/postprocess.c | |
| parent | abf357a9fb2f19467bad8e3e629f8b016091eedf (diff) | |
| parent | 44dc138ed29c4dfbaf57ebc774da4c75ef113ca4 (diff) | |
Merge commit '44dc138ed29c4dfbaf57ebc774da4c75ef113ca4'
* commit '44dc138ed29c4dfbaf57ebc774da4c75ef113ca4':
rtpdec_mpeg4: reassemble fragmented AAC frames
Conflicts:
libavformat/rtpdec_mpeg4.c
See: fee2cc39becb1930461dff267389717337804a4a
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libpostproc/postprocess.c')
0 files changed, 0 insertions, 0 deletions