diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-20 22:03:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-20 22:03:54 +0100 |
| commit | dc6eadaa458aa2e3ce407459b37e8f8403e455b4 (patch) | |
| tree | 0dfb795170c80f4573686bed495fe0898cb746d4 /libavformat/r3d.c | |
| parent | d19ca4b2eae2d4c9170dfa559472e26730fca4a3 (diff) | |
| parent | 46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7 (diff) | |
| download | ffmpeg-dc6eadaa458aa2e3ce407459b37e8f8403e455b4.tar.gz | |
Merge commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7'
* commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7':
rtpdec_h264: Move a leftover comment into h264_handle_packet_stap_a
Conflicts:
libavformat/rtpdec_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/r3d.c')
0 files changed, 0 insertions, 0 deletions