diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-09 19:02:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-09 19:02:31 +0200 |
| commit | 85b22a8924052169f66f96464531de4d501cdc58 (patch) | |
| tree | 0d676e9353b085c1d9307389e7695a2c9f9bcecb /libavcodec/h264_parser.c | |
| parent | acc665f22c5c2cb8a507c6ca49756995a4742038 (diff) | |
| parent | 6ec1d3b3bafa59363763631a8e090b2e12f6ef33 (diff) | |
| download | ffmpeg-85b22a8924052169f66f96464531de4d501cdc58.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.5' into release/0.5
* qatar/release/0.5:
Release notes for 0.5.9
Update changelog for 0.5.9 release
Conflicts:
RELEASE
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_parser.c')
0 files changed, 0 insertions, 0 deletions