diff options
| author | Michael Niedermayer <[email protected]> | 2015-03-04 11:15:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-03-04 11:31:55 +0100 |
| commit | 5dce723715e1f9514808f9c788b28734004f089d (patch) | |
| tree | e30292177f318a14e653257b72e67f00fb906347 /doc/examples/metadata.c | |
| parent | 7da7d269b8409b2533f4434ab10a197d5726569e (diff) | |
| parent | 2a66a580678dd9401f4d95e01e0958ca51864b6f (diff) | |
Merge commit '2a66a580678dd9401f4d95e01e0958ca51864b6f'
* commit '2a66a580678dd9401f4d95e01e0958ca51864b6f':
rtpdec_mpa_robust: Fix incrementing split_pos
Conflicts:
libavformat/rtpdec_mpa_robust.c
See: ebf1f512e9916040dd96fa9f789ed4be5a39c349
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'doc/examples/metadata.c')
0 files changed, 0 insertions, 0 deletions